Changeset 7323

Timestamp:

Jun 2, 2006, 5:45:32 PM (20 years ago)

Author:

magnier

Message:

changed certain psAborts to psErrors

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -318 +318 @@
         psFree (extra);
         if (file->filename == NULL) {
-            psAbort ("pmFPAfile", "no file specified");
+            psError(PS_ERR_IO, true, "filename lookup error (@FILES) for %s : %s\n", file->filextra, extra);
+            return false;
         }
         // psMetadataLookupStr just returns a view, file->filename must be protected
@@ -329 +330 @@
         psFree (extra);
         if (file->filename == NULL) {
-            psAbort ("pmFPAfile", "no file specified");
+            psError(PS_ERR_IO, true, "filename lookup error (@DETBD) for %s : %s\n", file->filextra, extra);
+            return false;
         }
         psMemIncrRefCounter (file->filename);
@@ -1182 +1184 @@
         // char *extra = pmFPAfileNameFromRule (file->filextra, file, view);
         // psArray *infiles = pmDetrendSelect (extra, input);
-        psAbort ("pmFPAfileFromConfig", "@DETDB not yet defined");
+        psAbort ("pmFPAfileFromConfig", "programming error: @DETDB not yet defined");
     } else {
         infiles = psArrayAlloc(1);