Changeset 11245

Timestamp:

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

Author:

magnier

Message:

fixed pmConfigValidateCameraFormat to distinguish error and invalid

Location:

trunk/psModules/src/config

Files:

• pmConfig.c (modified) (7 diffs)
• pmConfig.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-11 22:55:36 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-23 03:19:35 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -676 +676 @@
 
 // XXX aren't these (return false) below errors: call psError?
-bool pmConfigValidateCameraFormat(const psMetadata *cameraFormat, const psMetadata *header)
+bool pmConfigValidateCameraFormat(bool *valid, const psMetadata *cameraFormat, const psMetadata *header)
 {
     PS_ASSERT_PTR_NON_NULL(cameraFormat, false);
@@ -683 +683 @@
     // Read the rule for that camera format
     bool mdStatus = true;
+
     psMetadata *rule = psMetadataLookupMetadata(&mdStatus, cameraFormat, "RULE");
     if (! mdStatus || ! rule) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read rule for camera.");
+        *valid = false;
         return false;
     }
@@ -692 +694 @@
     psMetadataIterator *ruleIter = psMetadataIteratorAlloc(rule, PS_LIST_HEAD, NULL); // Rule iterator
     psMetadataItem *ruleItem = NULL;    // Item from the metadata
-    while ((ruleItem = psMetadataGetAndIncrement(ruleIter))) {
+
+    *valid = true;
+    while (*valid && (ruleItem = psMetadataGetAndIncrement(ruleIter))) {
         // Check for the existence of the rule
         psMetadataItem *headerItem = psMetadataLookup(header, ruleItem->name);
         if (! headerItem) {
-            // doesn't match, but not an error
+            // rule item not found in header
             psTrace("psModules.config", 5, "Can't find %s", ruleItem->name);
-            psFree(ruleIter);
-            return false;
+            *valid = false;
         }
 
         // Check to see if the rule works
-        if (! psMetadataItemCompare(headerItem, ruleItem)) {
+        if (headerItem && !psMetadataItemCompare(headerItem, ruleItem)) {
             psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
-            psFree(ruleIter);
-            return false;
+            *valid = false;
         }
     } // Iterating through the RULEs
@@ -713 +715 @@
     return true;
 }
-
 
 // Given a camera and a header, see if any of the camera formats match the header
@@ -750 +751 @@
         psMetadata *testFormat = formatsItem->data.md; // Format to test against
 
-        if (pmConfigValidateCameraFormat(testFormat, header)) {
+        psTrace("psModules.config", 5, "trying format %s", formatsItem->name);
+
+        bool valid = false;
+        if (!pmConfigValidateCameraFormat(&valid, testFormat, header)) {
+            psError (PS_ERR_UNKNOWN, false, "Error in config scripts for camera %s, format %s\n",
+                     cameraName, formatsItem->name);
+            return false;
+        }
+        if (valid) {
             if (!*format) {
                 psLogMsg("psModules.config", PS_LOG_INFO, "Camera %s, format %s matches header.\n",
@@ -762 +771 @@
                          cameraName, formatsItem->name);
             }
-        } else {
-            psErr *error = psErrorLast();
-            if (error->code != PS_ERR_NONE) {
-                psError (PS_ERR_UNKNOWN, false, "Error in config scripts for camera %s, format %s\n",\
-                         cameraName, formatsItem->name);
-                return false;
-            }
-            psFree(error);
         }
     }
     psFree(formatsIter);
-
     return result;
 }

trunk/psModules/src/config/pmConfig.h

@@ -9 +9 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-01-11 22:54:56 $
+/// @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-01-23 03:19:43 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -97 +97 @@
 ///
 /// Given a FITS header (the PHU header), check it against the RULE metadata contained within the camera
-/// format; return true if it matches.
-bool pmConfigValidateCameraFormat(const psMetadata *cameraFormat, ///< Camera format containing the RULE
+/// format; return found = true if it matches. return false on serious errors
+bool pmConfigValidateCameraFormat(bool *valid,
+                                  const psMetadata *cameraFormat, ///< Camera format containing the RULE
                                   const psMetadata *header // FITS header for the PHU
                                  );