https://issues.shibboleth.net/jira/browse/CPPXT-18

[shibboleth/cpp-xmltooling.git] / xmltooling / util / DateTime.h

diff --git a/xmltooling/util/DateTime.h b/xmltooling/util/DateTime.h
index dead345..f73e244 100644 (file)
--- a/xmltooling/util/DateTime.h
+++ b/xmltooling/util/DateTime.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2001-2007 Internet2
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,8 +16,8 @@
 
 /**
  * @file xmltooling/util/DateTime.h
- * 
- * Manipulation of XML date/time data. 
+ *
+ * Manipulation of XML date/time data.
  */
 
 #ifndef __xmltool_datetime_h__
@@ -40,7 +40,7 @@ namespace xmltooling
 {
     /**
      * Class for manipulating XML date/time information.
-     * 
+     *
      * This is mostly copied from Xerces-C, but they haven't produced a usable date/time
      * class, so we had to incorporate a version of it for now. It can't be inherited
      * since the fields needed are private.
@@ -51,20 +51,20 @@ namespace xmltooling
         /// @cond OFF
         DateTime();
         DateTime(const XMLCh* const);
-        DateTime(time_t epoch);
+        DateTime(time_t epoch, bool duration=false);
         DateTime(const DateTime&);
         DateTime& operator=(const DateTime&);
         ~DateTime();
-    
+
         inline void setBuffer(const XMLCh* const);
-    
+
         const XMLCh* getRawData() const;
         const XMLCh* getFormattedString() const;
         int getSign() const;
-    
+
         XMLCh* getDateTimeCanonicalRepresentation() const;
         XMLCh* getTimeCanonicalRepresentation() const;
-    
+
         void parseDateTime();
         void parseDate();
         void parseTime();
@@ -74,19 +74,19 @@ namespace xmltooling
         void parseMonthDay();
         void parseYearMonth();
         void parseDuration();
-    
+
         static int compare(const DateTime* const, const DateTime* const);
         static int compare(const DateTime* const, const DateTime* const, bool);
-        static int compareOrder(const DateTime* const, const DateTime* const);                                    
-    
+        static int compareOrder(const DateTime* const, const DateTime* const);
+
         int getYear() const {return fValue[CentYear];}
         int getMonth() const {return fValue[Month];}
         int getDay() const {return fValue[Day];}
         int getHour() const {return fValue[Hour];}
         int getMinute() const {return fValue[Minute];}
         int getSecond() const {return fValue[Second];}
-        time_t getEpoch() const;
-    
+        time_t getEpoch(bool duration=false) const;
+
         /// @endcond
     private:
         enum valueIndex {
@@ -100,52 +100,52 @@ namespace xmltooling
             utc        ,
             TOTAL_SIZE
         };
-    
+
         enum utcType {
             UTC_UNKNOWN = 0,
             UTC_STD        ,          // set in parse() or normalize()
             UTC_POS        ,          // set in parse()
             UTC_NEG                   // set in parse()
         };
-    
+
         enum timezoneIndex {
             hh = 0,
             mm ,
             TIMEZONE_ARRAYSIZE
         };
-    
+
         static int compareResult(int, int, bool);
         static void addDuration(DateTime* pDuration, const DateTime* const pBaseDate, int index);
         static int compareResult(const DateTime* const, const DateTime* const, bool, int);
         static inline int getRetVal(int, int);
-    
+
         inline void reset();
         //inline void assertBuffer() const;
         inline void copy(const DateTime&);
-        
+
         inline void initParser();
         inline bool isNormalized() const;
-    
+
         void getDate();
         void getTime();
         void getYearMonth();
         void getTimeZone(const int);
         void parseTimeZone();
-    
+
         int findUTCSign(const int start);
         int indexOf(const int start, const int end, const XMLCh ch) const;
         int parseInt(const int start, const int end) const;
         int parseIntYear(const int end) const;
         double parseMiliSecond(const int start, const int end) const;
-    
+
         void validateDateTime() const;
         void normalize();
         void fillString(XMLCh*& ptr, valueIndex ind, int expLen) const;
         int  fillYearString(XMLCh*& ptr, valueIndex ind) const;
         void searchMiliSeconds(XMLCh*& miliStartPtr, XMLCh*& miliEndPtr) const;
-    
+
        bool operator==(const DateTime& toCompare) const;
-    
+
         static const int DATETIMES[][TOTAL_SIZE];
         int fValue[TOTAL_SIZE];
         int fTimeZone[TIMEZONE_ARRAYSIZE];
@@ -153,7 +153,7 @@ namespace xmltooling
         int fEnd;
         int fBufferMaxLen;
         XMLCh* fBuffer;
-    
+
         double fMiliSecond;
         bool fHasTime;
     };
@@ -171,33 +171,33 @@ namespace xmltooling
             memcpy(fBuffer, aString, (fEnd+1) * sizeof(XMLCh));
         }
     }
-    
+
     inline void DateTime::reset()
     {
         for ( int i=0; i < xercesc::XMLDateTime::TOTAL_SIZE; i++ )
             fValue[i] = 0;
-    
+
         fMiliSecond   = 0;
         fHasTime      = false;
         fTimeZone[hh] = fTimeZone[mm] = 0;
         fStart = fEnd = 0;
-    
+
         if (fBuffer)
             *fBuffer = 0;
     }
-    
+
     inline void DateTime::copy(const DateTime& rhs)
     {
         for ( int i = 0; i < xercesc::XMLDateTime::TOTAL_SIZE; i++ )
             fValue[i] = rhs.fValue[i];
-    
+
         fMiliSecond   = rhs.fMiliSecond;
         fHasTime      = rhs.fHasTime;
         fTimeZone[hh] = rhs.fTimeZone[hh];
         fTimeZone[mm] = rhs.fTimeZone[mm];
         fStart = rhs.fStart;
         fEnd   = rhs.fEnd;
-    
+
         if (fEnd > 0) {
             if (fEnd > fBufferMaxLen) {
                 delete[] fBuffer;
@@ -207,24 +207,24 @@ namespace xmltooling
             memcpy(fBuffer, rhs.fBuffer, (fEnd+1) * sizeof(XMLCh));
         }
     }
-    
+
     inline void DateTime::initParser()
     {
         fStart = 0;   // to ensure scan from the very first beginning
                       // in case the pointer is updated accidentally by someone else.
     }
-    
+
     inline bool DateTime::isNormalized() const
     {
         return (fValue[xercesc::XMLDateTime::utc] == xercesc::XMLDateTime::UTC_STD ? true : false);
     }
-    
+
     inline int DateTime::getRetVal(int c1, int c2)
     {
         if ((c1 == xercesc::XMLDateTime::LESS_THAN && c2 == xercesc::XMLDateTime::GREATER_THAN) ||
             (c1 == xercesc::XMLDateTime::GREATER_THAN && c2 == xercesc::XMLDateTime::LESS_THAN))
             return xercesc::XMLDateTime::INDETERMINATE;
-    
+
         return (c1 != xercesc::XMLDateTime::INDETERMINATE) ? c1 : c2;
     }