Changeset 18525

Timestamp:

Jul 14, 2008, 5:51:39 PM (18 years ago)

Author:

Paul Price

Message:

A node that's already been done is not "ready".

File:

• trunk/ippTools/src/magictool.c (modified) (5 diffs)

trunk/ippTools/src/magictool.c

@@ -40 +40 @@
 static bool toprocessMode(pxConfig *config);
 static bool addresultMode(pxConfig *config);
-static bool nodeMode(pxConfig *config);
+static bool inputsMode(pxConfig *config);
 static bool tomaskMode(pxConfig *config);
 static bool addmaskMode(pxConfig *config);
@@ -74 +74 @@
         MODECASE(MAGICTOOL_MODE_TOPROCESS,      toprocessMode);
         MODECASE(MAGICTOOL_MODE_ADDRESULT,      addresultMode);
-        MODECASE(MAGICTOOL_MODE_NODE,           nodeMode);
+        MODECASE(MAGICTOOL_MODE_INPUTS,         inputsMode);
         MODECASE(MAGICTOOL_MODE_TOMASK,         tomaskMode);
         MODECASE(MAGICTOOL_MODE_ADDMASK,        addmaskMode);
@@ -516 +516 @@
 bool findReadyNodes(void *arg, pxNode *node)
 {
+    if (psMetadataLookupBool(NULL, node->data, "done")) {
+        // It's already done
+        return true;
+    }
 
     if (pxNodeHasChildren(node)) {
@@ -729 +733 @@
 }
 
-static bool nodeMode(pxConfig *config)
+static bool inputsMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -736 +740 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
-    psString query = pxDataGet("magictool_node.sql");
+    psString query = pxDataGet("magictool_inputs.sql");
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");