Changeset 19418

Timestamp:

Sep 8, 2008, 1:56:48 PM (18 years ago)

Author:

Paul Price

Message:

Add label to the restriction.

File:

• trunk/ippTools/src/pxchip.c (modified) (6 diffs)

trunk/ippTools/src/pxchip.c

@@ -72 +72 @@
     psMetadataAddF32(md,  PS_LIST_TAIL, "-solang_max",         0, "search by max solar angle", NAN);
     psMetadataAddStr(md,  PS_LIST_TAIL, "-comment",            0, "search by comment field (LIKE comparison)", NULL);
-    // psMetadataAddStr(md,  PS_LIST_TAIL, "-label",              0, "search by label (LIKE comparison)", NULL);
+    psMetadataAddStr(md,  PS_LIST_TAIL, "-label",              0, "search by label", NULL);
     return true;
 }
@@ -85 +85 @@
     // processedimfile : rawExp, chipRun, chipProcessedImfile
     // revertprocessedimfile : rawExp, chipProcessedImfile
-    // updateprocessedimfile : chipProcessedImfile 
+    // updateprocessedimfile : chipProcessedImfile
     PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
     PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
@@ -124 +124 @@
     PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<");
     PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-label", "chipRun.label", "==");
     return true;
 }
@@ -185 +186 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
     // note label == NULL should be explicitly allowed
- 
+
     char *query = "UPDATE chipRun SET label = '%s' WHERE chip_id = %" PRId64;
     if (!p_psDBRunQuery(config->dbh, query, label, chip_id)) {
@@ -201 +202 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
     // note label == NULL should be explicitly allowed
- 
+
     psString query = psStringCopy("UPDATE chipRun JOIN rawExp USING(exp_id) SET label = '%s'");
 
@@ -238 +239 @@
             0x0, // chip_id
             exp_id,
-            "new",      // state                
+            "new",      // state
             workdir,
             "dirty",    // workdir_state