Changeset 10436

Timestamp:

Dec 4, 2006, 11:38:08 AM (19 years ago)

Author:

magnier

Message:

added pmConfigRecipeOptions

Location:

trunk/psModules/src/config

Files:

• pmConfigRecipes.c (modified) (1 diff)
• pmConfigRecipes.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfigRecipes.c

@@ -19 +19 @@
 static bool loadRecipeSymbols(pmConfig *config);
 static bool loadRecipeOptions(pmConfig *config);
+
+// use this function to select the options structure for the specified recipe
+// add additional command-line options to this metadata (before parsing the camera)
+psMetadata *pmConfigRecipeOptions (pmConfig *config, char *recipeName)
+{
+
+    // if the recipe is already defined in config->arguments, supplement
+    // save the recipe options onto config->arguments:RECIPES
+    psMetadata *options = psMetadataLookupMetadata(NULL, config->arguments, "OPTIONS");
+    if (!options) {
+        options = psMetadataAlloc ();
+        psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "OPTIONS",  PS_DATA_METADATA, "", options);
+    } else {
+        psMemIncrRefCounter (options); // so we can free options below if not allocated here
+    }
+
+    // look for the recipe defined in recipes
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, options, recipeName);
+    if (!recipe) {
+        recipe = psMetadataAlloc ();
+        psMetadataAddPtr (options, PS_LIST_TAIL, recipeName,  PS_DATA_METADATA, "", recipe);
+    } else {
+        psMemIncrRefCounter (recipe); // so we can free options below if not allocated here
+    }
+    psFree (options);
+    return (recipe);
+}
 
 // this function may be called several times.  it attempts to load the recipe data from one of

trunk/psModules/src/config/pmConfigRecipes.h

@@ -9 +9 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-12-04 20:41:51 $
+/// @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-12-04 21:38:08 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -29 +29 @@
 bool pmConfigLoadRecipeArguments (pmConfig *config);
 bool pmConfigLoadRecipeOptions (pmConfig *config, char *flag);
+psMetadata *pmConfigRecipeOptions (pmConfig *config, char *recipe);
 
 #endif