Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAfileIO.c (modified) (5 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAfileIO.c

@@ -22 +22 @@
 #include "pmFPARead.h"
 #include "pmFPAWrite.h"
-#include "pmFPAfileIO.h"
 #include "pmFPAfileFitsIO.h"
 #include "pmSpan.h"
@@ -44 +43 @@
 #include "pmSubtractionIO.h"
 #include "pmConcepts.h"
+#include "pmConfigRun.h"
+
+#include "pmFPAfileIO.h"
 
 // attempt create, read, write, close, or free pmFPAfiles available in files files are
@@ -164 +166 @@
     }
 
+    if (!pmConfigRunFileAdd(config, file)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to add file to run-time information");
+        return false;
+    }
+
     // select a reading method
     bool status = true;
@@ -412 +419 @@
             return false;
         }
+    }
+
+    if (!pmConfigRunFileAdd(config, file)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to add file to run-time information");
+        return false;
     }
 
@@ -728 +740 @@
     // apply filename mangling rules (file://, path://, neb://)
     bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
-    psString tmpName = pmConfigConvertFilename (file->filename, config, create, false);
-    if (!tmpName) {
+    psString realName = pmConfigConvertFilename(file->filename, config, create, false);
+    if (!realName) {
         psError(PS_ERR_IO, false, "failed to determine real name from template for %s\n", file->filename);
         return false;
     }
-    psFree (file->filename);
-    file->filename = tmpName;
+    psFree(file->origname);
+    file->origname = file->filename;
+    file->filename = realName;
 
     switch (file->type) {