Changeset 30814

Timestamp:

Mar 6, 2011, 2:36:26 PM (15 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20110213/psLib/src/astro/psTime.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/psLib/src/astro/psTime.c

@@ -1498 +1498 @@
 // accepts a range of human readable times:
 // ISO (YYYY-MM-MMTHH:MM:SS[.sss][Z])
+// YYYY/MM/DDTHH:MM:DD
+// YYYY-MM-DD,HH:MM:DD
 // YYYY/MM/DD,HH:MM:DD
+// YYYY-MM-DD@HH:MM:DD
+// YYYY/MM/DD@HH:MM:DD
 psTime* psTimeFromString(const char *input,
                       psTimeType type)
@@ -1517 +1521 @@
     psErrorClear ();
 
+    // Convert YYYY/MM/DDThh:mm:ss.sss[Z] in string form to tm time
+    outTime = psTimeStrptime(input, "%Y/%m/%dT%H:%M:%S");
+    if (outTime) {
+      outTime->type = type;
+      return outTime;
+    }
+    psErrorClear ();
+
+    // Convert YYYY-MM-DD,hh:mm:ss.sss[Z] in string form to tm time
+    outTime = psTimeStrptime(input, "%Y-%m-%d,%H:%M:%S");
+    if (outTime) {
+      outTime->type = type;
+      return outTime;
+    }
+    psErrorClear ();
+
     // Convert YYYY/MM/DD,hh:mm:ss.sss[Z] in string form to tm time
     outTime = psTimeStrptime(input, "%Y/%m/%d,%H:%M:%S");
+    if (outTime) {
+      outTime->type = type;
+      return outTime;
+    }
+    psErrorClear ();
+
+    // Convert YYYY-MM-DD@hh:mm:ss.sss[Z] in string form to tm time
+    outTime = psTimeStrptime(input, "%Y-%m-%d@%H:%M:%S");
     if (outTime) {
       outTime->type = type;