Changeset 6122

Timestamp:

Jan 20, 2006, 11:18:03 PM (20 years ago)

Author:

jhoblitt

Message:

add -inst option to set the camera name
ignore -camera

Location:

trunk/ippTools/src

Files:

• chiptoolConfig.c (modified) (4 diffs)
• p2searchRawFrames.c (modified) (2 diffs)

trunk/ippTools/src/chiptoolConfig.c

@@ -7 +7 @@
     // Parse the configurations (re-org a la ppImage)
     config->site = NULL;            // Site configuration
-    config->camera = NULL;          // Camera configuration
+    config->camera = NULL;          // Camera configuration (unused)
     config->recipe = NULL;          // Recipe configuration
+    config->camera_name = NULL;     // Camera name
+
     if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
-    }
-
-    bool status;
-    config->camera_name = psMetadataLookupStr(&status, config->camera, "name");
-    if (!config->camera_name) {
-        // die
     }
 
@@ -63 +59 @@
         config->mode = P2_MODE_UPDATE;
     }
-
+    
     // paul's argument parsing convention requires: -key value 
     psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-quick",   0, "examine raw image table, write ppImage output", false);
@@ -70 +66 @@
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-update",  0, "update pending image table", "");
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-time",    0, "define time range of interest", "");
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-camera",  0, "define camera 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", "");
 
@@ -89 +85 @@
     }
 
+    bool status;
+    config->camera_name = psMetadataLookupStr(&status, config->arguments,
+        "-inst");
     // 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]);

trunk/ippTools/src/p2searchRawFrames.c

@@ -9 +9 @@
 //    psMetadataAddS32  (where, PS_LIST_TAIL, "TYPE",  0, "==", P2_TYPE_OBJECT);
 
-    if (config->camera != NULL) {
-        psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==", config->camera_name);
+    if (config->camera_name != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==",
+            config->camera_name);
     }
     if (config->filter != NULL) {
-        psMetadataAddStr(where, PS_LIST_TAIL, "filter", 0, "==", config->filter);
+        psMetadataAddStr(where, PS_LIST_TAIL, "filter", 0, "==",
+            config->filter);
     }
     // psMetadataConfig does not support times yet
@@ -27 +29 @@
     psFree (where);
     if (!exposures) {
-        psError(PS_ERR_UNKNOWN, false, "database access failed");
+        psError(PS_ERR_UNKNOWN, false, "no rawScienceExp rows found");
 
         return NULL;