Changeset 12916

Timestamp:

Apr 18, 2007, 4:10:12 PM (19 years ago)

Author:

rhl

Message:

pmConfig no longer owns arg[cv];

Location:

trunk/psModules/src/config

Files:

• pmConfig.h (modified) (5 diffs)
• pmConfigRecipes.c (modified) (8 diffs)
• pmConfigRecipes.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  * 
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-18 22:42:33 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-19 02:10:12 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -61 +61 @@
 
 /// Allocator for pmConfig
-pmConfig *pmConfigAlloc(int *argc,      /// Number of command-line arguments
-                        char **argv     /// Command-line arguments
-                       );
+pmConfig *pmConfigAlloc();
 
 /// Set static configuration information
@@ -84 +82 @@
 pmConfig *pmConfigRead(int *argc,       ///< Number of command-line arguments
                        char **argv, ///< Array of command-line arguments
-                       char *defaultRecipe ///< name of top-level recipe for this program
+                       const char *defaultRecipe ///< name of top-level recipe for this program
                       );
 
@@ -143 +141 @@
 /// Given the 'file' and 'list' arguments (e.g., "-file" and "-list"), find the arguments associated with
 /// these words and interpret them as lists of files.  Return an array of the resulting filenames.
-psArray *pmConfigFileSets(pmConfig *config, ///< Configuration, containing command-line arguments
+psArray *pmConfigFileSets(int *argc,    ///< Number of arguments (I/O)
+                          char **argv,  ///< Array of arguments
                           const char *file, ///< CL argument specifying a filename
                           const char *list ///< CL argument specifying a text file with a list of filenames
@@ -153 +152 @@
 /// stuffs the array of filenames into the metadata under "name".
 bool pmConfigFileSetsMD(psMetadata *metadata, ///< Metadata into which to stuff the array
-                        pmConfig *config, ///< Configuration (which command-line arguments)
+                        int *argc,    ///< Number of arguments (I/O)
+                        char **argv,  ///< Array of arguments
                         const char *name, ///< Name for array in the metadata
                         const char *file, ///< CL argument specifying a filename

trunk/psModules/src/config/pmConfigRecipes.c

@@ -51 +51 @@
 
 // this function may be called several times.  it attempts to load the recipe data from one of
-// three locations: config->site, config->camera, and config->argv.  We cannot read the recipes
+// three locations: config->site, config->camera, and argv.  We cannot read the recipes
 // from config->camera until a camera has been read BUT, the argv recipes must override the
 // camera and site recipes.
@@ -124 +124 @@
 
 // search for options of the form -D KEY VALUE or -D RECIPE:KEY VALUE
-bool pmConfigLoadRecipeOptions (pmConfig *config, char *flag)
+bool pmConfigLoadRecipeOptions (int *argc, char **argv, pmConfig *config, char *flag)
 {
     bool success;
@@ -140 +140 @@
 
     // -D key value (all added as string)
-    while ((argNum = psArgumentGet (*config->argc, config->argv, flag))) {
-        psArgumentRemove (argNum, config->argc, config->argv);
+    while ((argNum = psArgumentGet (*argc, argv, flag))) {
+        psArgumentRemove (argNum, argc, argv);
 
         // do we have enough arguments?
-        if (argNum + 1 >= *config->argc) {
+        if (argNum + 1 >= *argc) {
             psError(PS_ERR_IO, true, "insufficient parameters for command-line argument -D");
             return false;
@@ -152 +152 @@
         const char *recipeName = NULL;
         char *key;
-        psArray *words = psStringSplitArray(config->argv[argNum], ":", false);
+        psArray *words = psStringSplitArray(argv[argNum], ":", false);
         switch (words->n) {
         case 1:
@@ -182 +182 @@
         bool valid = false;
         if (!strcmp (flag, "-D")) {
-            psMetadataAddStr (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", config->argv[argNum+1]);
+            psMetadataAddStr (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", argv[argNum+1]);
             valid = true;
         }
         if (!strcmp (flag, "-Di")) {
-            psMetadataAddS32 (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", atoi(config->argv[argNum+1]));
+            psMetadataAddS32 (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", atoi(argv[argNum+1]));
             valid = true;
         }
         if (!strcmp (flag, "-Df")) {
-            psMetadataAddF32 (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", atof(config->argv[argNum+1]));
+            psMetadataAddF32 (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", atof(argv[argNum+1]));
             valid = true;
         }
         if (!strcmp (flag, "-Db")) {
-            if (!strcasecmp (config->argv[argNum+1], "true")) {
+            if (!strcasecmp (argv[argNum+1], "true")) {
                 psMetadataAddBool (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", true);
             } else {
@@ -204 +204 @@
         assert (valid);  // flag may be: -D, -Df, -Di, -Db
 
-        psArgumentRemove (argNum, config->argc, config->argv);
-        psArgumentRemove (argNum, config->argc, config->argv);
+        psArgumentRemove (argNum, argc, argv);
+        psArgumentRemove (argNum, argc, argv);
     }
     return true;
@@ -214 +214 @@
 // if VALUE is not an exiting file, it is a symbolic lookup: it is saved on config->recipeSymbols
 // for later interpolation (pmConfigReadRecipes with option CL)
-bool pmConfigLoadRecipeArguments (pmConfig *config)
+bool pmConfigLoadRecipeArguments (int *argc, char **argv, pmConfig *config)
 {
     bool success; 
@@ -228 +228 @@
     // Go through the command-line arguments
     int argNum; // Argument number for "-recipe"
-    while ((argNum = psArgumentGet(*config->argc, config->argv, "-recipe")) > 0) {
-        psArgumentRemove(argNum, config->argc, config->argv);
-        if (argNum + 1 >= *config->argc) {
+    while ((argNum = psArgumentGet(*argc, argv, "-recipe")) > 0) {
+        psArgumentRemove(argNum, argc, argv);
+        if (argNum + 1 >= *argc) {
             psError(PS_ERR_IO, false, "-recipe command-line switch provided without the required recipe and source\n");
             return false;
         }
 
-        char *recipeName = psStringCopy(config->argv[argNum]); // Name of the recipe
-        psArgumentRemove(argNum, config->argc, config->argv);
-        char *recipeSource = psStringCopy(config->argv[argNum]); // Source of the recipe
-        psArgumentRemove(argNum, config->argc, config->argv);
+        char *recipeName = psStringCopy(argv[argNum]); // Name of the recipe
+        psArgumentRemove(argNum, argc, argv);
+        char *recipeSource = psStringCopy(argv[argNum]); // Source of the recipe
+        psArgumentRemove(argNum, argc, argv);
 
         if (access(recipeSource, R_OK) == 0) {

trunk/psModules/src/config/pmConfigRecipes.h

@@ -6 +6 @@
  *  @author Eugene Magnier, IfA
  * 
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 01:05:41 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-19 02:10:12 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -26 +26 @@
 
 
-bool pmConfigLoadRecipeArguments (pmConfig *config);
-bool pmConfigLoadRecipeOptions (pmConfig *config, char *flag);
+bool pmConfigLoadRecipeArguments (int *argc, char **argv, pmConfig *config);
+bool pmConfigLoadRecipeOptions (int *argc, char **argv, pmConfig *config, char *flag);
 psMetadata *pmConfigRecipeOptions (pmConfig *config, char *recipe);