Changeset 12797 for trunk/Mars

Timestamp:

01/31/12 11:26:51 (13 years ago)

Author:

tbretz

Message:

 Allow to feed SetSqlDateTime also with an ISO time and allow more or less than three digits after the dot

Location:

trunk/Mars/mbase

Files:

• MTime.cc (modified) (1 diff)
• MTime.h (modified) (1 diff)

trunk/Mars/mbase/MTime.cc

@@ -420 +420 @@
 //   "yyyy-mm-dd hh:mm:ss"
 //
-Bool_t MTime::SetSqlDateTime(const char *str)
-{
-    if (!str)
+Bool_t MTime::SetSqlDateTime(TString str)
+{
+    if (str.IsNull())
         return kFALSE;
 
+    str.ReplaceAll("T", "");
+
+    if (str.Contains('.'))
+        str += "000";
+
     UInt_t  y, mon, d, h, m, s, ms;
 
-    if (7==sscanf(str, "%04u-%02u-%02u %02u:%02u:%02u.%u", &y, &mon, &d, &h, &m, &s, &ms))
+    if (7==sscanf(str, "%04u-%02u-%02u %02u:%02u:%02u.%03u", &y, &mon, &d, &h, &m, &s, &ms))
         return Set(y, mon, d, h, m, s, ms);
 

trunk/Mars/mbase/MTime.h

@@ -94 +94 @@
     void     Set(const struct timeval &tv);
     Bool_t   SetString(const char *str);
-    Bool_t   SetSqlDateTime(const char *str);
+    Bool_t   SetSqlDateTime(TString str);
     Bool_t   SetSqlTimeStamp(const char *str);
     void     SetCT1Time(UInt_t mjd, UInt_t t1, UInt_t t0);