Changeset 18045

Timestamp:

Jun 9, 2008, 5:20:11 PM (18 years ago)

Author:

eugene

Message:

convert psastro DVO.CATDIR to PSASTRO.CATDIR; lookup recipe name as possible abstraction to PSASTRO.CATDIR

File:

• trunk/psastro/src/psastroLoadRefstars.c (modified) (1 diff)

trunk/psastro/src/psastroLoadRefstars.c

@@ -28 +28 @@
     DECmax += dDEC * fieldPadding;
 
-    // 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");
+    // grab the PSASTRO.CATDIR name from the PSASTRO recipe
+    char *catdir_recipe = psMetadataLookupStr(&status, recipe, "PSASTRO.CATDIR");
+    psAssert (catdir_recipe, NULL);
+
+    // substitute abstract name with concrete name, if present in PSASTRO.CATDIRS
+    psMetadata *catdirs = psMetadataLookupMetadata(&status, config->complete, "PSASTRO.CATDIRS"); // List of cameras
+    if (!catdirs) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSASTRO.CATDIRS in the system configuration.\n");
+        return false;
+    }
+    char *catdir_virtual = psMetadataLookupStr(&status, catdirs, catdir_recipe);
+    char *catdir = (catdir_virtual == NULL) ? catdir_recipe : catdir_virtual;
+
+    // convert the uri to a real filename (ie, path://foobar) 
     psString CATDIR = pmConfigConvertFilename(catdir, config, false); // Resolved filename
     PS_ASSERT (CATDIR, NULL);