Changeset 10439 for trunk/ppImage/src/ppImageArguments.c

Timestamp:

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

Author:

eugene

Message:

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

File:

• trunk/ppImage/src/ppImageArguments.c (modified) (2 diffs)

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"))) {