Changeset 15006

Timestamp:

03/10/13 11:13:26 (12 years ago)

Author:

tbretz

Message:

Added initializer from an ISO string, fixed the wrong ISO format description in Time::iso.

Location:

trunk/FACT++/src

Files:

• Time.cc (modified) (2 diffs)
• Time.h (modified) (3 diffs)

trunk/FACT++/src/Time.cc

@@ -40 +40 @@
 const _time_format Time::sql    = "%Y-%m-%d %H:%M:%S.%f";
 const _time_format Time::ssql   = "%Y-%m-%d %H:%M:%S";
-const _time_format Time::iso    = "%Y%m%dT%H%M%S%F%q";
+const _time_format Time::iso    = "%Y-%m-%dT%H:%M:%S%F%q";
 const _time_format Time::magic  = "%Y %m %d %H %M %S %f";
 const _time_format Time::smagic = "%Y %m %d %H %M %S";
@@ -243 +243 @@
 {
     stringstream out;
-    out << Time::fmt("%Y-%m-%dT%H:%M:%S%F") << *this;
+    out << Time::iso << *this;
     return out.str();
 }

trunk/FACT++/src/Time.h

@@ -25 +25 @@
     /// initialize ptr with what should be passed to the iostreams
     _time_format(const char *txt) : ptr(txt) { }
+    std::string str() const { return ptr; }
 };
 
@@ -53 +54 @@
     };
 
-private:
+public:
     /// Points to the famous 1/1/1970, the standard offset for unix times
     const static boost::gregorian::date fUnixOffset;
@@ -67 +68 @@
          unsigned int us=0);
     Time(double mjd) { Mjd(mjd); }
+    Time(const std::string &str)
+    {
+        std::stringstream stream;
+        stream << str;
+        stream >> Time::iso >> *this;
+    }
 
     // Convesion from and to a string