Changeset 33617 for trunk

Timestamp:

Mar 28, 2012, 1:04:27 PM (14 years ago)

Author:

bills

Message:

In chiptool -dropprocessedimfile accept -cam_id as a selector

Location:

trunk/ippTools

Files:

• share/chiptool_dropprocessedimfile_update.sql (modified) (1 diff)
• src/chiptool.c (modified) (2 diffs)
• src/chiptoolConfig.c (modified) (1 diff)

trunk/ippTools/share/chiptool_dropprocessedimfile_update.sql

@@ -1 @@
-UPDATE chipProcessedImfile 
-    SET quality = %d,
-        data_state = 'full',
-        magicked = 0,
-        fault = 0
+UPDATE chipProcessedImfile LEFT JOIN camRun USING(chip_id)
+    SET chipProcessedImfile.quality = %d,
+        chipProcessedImfile.data_state = 'full',
+        chipProcessedImfile.magicked = 0,
+        chipProcessedImfile.fault = 0

trunk/ippTools/src/chiptool.c

@@ -1015 +1015 @@
     PXOPT_COPY_S64(config->args, where, "-chip_id", "chipProcessedImfile.chip_id", "==");
     PXOPT_COPY_STR(config->args, where, "-class_id", "chipProcessedImfile.class_id", "==");
-    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", true, false);
+    PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
+
+    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
+    // if cam_id is not supplied chip_id is required
+    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);
     PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);
     PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", true, false);
@@ -1026 +1030 @@
     if (psListLength(where->list) == 0) {
         // won't get here
-        psError(PXTOOLS_ERR_CONFIG, true, "-chip_id and -class_id are required");
+        psError(PXTOOLS_ERR_CONFIG, true, "-chip_id (or -cam_id) and -class_id are required");
         return false;
     }

trunk/ippTools/src/chiptoolConfig.c

@@ -242 +242 @@
     // -dropprocessedimfile
     psMetadata *dropprocessedimfileArgs = psMetadataAlloc();
-    psMetadataAddS64(dropprocessedimfileArgs, PS_LIST_TAIL, "-chip_id",  0,            "search by chip ID (required)", 0);
+    psMetadataAddS64(dropprocessedimfileArgs, PS_LIST_TAIL, "-chip_id",  0,            "search by chip ID", 0);
+    psMetadataAddS64(dropprocessedimfileArgs, PS_LIST_TAIL, "-cam_id",  0,            "search by cam ID", 0);
     psMetadataAddStr(dropprocessedimfileArgs,  PS_LIST_TAIL, "-class_id",           0, "search by class ID (required)", NULL);
     psMetadataAddS16(dropprocessedimfileArgs, PS_LIST_TAIL, "-set_quality",  0,        "set quality (required)", 0);