Started a test setup

[AXE.git] / src / date.cpp

diff --git a/src/date.cpp b/src/date.cpp
index 5213fce..6ba3375 100644 (file)
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : date.cpp
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.2 $
+**      VERSION NUMBER : $Revision: 1.3 $
 **
 **  DESCRIPTION      :  
 **
@@ -22,7 +22,18 @@
 
 /*****************************
    $Log: date.cpp,v $
-   Revision 1.2  2002-09-02 06:18:20  arjen
+   Revision 1.3  2002-09-28 06:58:45  arjen
+   Bugfix: conversion of an empty string to a date or hour object
+   now makes the values of such an object 0 (null) instead of giving
+   a segmentation fault.
+   The class UTC combines the date and hour classes. The most basic
+   functions of the UTC class are now implemented.
+   These include constructors and conversion to and from String objects.
+   New functions: date::proper(), hour::proper() and UTC::proper().
+   Return true if the object holds a proper clock time and/or calendar
+   date; false if at least one value is out of range.
+
+   Revision 1.2  2002/09/02 06:18:20  arjen
    Fixed some date and time conversion functions
 
    Revision 1.1  2002/07/25 08:01:26  arjen
@@ -30,7 +41,7 @@
 
 *****************************/
 
-static const char *RCSID = "$Id: date.cpp,v 1.2 2002-09-02 06:18:20 arjen Exp $";
+static const char *RCSID = "$Id: date.cpp,v 1.3 2002-09-28 06:58:45 arjen Exp $";
 
 #include <iostream> 
 #include <time.h>
@@ -57,10 +68,19 @@ date::date(String s)
 {
    struct parseddate *pd;
 
-   pd = parsedate(s);
-   year = pd->year;
-   month = pd->month;
-   day   = pd->day;
+   if (~s == 0)
+   {
+      year   = 0;
+      month  = 0;
+      day    = 0;
+   }
+   else
+   {
+      pd = parsedate(s);
+      year = pd->year;
+      month = pd->month;
+      day   = pd->day;
+   }
 }
 
 int date::Leap(void)
@@ -170,6 +190,13 @@ date date::subtract(unsigned long days)
    return *this;
 }
 
+bool date::proper()
+{
+   return  year != -1 && year != 0 &&
+           month > 0  && month <= 12 &&
+           day   > 0  && day <= DaysInMonth();
+}
+
 date operator+(date d1, date d2)
 {
    d1.add(d2);
@@ -260,7 +287,7 @@ long operator-(date &d1, date &d2)
    return d1.julian() - d2.julian();
 }
 
-ostream &operator<<(ostream &s, const date &d)
+std::ostream &operator<<(std::ostream &s, const date &d)
 {
    s.width(2);
    s.fill('0');
@@ -274,7 +301,7 @@ ostream &operator<<(ostream &s, const date &d)
    return s;
 }
 
-istream &operator>>(istream &s, date &d)
+std::istream &operator>>(std::istream &s, date &d)
 {
    char c;
    int  D, M, Y;