Changeset 22707

Timestamp:

Feb 27, 2009, 11:08:58 AM (17 years ago)

Author:

Paul Price

Message:

Fixing display of times: no Z because it's not necessarily Zulu (UTC)
time. Let the type say what it is. Using all significant figures that psTimeToISO gives.

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (4 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -821 +821 @@
         status = 0;
         strValue = getToken (&linePtr, "#", &status, true);
-       
+
         if (!status && strValue) {
-            // found a directive, what does it say?
-            if (strcasecmp (strValue, "UPDATE") && strcasecmp (strValue, "RESET")) {
-                psError(PS_ERR_IO, true, _("Invalid directive %s for METADATA or MULTI."), strValue);
-                psFree(strType);
-                psFree(strValue);
-                return false;
-            }
-
-            // found a directive, what does it say?
-            if (!strcasecmp (strValue, "UPDATE")) {
-                // this folder or group is merged with an existing one of the same name
-                flags |= PS_META_UPDATE_FOLDER;
-            }
-            if (!strcasecmp (strValue, "RESET")) {
-                // this folder or group replaces an existing one of the same name
-                flags |= PS_META_REPLACE;
-            }
-            psFree(strValue);
-            strValue = NULL;
-        }
+            // found a directive, what does it say?
+            if (strcasecmp (strValue, "UPDATE") && strcasecmp (strValue, "RESET")) {
+                psError(PS_ERR_IO, true, _("Invalid directive %s for METADATA or MULTI."), strValue);
+                psFree(strType);
+                psFree(strValue);
+                return false;
+            }
+
+            // found a directive, what does it say?
+            if (!strcasecmp (strValue, "UPDATE")) {
+                // this folder or group is merged with an existing one of the same name
+                flags |= PS_META_UPDATE_FOLDER;
+            }
+            if (!strcasecmp (strValue, "RESET")) {
+                // this folder or group replaces an existing one of the same name
+                flags |= PS_META_REPLACE;
+            }
+            psFree(strValue);
+            strValue = NULL;
+        }
 
         // Not all lines will have comments, so NULL is ok.
@@ -887 +887 @@
             return false;
         }
-    } 
+    }
 
 #define PARSE_ADD_CASE(NAME, TYPE, PARSEFUNC) \
@@ -1241 +1241 @@
         psError(PS_ERR_IO, true, _("failed to parse file '%s'"), filename);
         psFree(md);
-        psFree(file);
+        psFree(file);
         return NULL;
     }
@@ -1516 +1516 @@
             }
             psString timeStr = psTimeToISO(time);
-            psString timeOutput;
-            timeOutput = psStringNCopy(timeStr, 19);
-            psStringAppend(&content, "%s", timeOutput);
-            psStringAppend(&content, "Z");
+            psStringAppend(&content, "%s", timeStr);
             psFree(timeStr);
-            psFree(timeOutput);
         } else {
             // psTime is a NULL pointer