Changeset 6368 for trunk/ippTools/src/chiptoolConfig.c

Timestamp:

Feb 7, 2006, 4:35:29 PM (20 years ago)

Author:

jhoblitt

Message:

remove arguments field from pxConfig

File:

• trunk/ippTools/src/chiptoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/chiptoolConfig.c

@@ -23 +23 @@
 
     // Parse other command-line arguments
-    config->arguments = psMetadataAlloc(); // The arguments, with default values
+    psMetadata *arguments = psMetadataAlloc(); // The arguments, with default values
 
     int N;
@@ -66 +66 @@
     
     // paul's argument parsing convention requires: -key value 
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-quick",   0, "examine raw image table, write ppImage output", false);
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-define",  0, "examine raw image table, add to pending image table", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
-//    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-done",  0, "mov image from pending to done table", "");
-//    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-inst",  0, "define camera of interest", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-exp_id",  0, "define exposure ID", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-class_id",  0, "define class ID", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-url",  0, "define URL", "");
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-quick",   0, "examine raw image table, write ppImage output", false);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-define",  0, "examine raw image table, add to pending image table", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-pending", 0, "examine pending image table, write ppImage output", "");
+//    psMetadataAddStr(arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-done",  0, "mov image from pending to done table", "");
+//    psMetadataAddStr(arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-inst",  0, "define camera of interest", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-filter",  0, "define filter of interest", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-exp_id",  0, "define exposure ID", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-class",  0, "define class", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-class_id",  0, "define class ID", "");
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-url",  0, "define URL", "");
 
     if (config->mode == PX_MODE_NONE) {
         fprintf (stderr, "search mode not specified\n");
-        psArgumentHelp(config->arguments);
-        psFree(config->arguments);
+        psArgumentHelp(arguments);
+        psFree(arguments);
         exit(EXIT_FAILURE);
     }
 
-    if (! psArgumentParse(config->arguments, &argc, argv) || argc != 1) {
+    if (! psArgumentParse(arguments, &argc, argv) || argc != 1) {
         printf("\nPan-STARRS Phase 2 Search Tool\n\n");
         printf("Usage: %s [mode] [options]\n\n", argv[0]);
         printf(" [mode] : -quick | -define | -pending | -donee\n\n");
-        psArgumentHelp(config->arguments);
-        psFree(config->arguments);
+        psArgumentHelp(arguments);
+        psFree(arguments);
         exit(EXIT_FAILURE);
     }
 
     bool status;
-    config->camera_name = psMetadataLookupStr(&status, config->arguments,
+    config->camera_name = psMetadataLookupStr(&status, arguments,
         "-inst");
-    config->exp_id = psMetadataLookupStr(&status, config->arguments, "-exp_id");
-    config->class = psMetadataLookupStr(&status, config->arguments, "-class");
-    config->class_id = psMetadataLookupStr(&status, config->arguments,
+    config->exp_id = psMetadataLookupStr(&status, arguments, "-exp_id");
+    config->class = psMetadataLookupStr(&status, arguments, "-class");
+    config->class_id = psMetadataLookupStr(&status, arguments,
         "-class_id");
-    config->url = psMetadataLookupStr(&status, config->arguments, "-url");
+    config->url = psMetadataLookupStr(&status, arguments, "-url");
 
     // XXX why is "" being returned when -[foo] isn't specified?
@@ -160 +160 @@
 
     // add the input and output images to the arguments list
-    //psMetadataAddStr (config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[1]);
+    //psMetadataAddStr (arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[1]);
 
     // define Database handle, if used