Changeset 18526

Timestamp:

Jul 14, 2008, 6:21:12 PM (18 years ago)

Author:

Paul Price

Message:

Adding magictool -mask (to get the URI for the mask information out). Getting magictool -addmask to update the mask state to 'stop'. Need to be better about magicRun.state and fault throughout.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/magictool_addmask.sql (added)
• share/magictool_inputs.sql (added)
• share/magictool_mask.sql (added)
• share/magictool_node.sql (deleted)
• src/magictool.c (modified) (4 diffs)
• src/magictool.h (modified) (1 diff)
• src/magictoolConfig.c (modified) (4 diffs)

trunk/ippTools/share/Makefile.am

@@ -70 +70 @@
         magictool_toprocess_tree.sql \
         magictool_toskyfilemask.sql \
-        magictool_node.sql \
+        magictool_inputs.sql \
+        magictool_addmask.sql \
+        magictool_mask.sql \
         pxadmin_create_tables.sql \
         pxadmin_drop_tables.sql \

trunk/ippTools/src/magictool.c

@@ -43 +43 @@
 static bool tomaskMode(pxConfig *config);
 static bool addmaskMode(pxConfig *config);
+static bool maskMode(pxConfig *config);
 
 static bool setmagicRunState(pxConfig *config, psS64 magic_id, const char *state);
@@ -77 +78 @@
         MODECASE(MAGICTOOL_MODE_TOMASK,         tomaskMode);
         MODECASE(MAGICTOOL_MODE_ADDMASK,        addmaskMode);
+        MODECASE(MAGICTOOL_MODE_MASK,           maskMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -878 +880 @@
     PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
     if (!magicMaskInsert(config->dbh,
                          (psS64)atoll(magic_id),
@@ -887 +894 @@
         return false;
     }
+
+    // Set the magicRun state
+    psString query = pxDataGet("magictool_addmask.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    // Add "magic_id = value"
+    psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL);
+    psStringAppend(&query, " AND %s", whereClause);
+    psFree(whereClause);
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
+
+static bool maskMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+
+    psString query = pxDataGet("magictool_mask.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+
+    // 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;
+    }
+
+    if (psArrayLength(output)) {
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "magicNode", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+    }
+
+    psFree(output);
 
     return true;

trunk/ippTools/src/magictool.h

@@ -33 +33 @@
     MAGICTOOL_MODE_INPUTTREE,
     MAGICTOOL_MODE_TOPROCESS,
+    MAGICTOOL_MODE_INPUTS,
     MAGICTOOL_MODE_ADDRESULT,
-    MAGICTOOL_MODE_NODE,
     MAGICTOOL_MODE_TOMASK,
     MAGICTOOL_MODE_ADDMASK,
+    MAGICTOOL_MODE_MASK,
 } MAGICtoolMode;
 

trunk/ippTools/src/magictoolConfig.c

@@ -112 +112 @@
     psMetadataAddS16(inputtreeArgs, PS_LIST_TAIL, "-code",  0, "set fault code", 0);
 
-    // -node
-    psMetadata *nodeArgs = psMetadataAlloc();
-    psMetadataAddStr(nodeArgs, PS_LIST_TAIL, "-magic_id", 0,
+    // -inputs
+    psMetadata *inputsArgs = psMetadataAlloc();
+    psMetadataAddStr(inputsArgs, PS_LIST_TAIL, "-magic_id", 0,
             "search by magictool ID", NULL);
-    psMetadataAddStr(nodeArgs, PS_LIST_TAIL, "-node",  0,
+    psMetadataAddStr(inputsArgs, PS_LIST_TAIL, "-node",  0,
             "search by symbolic node name", NULL);
-    psMetadataAddU64(nodeArgs, PS_LIST_TAIL, "-limit",  0,
-            "limit result set to N items", 0);
-    psMetadataAddBool(nodeArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddU64(inputsArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
+    psMetadataAddBool(inputsArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
 
@@ -155 +155 @@
     psMetadataAddStr(addmaskArgs, PS_LIST_TAIL, "-uri",  0, "define URI", NULL);
     psMetadataAddS32(addmaskArgs, PS_LIST_TAIL, "-streaks",  0, "define number of streaks", 0);
+    psMetadataAddS16(addmaskArgs, PS_LIST_TAIL, "-code",  0, "set fault code", 0);
+
+    // -mask
+    psMetadata *maskArgs = psMetadataAlloc();
+    psMetadataAddStr(maskArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID", NULL);
+    psMetadataAddU64(maskArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
+    psMetadataAddBool(maskArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
 
     psFree(now);
@@ -169 +176 @@
     PXOPT_ADD_MODE("-inputtree",       "", MAGICTOOL_MODE_INPUTTREE,       inputtreeArgs);
     PXOPT_ADD_MODE("-toprocess",       "", MAGICTOOL_MODE_TOPROCESS,       toprocessArgs);
+    PXOPT_ADD_MODE("-inputs",          "", MAGICTOOL_MODE_INPUTS,          inputsArgs);
     PXOPT_ADD_MODE("-addresult",       "", MAGICTOOL_MODE_ADDRESULT,       addresultArgs);
-    PXOPT_ADD_MODE("-node",            "", MAGICTOOL_MODE_NODE,            nodeArgs);
     PXOPT_ADD_MODE("-tomask",          "", MAGICTOOL_MODE_TOMASK,          tomaskArgs);
     PXOPT_ADD_MODE("-addmask",         "", MAGICTOOL_MODE_ADDMASK,         addmaskArgs);
+    PXOPT_ADD_MODE("-mask",            "", MAGICTOOL_MODE_MASK,            maskArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
@@ -219 +227 @@
     psString str = NULL;
     bool status = false;
-    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
-        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
+    if ((str = psMetadataLookupStr(&status, config->args, "-magic_id"))) {
+        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "magic_id", 0, "==", (psS64)atoll(str))) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item magic_id");
             psFree(config);
             return NULL;