Changeset 14024

Timestamp:

Jul 5, 2007, 3:21:25 PM (19 years ago)

Author:

jhoblitt

Message:

merge regtool_find_unprocessed_exp.sql & regtool_pendingexp.sql

Location:

trunk/ippTools

Files:

• share/regtool_find_unprocessed_exp.sql (deleted)
• share/regtool_pendingexp.sql (modified) (1 diff)
• src/regtool.c (modified) (2 diffs)

trunk/ippTools/share/regtool_pendingexp.sql

@@ -1 @@
-SELECT
-    newExp.*
-FROM newExp
-JOIN newImfile
-    USING(exp_id)
-LEFT JOIN rawExp
-    USING(exp_id)
-WHERE
-    newExp.state = 'run'
-    AND rawExp.exp_id IS NULL
-    AND newExp.imfiles =
-    (SELECT COUNT(exp_id) FROM rawImfile
-        WHERE
-            rawImfile.exp_id = newExp.exp_id
-            AND rawImfile.fault = 0)
+SELECT DISTINCT * FROM
+    (SELECT
+       newExp.*
+    FROM newExp
+    JOIN newImfile
+       USING(exp_id)
+    LEFT JOIN rawExp
+       USING(exp_id)
+    WHERE
+        newExp.state = 'run'
+        AND rawExp.exp_id IS NULL
+        AND newExp.imfiles =
+        (SELECT COUNT(exp_id) FROM rawImfile
+            WHERE rawImfile.exp_id = newExp.exp_id)) as Foo

trunk/ippTools/src/regtool.c

@@ -533 +533 @@
     }
 
-    psString query = pxDataGet("regtool_find_unprocessed_exp.sql");
+    psString query = pxDataGet("regtool_pendingexp.sql");
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -539 +539 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, exp_id)) {
+    {
+        // build a query to search by exp_id
+        psMetadata *where = psMetadataAlloc();
+        bool status = false;
+        psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
+            psFree(query);
+            return false;
+        }
+        if (exp_id) {
+            if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==", exp_id)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
+                psFree(where);
+                psFree(query);
+                return false;
+            }
+        }
+
+        psString whereClaus = psDBGenerateWhereSQL(where, NULL);
+        psFree(where);
+        if (whereClaus) {
+            psStringAppend(&query, " %s", whereClaus);
+            psFree(whereClaus);
+        }
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);