Changeset 14371

Timestamp:

Jul 24, 2007, 3:39:58 PM (19 years ago)

Author:

Paul Price

Message:

Parse out path:// etc in the catdir.

File:

• trunk/psastro/src/psastroLoadRefstars.c (modified) (5 diffs)

trunk/psastro/src/psastroLoadRefstars.c

@@ -19 +19 @@
     // XXX CATDIR needs to look up abstracted name from psastro.config
     // XXX which is then selected from the top-level ipprc.config
-    char *CATDIR = psMetadataLookupStr(NULL, recipe, "DVO.CATDIR");
+    char *catdir = psMetadataLookupStr(NULL, recipe, "DVO.CATDIR");
+    psString CATDIR = pmConfigConvertFilename(catdir, config, false); // Resolved filename
     PS_ASSERT (CATDIR, NULL);
 
@@ -31 +32 @@
     if ((fd = mkstemp (tempFile)) == -1) {
         psError(PSASTRO_ERR_REFSTARS, true, "error creating temp output file\n");
+        psFree(CATDIR);
         return NULL;
     }
@@ -47 +49 @@
     if (strcasecmp(CATDIR, "NONE")) {
         psStringAppend (&getstarCommand, " -D CATDIR %s", CATDIR);
-    } 
+    }
+    psFree(CATDIR);
 
     // psStringAppend (&getstarCommand, " -D CATMODE mef -maglim %f -region %f %f %f %f -o %s", MAGmax, RAmin, DECmin, RAmax, DECmax, tempFile);
@@ -81 +84 @@
 
     if (table == NULL) {
-        psError(PSASTRO_ERR_REFSTARS, true, "failure to load astrometric reference\n");
+        psError(PSASTRO_ERR_REFSTARS, true, "failure to load astrometric reference\n");
         return NULL;
     }
@@ -119 +122 @@
     // dump or plot the available refstars
     if (psTraceGetLevel("psastro.dump") > 0) {
-        psastroDumpRefstars (refstars, "refstars.dat");
+        psastroDumpRefstars (refstars, "refstars.dat");
     }
 
     if (psTraceGetLevel("psastro.plot") > 0) {
-        psastroPlotRefstars (refstars);
+        psastroPlotRefstars (refstars);
     }