Changeset 9017 for trunk/MagicSoft/Mars/mbase/MTime.cc

Timestamp:

07/20/08 15:21:42 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MTime.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -403 +403 @@
         return kFALSE;
 
-    UInt_t  y, mon, d, h, m, s;
+    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))
+        return Set(y, mon, d, h, m, s, ms);
+
     if (6==sscanf(str, "%04u-%02u-%02u %02u:%02u:%02u", &y, &mon, &d, &h, &m, &s))
         return Set(y, mon, d, h, m, s);
+
+    if (5==sscanf(str, "%04u-%02u-%02u %02u:%02u", &y, &mon, &d, &h, &m))
+        return Set(y, mon, d, h, m);
+
+    if (4==sscanf(str, "%04u-%02u-%02u %02u", &y, &mon, &d, &h))
+        return Set(y, mon, d, h);
 
     if (3==sscanf(str, "%04u-%02u-%02u", &y, &mon, &d))