Changeset 23272 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Mar 11, 2009, 11:46:17 AM (17 years ago)

Author:

Paul Price

Message:

Want filenames in the RUN metadata to be the names before they're unmangled (e.g., want neb://wherever instead of /path/to/wherever). Added new element to pmFPAfile to hold the unmangled name.

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -740 +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) {