Changeset 13246

Timestamp:

May 4, 2007, 11:27:39 AM (19 years ago)

Author:

Paul Price

Message:

Resolving file names, so as to be suitable for use with Nebulous

Location:

trunk/ppMerge/src

Files:

• ppMergeCheckInputs.c (modified) (3 diffs)
• ppMergeOptions.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -23 +23 @@
     psString outName = psMetadataLookupStr(NULL, config->arguments, "OUTPUT"); // The output file name
     assert(outName);                    // It should be there!
+    outName = pmConfigConvertFilename(outName, config, true);
     data->outFile = psFitsOpen(outName, "w"); // Output FITS file
     if (!data->outFile) {
         // There's no point in continuing if we can't open the output
         psErrorStackPrint(stderr, "Can't open output image: %s\n", outName);
+        psFree(outName);
         exit(EXIT_FAILURE);
     }
+    psFree(outName);
 
     // Statistics file
@@ -59 +62 @@
         }
         psTrace("ppMerge", 1, "Checking input file %s....\n", name);
-        psFits *inFile = psFitsOpen(filenames->data[i], "r"); // The FITS file to read
+        psString resolved = pmConfigConvertFilename(name, config, false); // Resolved file name
+        psFits *inFile = psFitsOpen(resolved, "r"); // The FITS file to read
         if (!inFile) {
-            psLogMsg(__func__, PS_LOG_WARN, "Unable to open input file %s --- ignored.\n", name);
+            psLogMsg(__func__, PS_LOG_WARN, "Unable to open input file %s --- ignored.\n", resolved);
             // Kick it out
             psFree(filenames->data[i]);
@@ -67 +71 @@
             continue;
         }
+        psFree(resolved);
         psMetadata *header = psFitsReadHeader(NULL, inFile); // The FITS (primary) header
         data->files->data[i] = inFile;

trunk/ppMerge/src/ppMergeOptions.c

@@ -100 +100 @@
     if (!config->camera) {
         psArray *filenames = psMetadataLookupPtr(NULL, config->arguments, "INPUT"); // The input file names
-        psFits *inFile = psFitsOpen(filenames->data[0], "r"); // The FITS file to read
+        psString resolved = pmConfigConvertFilename(filenames->data[0], config, false); // Resolved file name
+        psFits *inFile = psFitsOpen(resolved, "r"); // The FITS file to read
         if (!inFile) {
-            psError(PS_ERR_IO, false, "Unable to open input file %s to determine camera.\n",
-                    (char *)filenames->data[0]);
+            psError(PS_ERR_IO, false, "Unable to open input file %s to determine camera.\n", resolved);
+            psFree(resolved);
+            psFree(config);
             exit(EXIT_FAILURE);
         }
+        psFree(resolved);
         psMetadata *header = psFitsReadHeader(NULL, inFile); // The FITS (primary) header
         psFitsClose(inFile);