Changeset 13633

Timestamp:

Jun 4, 2007, 5:33:33 PM (19 years ago)

Author:

Paul Price

Message:

Shouldn't have to supply chip_id for -addprocessedexp --- there are multiple chip_ids, and none of them are used in updating the database for the camera step.

Location:

trunk/ippTools/src

Files:

• camtool.c (modified) (1 diff)
• camtoolConfig.c (modified) (6 diffs)

trunk/ippTools/src/camtool.c

@@ -432 +432 @@
     if (!cam_id) {
         psError(PS_ERR_UNKNOWN, true, "-cam_id is required");
-        return false;
-    }
-
-    psString chip_id = psMetadataLookupStr(&status, config->args, "-chip_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -chip_id");
-        return false;
-    }
-    if (!chip_id) {
-        psError(PS_ERR_UNKNOWN, true, "-chip_id is required");
         return false;
     }

trunk/ippTools/src/camtoolConfig.c

@@ -114 +114 @@
             "use the simple output format", false);
 
-    
+
     // -pendingimfile
     psMetadata *pendingimfileArgs = psMetadataAlloc();
@@ -133 +133 @@
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-cam_id", 0,
             "define camtool ID (required)", NULL);
-    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-chip_id", 0,
-            "define chiptool ID (required)", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI (required)", NULL);
@@ -190 +188 @@
     psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label",  0,
             "name of a label to mask out (required)", NULL);
-    
+
     // -masked
     psMetadata *maskedArgs = psMetadataAlloc();
     psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
-    
+
     // -unblock
     psMetadata *unblockArgs = psMetadataAlloc();
@@ -202 +200 @@
 
     psMetadata *argSets = psMetadataAlloc();
-    psMetadata *modes = psMetadataAlloc(); 
+    psMetadata *modes = psMetadataAlloc();
 
     PXTOOL_ADD_MODE("-queue",               "", CAMTOOL_MODE_QUEUE,         queueArgs);
@@ -268 +266 @@
     // convert '-inst' to 'camera'
     {
-        psString str = NULL; 
+        psString str = NULL;
         bool status = false;
         if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {
@@ -281 +279 @@
     addWhereStr(exp_type);
     {
-        int imfiles = 0; 
+        int imfiles = 0;
         bool status = false;
         if ((imfiles = psMetadataLookupS32(&status, config->args, "-imfiles"))) {