Changeset 10722

Timestamp:

Dec 14, 2006, 1:32:31 AM (19 years ago)

Author:

magnier

Message:

hack fixes for time concepts

File:

• trunk/psModules/src/concepts/pmConceptsStandard.c (modified) (7 diffs)

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -336 +336 @@
         timeSys = psMetadataLookupS32(&mdok, fpa->concepts, timesysName);
     }
-    if (!mdok) {
+    if (!mdok || (timeSys == 0xffffffff)) {
         psLogMsg(__func__, PS_LOG_WARN, "Unable to find %s in concepts when parsing %s --- assuming UTC.\n",
                  timesysName, pattern->name);
@@ -346 +346 @@
     bool usaTime = false;               // Is the time specified in USA (MM-DD-YYYY) order?
     bool backwardsTime = false;         // Is the time specified in backwards (DD-MM-YYYY) order?
+    bool yearFirst = false;            // Is the time specified in yearFirst (YYYY-MM-DD) order?
     bool pre2000Time = false;           // Is the time specified pre-2000 (where the year only has two digits)
     bool mjdTime = false;               // Is the time specified a MJD?
@@ -364 +365 @@
 
     // Parse the time format
+    // why should more than one be allowed??
     psList *timeFormats = psStringSplit(timeFormat, " ,;", false); // List of the format options
     psListIterator *timeFormatsIter = psListIteratorAlloc(timeFormats, PS_LIST_HEAD, false); // Iter
@@ -370 +372 @@
             usaTime = true;
             backwardsTime = false;
+            yearFirst = false;
             jdTime = false;
             mjdTime = false;
@@ -375 +378 @@
             backwardsTime = true;
             usaTime = false;
+            yearFirst = false;
+            jdTime = false;
+            mjdTime = false;
+        } else if (strcasecmp(timeFormat, "YEAR.FIRST") == 0) {
+            yearFirst = true;
+            usaTime = false;
+            backwardsTime = false;
             jdTime = false;
             mjdTime = false;
@@ -382 +392 @@
             mjdTime = true;
             jdTime = false;
+            yearFirst = false;
             backwardsTime = false;
             usaTime = false;
@@ -387 +398 @@
             jdTime = true;
             mjdTime = false;
+            yearFirst = false;
             backwardsTime = false;
             usaTime = false;