Changeset 23819

Timestamp:

Apr 11, 2009, 7:40:38 AM (17 years ago)

Author:

eugene

Message:

fixed naming of time formats; accepting some old versions, but made the standard names more neutral

File:

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

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -36 +36 @@
 // Format type for time
 typedef enum {
-    TIME_FORMAT_ISO,                    // Date stored ISO (YYYY-MM-DD)
-    TIME_FORMAT_BACKWARDS,              // Date stored backwards (DD-MM-YYYY)
-    TIME_FORMAT_USA,                    // Date stored in USA order (MM-DD-YYYY)
-    TIME_FORMAT_JD,                     // Date stored as JD
-    TIME_FORMAT_MJD,                    // Date stored as MJD
+  TIME_FORMAT_YYYYMMDD,                 // Date stored in YYYY-MM-DD order (ISO-standard)
+  TIME_FORMAT_DDMMYYYY,                 // Date stored in DD-MM-YYYY order
+  TIME_FORMAT_MMDDYYYY,                 // Date stored in MM-DD-YYYY order
+  TIME_FORMAT_JD,                       // Date stored as JD
+  TIME_FORMAT_MJD,                      // Date stored as MJD
 } conceptTimeFormatType;
 
@@ -651 +651 @@
 {
     conceptTimeFormat time;               // Time format, to return
-    time.format = TIME_FORMAT_ISO;
+    time.format = TIME_FORMAT_YYYYMMDD;
     time.separate = false;
     time.pre2000 = false;
@@ -665 +665 @@
                 if (strcasecmp(format, "SEPARATE") == 0) {
                     time.separate = true;
+                } else if (strcasecmp(format, "YYYYMMDD") == 0) {
+                    time.format = TIME_FORMAT_YYYYMMDD;
+                } else if (strcasecmp(format, "MMDDYYYY") == 0) {
+                    time.format = TIME_FORMAT_MMDDYYYY;
+                } else if (strcasecmp(format, "DDMMYYYY") == 0) {
+                    time.format = TIME_FORMAT_DDMMYYYY;
+                } else if (strcasecmp(format, "ISO") == 0) {
+                    time.format = TIME_FORMAT_YYYYMMDD;
+                } else if (strcasecmp(format, "YEAR.FIRST") == 0) {
+                    time.format = TIME_FORMAT_YYYYMMDD;
                 } else if (strcasecmp(format, "USA") == 0) {
-                    time.format = TIME_FORMAT_USA;
+                    time.format = TIME_FORMAT_MMDDYYYY;
                 } else if (strcasecmp(format, "BACKWARDS") == 0) {
-                    time.format = TIME_FORMAT_BACKWARDS;
+                    time.format = TIME_FORMAT_DDMMYYYY;
                 } else if (strcasecmp(format, "PRE2000") == 0) {
                     time.pre2000 = true;
@@ -824 +834 @@
           }
           switch (timeFormat.format) {
-            case TIME_FORMAT_BACKWARDS: {
+            case TIME_FORMAT_DDMMYYYY: {
                 // Need to switch days and years
                 int temp = day;
@@ -831 +841 @@
                 break;
             }
-            case TIME_FORMAT_USA: {
+            case TIME_FORMAT_MMDDYYYY: {
                 // Need to switch everything around.... Yanks!
                 int temp = day;
@@ -901 +911 @@
                 break;
             }
-            case TIME_FORMAT_ISO: {
-                // It's ISO
+            case TIME_FORMAT_YYYYMMDD: {
+                // this is ISO-standard
                 time = psTimeFromISO(timeString, timeSys);
                 break;
@@ -1258 +1268 @@
 
         switch (timeFormat.format) {
-          case TIME_FORMAT_BACKWARDS: {
+          case TIME_FORMAT_DDMMYYYY: {
               int day, month, year;
               psTrace ("psModules.concepts", 5, "ISO time has year first, convert to DD-MM-YYYY");
@@ -1266 +1276 @@
               break;
           }
-          case TIME_FORMAT_USA: {
+          case TIME_FORMAT_MMDDYYYY: {
               int day, month, year;
               psTrace ("psModules.concepts", 5, "ISO time has year first, convert to MM-DD-YYYY");