Changeset 13246 for trunk/ppMerge/src/ppMergeOptions.c

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

File:

• trunk/ppMerge/src/ppMergeOptions.c (modified) (1 diff)

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