Changeset 15180 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Oct 3, 2007, 11:32:43 AM (19 years ago)

Author:

Paul Price

Message:

Merging branch with FITS compression development. Minor conflicts in pmConfig.c, pmFPAfileDefine.c, pmFPAfileIO.c resolved.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (5 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-29 22:18:39 $
- *
- *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ *  Copyright 2007 Institute for Astronomy, University of Hawaii
  *
  */
@@ -537 +534 @@
         psArgumentRemove(argNum, argc, argv);
         if (argNum >= *argc) {
-            psLogMsg("psModules.config", PS_LOG_WARN,
-                     "-camera command-line switch provided without the required camera or filename --- "
-                     "ignored.\n");
+            psWarning("-camera command-line switch provided without the required camera or filename --- "
+                      "ignored.\n");
         } else {
             bool mdok = true;           // Status of MD lookup
@@ -852 +848 @@
     for (int i = 0; *valid && (i < keys->n); i++) {
 
-        // get the ruleItem for this key
+        // get the ruleItem for this key
         psMetadataItem *ruleItem = psMetadataLookup(rule, keys->data[i]);
 
@@ -861 +857 @@
             psTrace("psModules.config", 5, "Can't find %s", ruleItem->name);
             *valid = false;
-            continue;
-        }
-
-        // if the RULE type is a primitive type (int, float, etc) or string compare directly
-        if (PS_DATA_IS_PRIMITIVE (ruleItem->type) || (ruleItem->type == PS_DATA_STRING)) {
-            // Check to see if the rule works
-            if (!psMetadataItemCompare(headerItem, ruleItem)) {
-                psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
-                *valid = false;
-            }
-            continue;
-        } 
-
-        // for MULTI, try each one & succeed if any match (valid = true is default state)
-        if (ruleItem->type == PS_DATA_METADATA_MULTI) {
-            bool found = false;
-            for (int j = 0; j < ruleItem->data.list->n; j++) {
-                psMetadataItem *entry = psListGet (ruleItem->data.list, j);
-                assert (entry);
-                if (psMetadataItemCompare(headerItem, entry)) {
-                    found = true;
-                    psTrace("psModules.config", 5, "%s in multi list matches.", ruleItem->name);
-                    break;
-                }
-            }
-            if (!found) {
-                *valid = false;
-                psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
-            }
-            continue;
-        }
-
-        psError(PS_ERR_UNKNOWN, false, "Invalid type for RULE %s.", ruleItem->name);
+            continue;
+        }
+
+        // if the RULE type is a primitive type (int, float, etc) or string compare directly
+        if (PS_DATA_IS_PRIMITIVE (ruleItem->type) || (ruleItem->type == PS_DATA_STRING)) {
+            // Check to see if the rule works
+            if (!psMetadataItemCompare(headerItem, ruleItem)) {
+                psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
+                *valid = false;
+            }
+            continue;
+        }
+
+        // for MULTI, try each one & succeed if any match (valid = true is default state)
+        if (ruleItem->type == PS_DATA_METADATA_MULTI) {
+            bool found = false;
+            for (int j = 0; j < ruleItem->data.list->n; j++) {
+                psMetadataItem *entry = psListGet (ruleItem->data.list, j);
+                assert (entry);
+                if (psMetadataItemCompare(headerItem, entry)) {
+                    found = true;
+                    psTrace("psModules.config", 5, "%s in multi list matches.", ruleItem->name);
+                    break;
+                }
+            }
+            if (!found) {
+                *valid = false;
+                psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name);
+            }
+            continue;
+        }
+
+        psError(PS_ERR_UNKNOWN, false, "Invalid type for RULE %s.", ruleItem->name);
         *valid = false;
-        psFree (keyList);
-        psFree (keys);
+        psFree (keyList);
+        psFree (keys);
         return false;
     }
@@ -1137 +1133 @@
     psMetadataItem *rulesItem = NULL;   // Item from iteration
     while ((rulesItem = psMetadataGetAndIncrement(rulesIter))) {
-        // this will insert each of the MULTI entries, writing over the previous copies
-        if (PS_DATA_IS_PRIMITIVE (rulesItem->type) || (rulesItem->type == PS_DATA_STRING)) {
-            psMetadataItem *newItem = psMetadataItemCopy(rulesItem); // Copy of item
-            psMetadataAddItem(header, newItem, PS_LIST_TAIL, PS_META_REPLACE);
-            psFree(newItem);                // Drop reference
-            continue;
-        }
-        
-        # if (0) // XXX not needed
-        // for MULTI entries, supply the first one
-        if (rulesItem->type == PS_DATA_METADATA_MULTI) {
-            psMetadataItem *entry = psListGet (rulesItem->data.list, PS_LIST_HEAD);
-            if (!entry) {
-                psError(PS_ERR_UNKNOWN, true, "No entries for MULTI RULE item.");
-                return false;
-            }
-            psMetadataItem *newItem = psMetadataItemCopy(entry); // Copy of item
-            psMetadataAddItem(header, newItem, PS_LIST_TAIL, PS_META_REPLACE);
-            psFree(newItem);                // Drop reference
-            continue;
-        }
-        # endif
-
-        psError(PS_ERR_UNKNOWN, false, "Invalid type for RULE %s.", rulesItem->name);
+        // this will insert each of the MULTI entries, writing over the previous copies
+        if (PS_DATA_IS_PRIMITIVE (rulesItem->type) || (rulesItem->type == PS_DATA_STRING)) {
+            psMetadataItem *newItem = psMetadataItemCopy(rulesItem); // Copy of item
+            psMetadataAddItem(header, newItem, PS_LIST_TAIL, PS_META_REPLACE);
+            psFree(newItem);                // Drop reference
+            continue;
+        }
+
+        # if (0) // XXX not needed
+        // for MULTI entries, supply the first one
+        if (rulesItem->type == PS_DATA_METADATA_MULTI) {
+            psMetadataItem *entry = psListGet (rulesItem->data.list, PS_LIST_HEAD);
+            if (!entry) {
+                psError(PS_ERR_UNKNOWN, true, "No entries for MULTI RULE item.");
+                return false;
+            }
+            psMetadataItem *newItem = psMetadataItemCopy(entry); // Copy of item
+            psMetadataAddItem(header, newItem, PS_LIST_TAIL, PS_META_REPLACE);
+            psFree(newItem);                // Drop reference
+            continue;
+        }
+        # endif
+
+        psError(PS_ERR_UNKNOWN, false, "Invalid type for RULE %s.", rulesItem->name);
         return false;
     }