Changeset 11104 for trunk/psModules/src/camera/pmFPAfile.c

Timestamp:

Jan 15, 2007, 11:59:31 AM (19 years ago)

Author:

magnier

Message:

creating pmConceptsFilterIDfromConcept

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -254 +254 @@
     if (strstr (newName, "{FILTER.ID}") != NULL) {
         if (file->fpa != NULL) {
-            char *filterName = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.FILTER");
-            psMetadata *filterTable = psMetadataLookupPtr (NULL, file->camera, "FILTER.ID");
-            if (filterName && *filterName && filterTable) {
-                char *ID = psMetadataLookupStr (NULL, filterTable, filterName);
-                if (ID && *ID) {
-                    psStringSubstitute(&newName, ID, "{FILTER.ID}");
-                }
+            char *filterID = pmConceptsFilterIDfromConcept ("FPA.FILTER", file->fpa->concepts, file->camera);
+            if (filterID && *filterID) {
+                psStringSubstitute(&newName, filterID, "{FILTER.ID}");
             }
         }