Changeset 18061

Timestamp:

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

Author:

jhoblitt

Message:

add truncate parameter to pmConfigConvertFilename()

Location:

trunk

Files:

• ppImage/src/ppImageStatsOutput.c (modified) (1 diff)
• ppMerge/src/ppMerge.c (modified) (1 diff)
• ppNorm/src/ppNormCalc.c (modified) (2 diffs)
• ppStack/src/ppStackLoop.c (modified) (4 diffs)
• ppStats/src/ppStats.c (modified) (1 diff)
• ppStats/src/ppStatsSetupFromArgs.c (modified) (1 diff)
• psModules/src/camera/pmFPAfileDefine.c (modified) (4 diffs)
• psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)
• psModules/src/config/pmConfig.c (modified) (3 diffs)
• psModules/src/config/pmConfig.h (modified) (2 diffs)
• psastro/src/psastroLoadRefstars.c (modified) (1 diff)
• psastro/src/psastroMetadataStats.c (modified) (1 diff)
• pswarp/src/pswarpDefineSkycell.c (modified) (1 diff)
• pswarp/src/pswarpLoop.c (modified) (1 diff)

trunk/ppImage/src/ppImageStatsOutput.c

@@ -43 +43 @@
 
     // convert to a real UNIX filename
-    psString resolved = pmConfigConvertFilename(statsName, config, true); // Resolved filename
+    psString resolved = pmConfigConvertFilename(statsName, config, true, false); // Resolved filename
     FILE *statsFile = fopen (resolved, "w");
     if (!statsFile) {

trunk/ppMerge/src/ppMerge.c

@@ -73 +73 @@
     psString statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS.NAME"); // Statistics file name
     if (mdok && statsName && strlen(statsName) > 0) {
-        psString resolved = pmConfigConvertFilename(statsName, config, true); // Resolved filename
+        psString resolved = pmConfigConvertFilename(statsName, config, true, false); // Resolved filename
         FILE *statsFile = fopen(resolved, "w"); // Output statistics file
         if (!statsFile) {

trunk/ppNorm/src/ppNormCalc.c

@@ -38 +38 @@
 
     if (argc >= 2) {
-        psString resolved = pmConfigConvertFilename(argv[1], config, false); // Resolved filename
+        psString resolved = pmConfigConvertFilename(argv[1], config, false, false); // Resolved filename
         inFile = fopen(resolved, "r");
         if (!inFile) {
@@ -48 +48 @@
     }
     if (argc == 3) {
-        psString resolved = pmConfigConvertFilename(argv[2], config, true); // Resolved filename
+        psString resolved = pmConfigConvertFilename(argv[2], config, true, false); // Resolved filename
         outFile = fopen(resolved, "w");
         if (!outFile) {

trunk/ppStack/src/ppStackLoop.c

@@ -148 +148 @@
     assert(image);
 
-    psString resolved = pmConfigConvertFilename(name, config, true); // Resolved file name
+    psString resolved = pmConfigConvertFilename(name, config, true, true); // Resolved file name
     psFits *fits = psFitsOpen(resolved, "w");
     if (!fits) {
@@ -189 +189 @@
     FILE *statsFile = NULL;             // File stream for statistics
     if (statsName && strlen(statsName) > 0) {
-        psString resolved = pmConfigConvertFilename(statsName, config, true); // Resolved filename
+        psString resolved = pmConfigConvertFilename(statsName, config, true, true); // Resolved filename
         statsFile = fopen(resolved, "w");
         if (!statsFile) {
@@ -401 +401 @@
             }
             // Resolved names
-            psString imageResolved = pmConfigConvertFilename(imageNames->data[i], config, false);
-            psString maskResolved = pmConfigConvertFilename(maskNames->data[i], config, false);
-            psString weightResolved = pmConfigConvertFilename(weightNames->data[i], config, false);
+            psString imageResolved = pmConfigConvertFilename(imageNames->data[i], config, false, false);
+            psString maskResolved = pmConfigConvertFilename(maskNames->data[i], config, false, false);
+            psString weightResolved = pmConfigConvertFilename(weightNames->data[i], config, false, false);
             imageFits->data[i] = psFitsOpen(imageResolved, "r");
             maskFits->data[i] = psFitsOpen(maskResolved, "r");
@@ -625 +625 @@
             weightFits->data[i] = NULL;
             if (tempDelete) {
-                psString imageResolved = pmConfigConvertFilename(imageNames->data[i], config, false);
-                psString maskResolved = pmConfigConvertFilename(maskNames->data[i], config, false);
-                psString weightResolved = pmConfigConvertFilename(weightNames->data[i], config, false);
+                psString imageResolved = pmConfigConvertFilename(imageNames->data[i], config, false, false);
+                psString maskResolved = pmConfigConvertFilename(maskNames->data[i], config, false, false);
+                psString weightResolved = pmConfigConvertFilename(weightNames->data[i], config, false, false);
                 if (unlink(imageResolved) == -1 || unlink(maskResolved) == -1 ||
                     unlink(weightResolved) == -1) {

trunk/ppStats/src/ppStats.c

@@ -27 +27 @@
     if (argc == 2) {
         outName = argv[1];
-        psString resolved = pmConfigConvertFilename(outName, config, true); // Resolved filename
+        psString resolved = pmConfigConvertFilename(outName, config, true, false); // Resolved filename
 
         if (resolved && strlen(resolved) > 0) {

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -147 +147 @@
     int result = PS_EXIT_UNKNOWN_ERROR;
     {
-        psString resolved = pmConfigConvertFilename(inName, config, false); // Resolved filename
+        psString resolved = pmConfigConvertFilename(inName, config, false, false); // Resolved filename
         data->fits = psFitsOpen(resolved, "r");
         if (!data->fits) {

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

trunk/psastro/src/psastroLoadRefstars.c

@@ -42 +42 @@
 
     // convert the uri to a real filename (ie, path://foobar) 
-    psString CATDIR = pmConfigConvertFilename(catdir, config, false); // Resolved filename
+    psString CATDIR = pmConfigConvertFilename(catdir, config, false, false); // Resolved filename
     PS_ASSERT (CATDIR, NULL);
 

trunk/psastro/src/psastroMetadataStats.c

@@ -45 +45 @@
 
     // convert to a real UNIX filename
-    psString resolved = pmConfigConvertFilename(filename, config, true); // Resolved filename
+    psString resolved = pmConfigConvertFilename(filename, config, true, false); // Resolved filename
     FILE *statsFile = fopen (resolved, "w");
     if (!statsFile) {

trunk/pswarp/src/pswarpDefineSkycell.c

@@ -38 +38 @@
 
     // 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]);

trunk/pswarp/src/pswarpLoop.c

@@ -103 +103 @@
     FILE *statsFile = NULL;             // File stream for statistics
     if (mdok && statsName && strlen(statsName) > 0) {
-        psString resolved = pmConfigConvertFilename(statsName, config, true);
+        psString resolved = pmConfigConvertFilename(statsName, config, true, false);
         statsFile = fopen(resolved, "w");
         if (!statsFile) {