Changeset 13247

Timestamp:

May 4, 2007, 12:24:56 PM (19 years ago)

Author:

Paul Price

Message:

Resolving filenames so as to support Nebulous

Location:

trunk/ppStac/src

Files:

• ppStacCombine.c (modified) (1 diff)
• ppStacOptions.c (modified) (1 diff)

trunk/ppStac/src/ppStacCombine.c

@@ -16 +16 @@
     psRegion region = psRegionSet(0, 0, 0, 0); // Region to read
     for (int i = 0; i < inputs->n; i++) {
+        psString resolved = pmConfigConvertFilename(options->inFiles->data[i], options->config, false);
         psImage *image = psFitsReadImage(options->inFiles->data[i], region, 0);
         if (!image) {
-            psError(PS_ERR_IO, false, "Unable to read image %d\n", i);
+            psError(PS_ERR_IO, false, "Unable to read image %s\n", resolved);
+            psFree(resolved);
             return false;
         }
+        psFree(resolved);
         inputs->data[i] = image;
     }

trunk/ppStac/src/ppStacOptions.c

@@ -83 +83 @@
     }
 
-    const char *outName = argv[1];      // Output filename
+    psString outName = pmConfigConvertFilename(argv[1], options->config, true); // Output filename
     options->outFile = psFitsOpen(outName, "w");
     if (!options->outFile) {
         psError(PS_ERR_IO, false, "Unable to open output file %s.\n", outName);
         psFree(options);
+        psFree(outName);
         return NULL;
     }
+    psFree(outName);
 
     int numInputs = *argc - 2; // Number of input files