Changeset 38058 for branches/eam_branches/ipp-20150112/psModules/src/detrend/pmDetrendDB.c

Timestamp:

Mar 29, 2015, 6:08:31 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/psModules/src/detrend/pmDetrendDB.c (modified) (1 diff)

branches/eam_branches/ipp-20150112/psModules/src/detrend/pmDetrendDB.c

@@ -356 +356 @@
     psTrace("psModules.detrend", 5, "detrend file: %s\n", result);
 
+    // XXX: A somewhat hacked bit of code to force the analysis to use a specific version of the detrend file
     char *is_nebulous = strstr(result,"neb://");
     if (is_nebulous) { // This file matches the nebulous string
       psString truncated = psStringCopy(is_nebulous + 6);
       //      printf("A: %s %s\n",result,truncated);
+
       psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes,"PPIMAGE");
-      psMetadata *detloc = psMetadataLookupMetadata(NULL, recipe, "DETREND.LOCATIONS");
+      psMetadata *detloc = psMetadataLookupMetadata(&status, recipe, "DETREND.LOCATIONS");
+
       if (detloc) { // This exists, so we have the information.
-        psString location = psMetadataLookupStr(NULL, detloc,classID);
+        psString location = psMetadataLookupStr(&status, detloc, classID);
         //      printf("B: %s %s\n", classID,location);
         if (location) { // Found a location