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

Timestamp:

Oct 9, 2006, 3:03:47 PM (20 years ago)

Author:

magnier

Message:

adding substitution for CAMERA (poor) and additional error tests

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -176 +176 @@
     if (strstr (newName, "{EXTNAME}") != NULL) {
         pmHDU *hdu = pmFPAviewThisHDU (view, file->fpa);
-        if (hdu->extname != NULL) {
+        if (hdu->extname && *hdu->extname) {
             newName = psStringSubstitute (newName, hdu->extname, "{EXTNAME}");
         }
@@ -183 +183 @@
         if (file->fpa != NULL) {
             char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.FILTER");
-            if (name != NULL) {
+            if (name && *name) {
                 newName = psStringSubstitute (newName, name, "{FILTER}");
             }
@@ -190 +190 @@
     if (strstr (newName, "{CAMERA}") != NULL) {
         if (file->fpa != NULL) {
-            char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.CAMERA");
-            if (name != NULL) {
+            // XXX this concept does not exist...
+            // char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.CAMERA");
+            char *name = psStringCopy ("isp");
+            if (name && *name) {
                 newName = psStringSubstitute (newName, name, "{CAMERA}");
             }
+            psFree (name);
         }
     }
@@ -200 +203 @@
             char *filterName = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.FILTER");
             psMetadata *filterTable = psMetadataLookupPtr (NULL, file->camera, "FILTER.ID");
-            if (filterName && filterTable) {
+            if (filterName && *filterName && filterTable) {
                 char *ID = psMetadataLookupStr (NULL, filterTable, filterName);
-                newName = psStringSubstitute (newName, ID, "{FILTER.ID}");
+                if (ID && *ID) {
+                    newName = psStringSubstitute (newName, ID, "{FILTER.ID}");
+                }
             }
         }