Changeset 10439

Timestamp:

Dec 4, 2006, 11:51:33 AM (19 years ago)

Author:

eugene

Message:

updated to new pmConfigRead, added PSPHOT_RECIPE and PSASTRO_RECIPE, new option lookup

Location:

trunk/ppImage/src

Files:

• ppFocusArguments.c (modified) (2 diffs)
• ppFocusParseCamera.c (modified) (1 diff)
• ppImageArguments.c (modified) (2 diffs)
• ppImageAstrom.c (modified) (1 diff)
• ppImageLoop.c (modified) (1 diff)
• ppImageParseCamera.c (modified) (1 diff)
• ppImagePhotom.c (modified) (1 diff)
• ppTest.c (modified) (2 diffs)

trunk/ppImage/src/ppFocusArguments.c

@@ -18 +18 @@
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv, RECIPE_NAME);
     if (config == NULL) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -24 +24 @@
     }
 
+    // save the following additional recipe values based on command-line options
+    // these options override the PPIMAGE recipe values loaded from recipe files
+    psMetadata *options = pmConfigRecipeOptions (config, RECIPE_NAME);
+
     // save these recipe options until we have loaded the options
-    psMetadata *options = psMetadataAlloc ();
-    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PPIMAGE.OPTIONS",  PS_DATA_METADATA, "", options);
+    // psMetadata *options = psMetadataAlloc ();
+    // psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PPIMAGE.OPTIONS",  PS_DATA_METADATA, "", options);
 
     // the following options override the PPIMAGE recipe options

trunk/ppImage/src/ppFocusParseCamera.c

@@ -17 +17 @@
         return NULL;
     }
-
-    // add recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME);
-    psMetadata *arglist = psMetadataLookupPtr (&status, config->arguments, "PPIMAGE.OPTIONS");
-    psMetadataCopy (recipe, arglist);
 
     // parse the options from the metadata format to the ppImageOptions structure

trunk/ppImage/src/ppImageArguments.c

@@ -34 +34 @@
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv, RECIPE_NAME);
     if (config == NULL) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -40 +40 @@
     }
 
+    // save the following additional recipe values based on command-line options
+    // these options override the PPIMAGE recipe values loaded from recipe files
+    psMetadata *options = pmConfigRecipeOptions (config, RECIPE_NAME);
+
     // save these recipe options until we have loaded the options
-    psMetadata *options = psMetadataAlloc ();
-    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PPIMAGE.OPTIONS",  PS_DATA_METADATA, "", options);
+    // psMetadata *options = psMetadataAlloc ();
+    // psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PPIMAGE.OPTIONS",  PS_DATA_METADATA, "", options);
 
     if ((argnum = psArgumentGet(argc, argv, "-stat"))) {

trunk/ppImage/src/ppImageAstrom.c

@@ -11 +11 @@
     // select recipe options supplied on command line
     // XXX move these options to the "PSASTRO" recipe?
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME);
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSASTRO_RECIPE);
 
     // find or define a pmFPAfile PSPHOT.INPUT

trunk/ppImage/src/ppImageLoop.c

@@ -17 +17 @@
 
     bool mdok;                      // Status of MD lookup
-    psMetadata *extraOpts = psMetadataLookupMetadata(&mdok, config->arguments,
-                                                     "PPIMAGE.OPTIONS"); // Extra options
-    const char *statsName = psMetadataLookupStr(&mdok, extraOpts, "STATS"); // Filename for statistics
+    psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, RECIPE_NAME);
+    const char *statsName = psMetadataLookupStr(&mdok, recipe, "STATS"); // Filename for statistics
     psMetadata *stats = NULL;           // Container for statistics
     FILE *statsFile = NULL;             // File stream for statistics

trunk/ppImage/src/ppImageParseCamera.c

@@ -35 +35 @@
     // add recipe options supplied on command line
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME);
-    psMetadata *arglist = psMetadataLookupPtr (&status, config->arguments, "PPIMAGE.OPTIONS");
-    psMetadataCopy (recipe, arglist);
 
     // parse the options from the metadata format to the ppImageOptions structure

trunk/ppImage/src/ppImagePhotom.c

@@ -14 +14 @@
 
     // select recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PSPHOT");
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
 
     // set default recipe values here

trunk/ppImage/src/ppTest.c

@@ -17 +17 @@
 // ppImageConfig.c
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv, "PPIMAGE");
     if (! config) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -73 +73 @@
     }
     // Determine the correct recipe to use
-    if (! config->recipes && !pmConfigReadRecipes(config)) {
+    if (! config->recipes && !pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CAMERA | PM_RECIPE_SOURCE_CL)) {
         // There's no point in continuing if we can't work out what recipes to use
         psErrorStackPrint(stderr, "Can't find recipe configuration!\n");