Changeset 14974

Timestamp:

Sep 21, 2007, 12:11:37 PM (19 years ago)

Author:

Paul Price

Message:

Realised we don't want to keep The Copy of FILERULES in the site
configuration --- the site configuration is something the user
shouldn't have to touch very often.

File:

• branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c

@@ -32 +32 @@
     assert(config->site);
 
-    const char *setName = psMetadataLookupStr(NULL, camera, "FILERULES"); // Name of file rules set
-    if (!setName) {
+    psMetadataItem *item = psMetadataLookup(camera, "FILERULES"); // Item with the file rule of interest
+    if (!item) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find FILERULES in the camera configuration.");
-        return NULL;
-    }
-
-    psMetadata *fileruleSets = psMetadataLookupMetadata(NULL, config->site,
-                                                        "FILERULES"); // Sets of defined file rules
-    if (!fileruleSets) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find FILERULES in the site configuration.");
-        return NULL;
-    }
-
-    psMetadataItem *item = psMetadataLookup(fileruleSets, setName); // Item with the file rule of interest
-    if (!item) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find FILERULES set %s in the SITE configuration.",
-                setName);
         return NULL;
     }
@@ -61 +47 @@
           // It's the name of a file --- read the file, and store it for future use
           if (!pmConfigFileRead(&filerules, item->data.str, "filerules")) {
-              psError(PM_ERR_CONFIG, false, "Trouble reading reading file rules %s --- "
-                      "ignored.\n", setName);
+              psError(PM_ERR_CONFIG, false, "Trouble reading reading file rules from %s  --- "
+                      "ignored.\n", item->data.str);
               psFree(filerules);
               return NULL;