Changeset 15218 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Oct 4, 2007, 11:47:30 AM (19 years ago)

Author:

Paul Price

Message:

Have been running into problems because various write functions (i.e., sources, psf) aren't updating the headers before they write. Attempting to aggregate the functions that update the headers in pmFPAfileWrite, since that will be called by everything. This is an attempt; not sure if it works yet or not.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -1098 +1098 @@
         const char *currentName = psMetadataLookupStr(&mdok, fpa->concepts, "FPA.NAME"); // Current name
         if (mdok && currentName && strlen(currentName) > 0 && strcmp(currentName, fpaname) != 0) {
-            psLogMsg(__func__, PS_LOG_WARN, "FPA.NAME for new source (%s) doesn't match FPA.NAME for current "
+            psWarning("FPA.NAME for new source (%s) doesn't match FPA.NAME for current "
                      "fpa (%s).\n", fpaname, currentName);
         }
@@ -1356 +1356 @@
     psString fpaname = phuNameFromHeader("FPA.NAME", fileInfo, phu); // New name for the FPA
     if (!fpaname || strlen(fpaname) == 0) {
-        psError(PS_ERR_IO, true, "Unable to determine FPA.NAME: check for FPA.NAME in FILE in camera format");
-        return NULL;
+        psWarning("Unable to determine FPA.NAME: check for FPA.NAME in FILE in camera format");
     }