Changeset 19018 for trunk/psModules/src/concepts/pmConceptsPhotcode.c

Timestamp:

Aug 11, 2008, 5:22:32 PM (18 years ago)

Author:

Paul Price

Message:

Get photcode from camera configuration instead of PPIMAGE recipe
(psModules shouldn't need to know about the existence of something
called PPIMAGE).

File:

• trunk/psModules/src/concepts/pmConceptsPhotcode.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsPhotcode.c

@@ -17 +17 @@
 #include "pmConceptsPhotcode.h"
 
-psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
+psString pmConceptsPhotcodeForView(pmFPAfile *file, const pmFPAview *view)
 {
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
     PS_ASSERT_PTR_NON_NULL(file, NULL);
     PS_ASSERT_PTR_NON_NULL(view, NULL);
@@ -28 +27 @@
     }
 
-    // select recipe options supplied on command line
+    // select photcode rule from camera configuration
     bool mdok;                          // Status of MD lookup
-    psMetadata *recipe  = psMetadataLookupPtr(&mdok, config->recipes, "PPIMAGE");
-    if (!mdok || !recipe) {
-        psError(PS_ERR_IO, true, "Recipe PPIMAGE not found\n");
-        return NULL;
-    }
-
-    // select photcode rule from recipe
-    char *rule = psMetadataLookupStr(&mdok, recipe, "PHOTCODE.RULE");
+    char *rule = psMetadataLookupStr(&mdok, file->camera, "PHOTCODE.RULE");
     if (!mdok || !rule || strlen(rule) == 0) {
-        psError(PS_ERR_IO, true, "PHOTCODE.RULE not found in PPIMAGE recipe\n");
+        psError(PS_ERR_IO, true, "PHOTCODE.RULE not found in camera configuration.");
         return NULL;
     }