Changeset 23660 for trunk/ippTools

Timestamp:

Apr 1, 2009, 3:21:51 PM (17 years ago)

Author:

bills

Message:

updates to magictool -revertnode

Location:

trunk/ippTools

Files:

• share/magictool_revertnode.sql (added)
• src/magictool.c (modified) (3 diffs)
• src/magictoolConfig.c (modified) (1 diff)

trunk/ippTools/src/magictool.c

@@ -930 +930 @@
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
     PXOPT_COPY_STR(config->args, where, "-node", "node", "==");
-    PXOPT_COPY_S16(config->args, where, "-code", "fault", "==");
-
-    psString query = psStringCopy("DELETE FROM magicNodeResult WHERE fault != 0");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_S16(config->args, where, "-code", "magicNodeResult.fault", "==");
+
+    psString query = pxDataGet("magictool_revertnode.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (psListLength(where->list)) {
@@ -938 +943 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    } else {
+        psError(PS_ERR_UNKNOWN, false, "search parameters are required");
+        psFree(where);
+        return false;
     }
     psFree(where);
@@ -945 +954 @@
         return false;
     }
+
+    psS32 numUpdated = psDBAffectedRows(config->dbh);
+    psLogMsg("magictool", PS_LOG_INFO, "Updated %d magic nodes", numUpdated);
+
     return true;
 }

trunk/ippTools/src/magictoolConfig.c

@@ -132 +132 @@
     psMetadataAddS64(revertnodeArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magictool ID", 0);
     psMetadataAddStr(revertnodeArgs, PS_LIST_TAIL, "-node", 0, "search by node name", NULL);
+    psMetadataAddStr(revertnodeArgs, PS_LIST_TAIL, "-label",0, "search by label", NULL);
     psMetadataAddS16(revertnodeArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0);