Changeset 15340

Timestamp:

Oct 19, 2007, 3:23:46 PM (19 years ago)

Author:

jhoblitt

Message:

implement -tomask

Location:

trunk/ippTools

Files:

• scripts/magictest.sh (modified) (1 diff)
• share/magictool_tomask.sql (modified) (1 diff)
• src/magictool.c (modified) (1 diff)
• src/magictoolConfig.c (modified) (1 diff)

trunk/ippTools/scripts/magictest.sh

@@ -10 +10 @@
 magictool -addinputskyfile -magic_id 1 -diff_id 2 -node b || exit 1
 magictool -inputtree -magic_id 1 -dep_file magic_dep.md 
+magictool -addresult -magic_id 1 -node a -uri file:///foo/a
+magictool -addresult -magic_id 1 -node b -uri file:///foo/b
+magictool -addresult -magic_id 1 -node root -uri file:///foo/root
 
 magictool -updaterun -state run -magic_id 1 || exit 1

trunk/ippTools/share/magictool_tomask.sql

@@ -1 +1 @@
 SELECT
     magic_id
-FROM magicTree
+FROM magicRun
+JOIN magicTree
+    USING(magic_id)
 LEFT JOIN magicNodeResult
     USING(magic_id, node)
+WHERE
+    magicRun.state = 'run'
 GROUP BY
     magic_id

trunk/ippTools/src/magictool.c

@@ -572 +572 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
+    if (!status) {
+        psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -limit");
+        return false;
+    }
+
+    // look for "inputs" that need to processed
+    psString query = pxDataGet("magictool_tomask.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        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);
+    if (!output) {
+        psErrorCode err = psErrorCodeLast();
+        switch (err) {
+            case PS_ERR_DB_CLIENT:
+                psError(PXTOOLS_ERR_SYS, false, "database error");
+            case PS_ERR_DB_SERVER:
+                psError(PXTOOLS_ERR_PROG, false, "database error");
+            default:
+                psError(PXTOOLS_ERR_PROG, false, "unknown error");
+        }
+
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("magictool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            return false;
+        }
+    }
+
+    if (psArrayLength(output)) {
+        if (!convertIdToStr(output)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
+            psFree(output);
+            return false;
+        }
+
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "toprocess", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+    }
+
+    psFree(output);
+
     return true;
 }

trunk/ippTools/src/magictoolConfig.c

@@ -111 +111 @@
     // -tomask
     psMetadata *tomaskArgs = psMetadataAlloc();
-    psMetadataAddStr(tomaskArgs, PS_LIST_TAIL, "-magic_id", 0,
-            "search by magic ID", NULL);
     psMetadataAddU64(tomaskArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);