Changeset 23272

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.

Location:

trunk/psModules/src

Files:

• camera/pmFPAfile.c (modified) (2 diffs)
• camera/pmFPAfile.h (modified) (1 diff)
• camera/pmFPAfileIO.c (modified) (1 diff)
• config/pmConfigRun.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -50 +50 @@
 
     psFree (file->filename);
+    psFree (file->origname);
     psFree (file->extname);
 
@@ -88 +89 @@
 
     file->filename = NULL;
+    file->origname = NULL;
     file->extname  = NULL;
 

trunk/psModules/src/camera/pmFPAfile.h

@@ -91 +91 @@
     char *name;                         // the name of the rule (useful for debugging / tracing)
     char *filename;                     // the current name of an active file
+    char *origname;                     // the original name (before mangling) of an active file
     char *extname;                      // the current name of an active file extension
 

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) {

trunk/psModules/src/config/pmConfigRun.c

@@ -51 +51 @@
 
     const char *name = file->name;      // Name of symbolic file
-    const char *value = file->filename; // Value of symbolic file: the file name
+    const char *value = file->origname ? file->origname : file->filename; // The file (system) name
 
     psString regex = NULL;              // Regular expression for iteration