Changeset 15812 for trunk/psModules

Timestamp:

Dec 13, 2007, 11:50:56 AM (19 years ago)

Author:

eugene

Message:

require CLASSID for detrend lookup, check for too many returned files

Location:

trunk/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (1 diff)
• detrend/pmDetrendDB.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -685 +685 @@
         psMetadata *menu = psMetadataLookupMetadata(&status, file->camera, "CLASSID"); // Menu of class IDs
         if (!status || !menu) {
-            psWarning("Unable to find CLASSID metadata in camera configuration --- "
-                      "assuming no class identifier required.");
-        } else {
-            const char *rule = psMetadataLookupStr(&status, menu, file->detrend->level); // Rule for class_id
-            if (!status || !rule || strlen(rule) == 0) {
-                psWarning("Unable to find %s in CLASSID within camera configuration --- "
-                          "attempting to proceed without it.", file->detrend->level);
-            } else {
-                classId = pmFPAfileNameFromRule(rule, file, view);
-                if (!classId) {
-                    psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule);
-                    return false;
-                }
-            }
-        }
+            psError(PS_ERR_IO, false, "Unable to find CLASSID metadata in camera configuration");
+            return false;
+        } 
+        const char *rule = psMetadataLookupStr(&status, menu, file->detrend->level); // Rule for class_id
+        if (!status || !rule || strlen(rule) == 0) {
+            psError(PS_ERR_IO, false, "Unable to find %s in CLASSID in camera configuration", file->detrend->level);
+            return false;
+        } 
+        classId = pmFPAfileNameFromRule(rule, file, view);
+        if (!classId) {
+            psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule);
+            return false;
+        }
         psTrace ("psModules.camera", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId);
         psFree (file->filename);

trunk/psModules/src/detrend/pmDetrendDB.c

@@ -253 +253 @@
     psStringAppend (&line, "detselect -select %s", detID);
     if (classID && strlen(classID) > 0) {
-        psStringAppend(&line, " -class_id %s", classID);
+        psStringAppend(&line, " -class_id %s", classID);
     }
     pmConfigDatabaseCommand(&line, config);
@@ -285 +285 @@
         goto failure;
     }
+    psMetadataItem *item = psMetadataLookup (answer, "detNormalizedImfile");
+    if ((item->type == PS_DATA_METADATA_MULTI) && (item->data.list->n > 1)) {
+        psError(PS_ERR_IO, false, "detselect returned too many files\n");
+        goto failure;
+    }
+
     psMetadata *md = psMetadataLookupPtr (NULL, answer, "detNormalizedImfile");
     if (!md) {