Changeset 13849

Timestamp:

Jun 15, 2007, 2:33:47 PM (19 years ago)

Author:

eugene

Message:

adding option to processedimfile to select on state and mode (default is run / master)

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (4 diffs)
• dettoolConfig.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -2955 +2955 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    char *value = NULL;
     bool status = false;
+
     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
     if (!status) {
@@ -2980 +2982 @@
         "   AND detProcessedImfile.exp_tag = detInputExp.exp_tag"
         " WHERE"
-        "   detRun.state = 'run'"
-        "   AND detRun.mode = 'master'"
     );
+    // NOTE the above WHERE is completed with the following line:
+
+    // add the two required restrictions: detRun.state and detRun.mode
+    if ((value = psMetadataLookupStr(&status, config->args, "-select_state"))) {
+        psStringAppend(&query, " detRun.state = '%s'", value);
+    } else {
+        psStringAppend(&query, " detRun.state = 'run'");
+    }
+    if ((value = psMetadataLookupStr(&status, config->args, "-select_mode"))) {
+        psStringAppend(&query, " AND detRun.mode = '%s'", value);
+    } else {
+        psStringAppend(&query, " AND detRun.mode = 'master'");
+    }
 
     if (config->where) {
@@ -3011 +3024 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
-        return false;
-    }
-    psFree(query);
-
     // treat limit == 0 as "no limit"
     if (limit) {
@@ -3024 +3030 @@
         psFree(limitString);
     }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
 
     psArray *output = p_psDBFetchResult(config->dbh);

trunk/ippTools/src/dettoolConfig.c

@@ -356 +356 @@
     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
             "search for class ID", NULL);
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_state",  0,
+            "search for state", NULL);
+    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_mode",  0,
+            "search for mode", NULL);
     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-chip",  0,
             "restrict results to completed 'chip' sets", false);