Changeset 18914

Timestamp:

Aug 5, 2008, 9:19:40 AM (18 years ago)

Author:

Paul Price

Message:

config->complete has been removed.

Location:

trunk

Files:

• ppConfigDump/src/ppConfigDump.c (modified) (2 diffs)
• psastro/src/psastroLoadRefstars.c (modified) (1 diff)
• psphot/src/psphotOutput.c (modified) (1 diff)
• pswarp/src/pswarpDefineSkycell.c (modified) (1 diff)

trunk/ppConfigDump/src/ppConfigDump.c

@@ -65 +65 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dump-site", 0, "Filename for site configuration", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dump-system", 0, "Filename for system configuration", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-dump-complete", 0, "Filename for complete configuration",
-                     NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dump-camera", 0, "Filename for camera configuration", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dump-format", 0, "Filename for camera format", NULL);
@@ -132 +130 @@
     dump(systemName, "system configuration", config->system);
 
-    const char *completeName = psMetadataLookupStr(NULL, arguments, "-dump-complete"); // Complete filename
-    dump(completeName, "complete configuration", config->complete);
-
     const char *camName = psMetadataLookupStr(NULL, arguments, "-dump-camera"); // Camera filename
     dump(camName, "camera configuration", config->camera);

trunk/psastro/src/psastroLoadRefstars.c

@@ -33 +33 @@
 
     // substitute abstract name with concrete name, if present in PSASTRO.CATDIRS
-    psMetadata *catdirs = psMetadataLookupMetadata(&status, config->complete, "PSASTRO.CATDIRS"); // List of cameras
+    psMetadata *catdirs = psMetadataLookupMetadata(&status, config->site, "PSASTRO.CATDIRS"); // List of cameras
     if (!catdirs) {
         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSASTRO.CATDIRS in the system configuration.\n");

trunk/psphot/src/psphotOutput.c

@@ -22 +22 @@
 bool psphotDumpConfig (pmConfig *config) {
 
-  psMetadataConfigWrite (config->complete, "complete.md");
+  psMetadataConfigWrite (config->user, "user.md");
   psMetadataConfigWrite (config->camera, "camera.md");
   psMetadataConfigWrite (config->recipes, "recipes.md");

trunk/pswarp/src/pswarpDefineSkycell.c

@@ -64 +64 @@
     // XXX EAM : this operation should be defined as a pmConfig function (pmConfigCopy?)
     skyConfig = pmConfigAlloc(0, NULL);
-    skyConfig->complete = psMemIncrRefCounter (config->complete);
+    skyConfig->user = psMemIncrRefCounter (config->user);
 
     psFree (skyConfig->files);