Changeset 11242

Timestamp:

Jan 22, 2007, 5:18:21 PM (19 years ago)

Author:

magnier

Message:

correctly handle invalid camera format vs config error

Location:

trunk/psModules/src/camera

Files:

• pmFPAfileDefine.c (modified) (5 diffs)
• pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -267 +267 @@
     psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname);
     if (!status) {
-        //        psTrace("psModules.camera", 5, "Failed to find %s in argument list", argname);
         psError(PS_ERR_UNEXPECTED_NULL, false, "Failed to find %s in argument list", argname);
         return NULL;
@@ -326 +325 @@
         return NULL;
     }
+    file->format = format;
 
     // adjust the rules to identify these files in the file->names data
@@ -373 +373 @@
                 return NULL;
             }
-            if (!pmConfigValidateCameraFormat (format, phu)) {
+            bool valid = false;
+            if (!pmConfigValidateCameraFormat (&valid, format, phu)) {
+                psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+                psFree (realName);
+                psFitsClose (fits);
+                return NULL;
+            }
+            if (!valid) {
                 psError(PS_ERR_IO, false, "file %s is not from the required camera", realName);
                 psFree (realName);
@@ -404 +411 @@
     }
     psFree (fpa);
-
-    file->format = format;
     if (found)
         *found = true;
@@ -492 +497 @@
             return NULL;
         }
-        if (!pmConfigValidateCameraFormat (input->format, phu)) {
+        bool valid = false;
+        if (!pmConfigValidateCameraFormat (&valid, input->format, phu)) {
+            psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+            psFree (realName);
+            psFitsClose (fits);
+            return NULL;
+        }
+        if (!valid) {
             psError(PS_ERR_IO, false, "specified data file %s does not match format of supplied INPUT\n", realName);
             psFree (realName);

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -89 +89 @@
                 }
             } else {
-                pmConfigValidateCameraFormat (file->format, phu);
+                bool valid;
+                if (!pmConfigValidateCameraFormat (&valid, file->format, phu)) {
+                    psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+                    psFree (phu);
+                    return NULL;
+                }
+                if (!valid) {
+                    psError(PS_ERR_IO, false, "file %s is not from the required camera", file->filename);
+                    psFree (phu);
+                    return NULL;
+                }
             }
             pmFPAview *thisView = pmFPAAddSourceFromHeader (file->fpa, phu, file->format);