Changeset 11144 for trunk/psModules/src/camera

Timestamp:

Jan 18, 2007, 3:19:34 PM (20 years ago)

Author:

Paul Price

Message:

Removing pmConceptsFilterIDfromConcept, which is obsolete now that FPA.FILTER is interpolated on read.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (1 diff)
• pmFPAfileDefine.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -252 +252 @@
         }
     }
-    if (strstr (newName, "{FILTER.ID}") != NULL) {
-        if (file->fpa != NULL) {
-            char *filterID = pmConceptsFilterIDfromConcept ("FPA.FILTER", file->fpa->concepts, file->camera);
-            if (filterID && *filterID) {
-                psStringSubstitute(&newName, filterID, "{FILTER.ID}");
-            }
-        }
-    }
     return newName;
 }

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -700 +700 @@
         }
 
+        // XXX: 'function' unncesssary now that it's not required for filter?
         if (!strcasecmp (option, "filter")) {
-            options->filter = NULL;
-            if (function) {
-                if (!strcasecmp (function, "FILTER.ID")) {
-                    options->filter = pmConceptsFilterIDfromConcept (concept, input->concepts, config->camera);
-                }
-            } else {
-                options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
-            }
-            if (options->filter == NULL)
+            if (function)
+                psAbort ("psModules", "no detrend constraint function for filter");
+            options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
+            if (!status)
                 psAbort ("psModules", "failed to find filter");