Changeset 18061 for trunk/psModules

Timestamp:

Jun 10, 2008, 10:28:59 AM (18 years ago)

Author:

jhoblitt

Message:

add truncate parameter to pmConfigConvertFilename()

Location:

trunk/psModules/src

Files:

• camera/pmFPAfileDefine.c (modified) (4 diffs)
• camera/pmFPAfileIO.c (modified) (1 diff)
• config/pmConfig.c (modified) (3 diffs)
• config/pmConfig.h (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -457 +457 @@
 
     // this function is implicitly an INPUT operation: do not create the file
-    psString realName = pmConfigConvertFilename (infiles->data[0], config, false);
+    psString realName = pmConfigConvertFilename (infiles->data[0], config, false, false);
     if (!realName) {
         psError(PS_ERR_IO, false, "Failed to convert file name %s\n", (char *) infiles->data[0]);
@@ -538 +538 @@
         if (i > 0) {
             // this function is implicitly an INPUT operation: do not create the file
-            psString realName = pmConfigConvertFilename (infiles->data[i], config, false);
+            psString realName = pmConfigConvertFilename (infiles->data[i], config, false, false);
             if (!realName) {
                 psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]);
@@ -672 +672 @@
     for (int i = 0; i < infiles->n; i++) {
         // this function is implicitly an INPUT operation: do not create the file
-        psString realName = pmConfigConvertFilename (infiles->data[i], config, false);
+        psString realName = pmConfigConvertFilename (infiles->data[i], config, false, false);
         if (!realName) {
             psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]);
@@ -925 +925 @@
     // Prepend the global path to the file rule
     // this function is implicitly an INPUT operation: do not create the file
-    psString tmpName = pmConfigConvertFilename(file->filerule, config, false);
+    psString tmpName = pmConfigConvertFilename(file->filerule, config, false, false);
     psFree (file->filerule);
     file->filerule = tmpName;

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -752 +752 @@
     // apply filename mangling rules (file://, path://, neb://)
     bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
-    psString tmpName = pmConfigConvertFilename (file->filename, config, create);
+    psString tmpName = pmConfigConvertFilename (file->filename, config, create, false);
     psFree (file->filename);
     file->filename = tmpName;

trunk/psModules/src/config/pmConfig.c

@@ -556 +556 @@
         }
         if (logDest) {
-            psString resolved = pmConfigConvertFilename(logDest, config, true); // Resolved filename
+            psString resolved = pmConfigConvertFilename(logDest, config, true, false); // Resolved filename
             if (!resolved || strlen(resolved) == 0) {
                 psWarning("Unable to resolve log destination: %s --- ignored", logDest);
@@ -614 +614 @@
         }
         if (traceDest) {
-            psString resolved = pmConfigConvertFilename(traceDest, config, true); // Resolved filename
+            psString resolved = pmConfigConvertFilename(traceDest, config, true, false); // Resolved filename
             if (!resolved || strlen(resolved) == 0) {
                 psWarning("Unable to resolve trace destination: %s --- ignored", traceDest);
@@ -1490 +1490 @@
 
 // convert the supplied name, create a new output psString
-psString pmConfigConvertFilename(const char *filename, const pmConfig *config, bool create)
+psString pmConfigConvertFilename(const char *filename, const pmConfig *config, bool create, bool truncate)
 {
     PS_ASSERT_STRING_NON_EMPTY(filename, NULL);

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-06-09 00:38:42 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-10 20:28:25 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -163 +163 @@
     const char *filename,               ///< file path/URI
     const pmConfig *config,             ///< configuration
-    bool create                         ///< create the file if it doesn't exist
+    bool create,                        ///< create the file if it doesn't exist
+    bool truncate                       ///< truncate the file (if it exists)
 );