Changeset 12558

Timestamp:

Mar 22, 2007, 2:36:22 PM (19 years ago)

Author:

magnier

Message:

adding test for EXTWORD in FORMAT:FILE, setting psFits->extword if set

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -37 +37 @@
                      )
 {
+    bool status;
+
     file->fits = psFitsOpen (file->filename, mode);
     if (file->fits == NULL) {
@@ -43 +45 @@
     }
     file->state = PM_FPA_STATE_OPEN;
+    
+    // if needed, set the optional EXTWORD field based on the camera value
+    if (config && config->format) {
+        psMetadata *fileMenu = psMetadataLookupMetadata (NULL, config->format, "FILE");
+        if (!fileMenu) {
+            psError (PS_ERR_IO, true, "FILE METADATA missing from camera format %s\n", config->formatName);
+            return false;
+        }
+        char *extword = psMetadataLookupStr (&status, fileMenu, "EXTWORD");
+        if (status) {
+            psFitsSetExtnameWord (file->fits, extword);
+        }
+    }
 
     // In some cases, I need to call pmFPAAddSourceFromHeader after I've opened the file,
@@ -287 +302 @@
         }
         file->state = PM_FPA_STATE_OPEN;
+
+        // if needed, set the optional EXTWORD field based on the camera value
+        if (config && config->format) {
+            psMetadata *fileMenu = psMetadataLookupMetadata (NULL, config->format, "FILE");
+            if (!fileMenu) {
+                psError (PS_ERR_IO, true, "FILE METADATA missing from camera format %s\n", config->formatName);
+                return false;
+            }
+            char *extword = psMetadataLookupStr (&status, fileMenu, "EXTWORD");
+            if (status) {
+                psFitsSetExtnameWord (file->fits, extword);
+            }
+        }
         break;