Changeset 13181

Timestamp:

May 2, 2007, 5:44:52 PM (19 years ago)

Author:

Paul Price

Message:

Need to resolve filenames, for Nebulous support.

Location:

trunk/ppStats/src

Files:

• ppStatsSetupFromArgs.c (modified) (2 diffs)
• ppStatsStandAlone.c (modified) (2 diffs)

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -152 +152 @@
     // Open the input file, determine the camera
     {
-        data->fits = psFitsOpen(inName, "r");
+        psString resolved = pmConfigConvertFilename(inName, config, false); // Resolved filename
+        data->fits = psFitsOpen(resolved, "r");
         if (!data->fits) {
-            psError(PS_ERR_IO, false, "Unable to open input file %s\n", inName);
-            goto die;
-        }
+            psError(PS_ERR_IO, false, "Unable to open input file %s\n", resolved);
+            psFree(resolved);
+            goto die;
+        }
+        psFree(resolved);
+
         psMetadata *header = psFitsReadHeader(NULL, data->fits); // The FITS (primary) header
         psMetadata *format = pmConfigCameraFormatFromHeader(config, header, true);
@@ -166 +170 @@
         data->fpa = pmFPAConstruct(config->camera);
         if (!data->fpa) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to construct FPA for %s\n", inName);
+            psError(PS_ERR_UNKNOWN, false, "Unable to construct FPA for %s\n", resolved);
             psFree(header);
             psFree(format);

trunk/ppStats/src/ppStatsStandAlone.c

@@ -39 +39 @@
     if (argc == 2) {
         outName = argv[1];
+        psString resolved = pmConfigConvertFilename(outName, config, true); // Resolved filename
+
         if (outName && strlen(outName) > 0) {
             outFile = fopen(outName, "w");
             if (!outFile) {
-                psLogMsg("ppStats", PS_LOG_ERROR, "Unable to open output file %s\n", outName);
+                psLogMsg("ppStats", PS_LOG_ERROR, "Unable to open output file %s\n", resolved);
+                psFree(resolved);
                 // XXX this could be a system or config error, but not a data error
                 status = PS_EXIT_CONFIG_ERROR;
@@ -48 +51 @@
             }
         } else {
-            psLogMsg("ppStats", PS_LOG_ERROR, "Unable to open output file.\n");
+            psLogMsg("ppStats", PS_LOG_ERROR, "Unable to open output file %s.\n", resolved);
+            psFree(resolved);
             status = PS_EXIT_CONFIG_ERROR;
             goto die;
         }
+        psFree(resolved);
     }