Changeset 20692

Timestamp:

Nov 11, 2008, 2:55:35 PM (17 years ago)

Author:

bills

Message:

order magicTree by magic_id and process the trees for different magic_ids
in sequence

File:

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

trunk/ippTools/src/magictool.c

@@ -801 +801 @@
     if (!psArrayLength(output)) {
         psTrace("magictool", PS_LOG_INFO, "no rows found");
-        // psFree(output);
-        // return true;
     }
 
@@ -843 +841 @@
     }
 
-    psHash *forest = psHashAlloc(psArrayLength(magicTree));
-
-    // convert the array of metadata into a pxTree structure
-    for (long i = 0; i < psArrayLength(magicTree); i++) {
+    // entries are ordered by magic_id
+    long index = 0;
+    while (index <  psArrayLength(magicTree)) {
         bool status;
-        psString node = psMetadataLookupStr(&status, magicTree->data[i], "node");
+        psS64 current_magic_id = psMetadataLookupS64(&status, magicTree->data[index], "magic_id");
         if (!status) {
-            psAbort("failed to lookup value for node column");
-        }
-
-        psString dep = psMetadataLookupStr(&status, magicTree->data[i], "dep");
-        if (!status) {
-            psAbort("failed to lookup value for dep column");
-        }
-
-        pxTreeBuilder(forest, node, dep, magicTree->data[i]);
-
-    }
-    psFree(magicTree);
-
-    // find the root of the tree
-    pxNode *root = psMemIncrRefCounter(psHashLookup(forest, "root"));
-    psFree(forest);
-    //    pxTreePrint(stdout, root);
-
-    // crawl through the tree and looking for nodes with children that are all
-    // "done"
-    pxTreeCrawl(root, findReadyNodes, output);
-    psFree(root);
+            psAbort("failed to lookup value for magic_id column");
+        }
+
+        // find the end of this block
+        long first = index;
+        long last = index;
+        for (long i = index + 1; i < psArrayLength(magicTree); i++) {
+            psS64 magic_id = psMetadataLookupS64(&status, magicTree->data[i], "magic_id");
+            if (!status) {
+                psAbort("failed to lookup value for magic_id column");
+            }
+            if (magic_id != current_magic_id) {
+                break;
+            }
+            last = i;
+        }
+
+        index = last + 1;
+
+        psHash *forest = psHashAlloc(last - first + 1);
+
+        // convert the array of metadata into a pxTree structure
+        for (long i = first; i <= last; i++) {
+            bool status;
+            psString node = psMetadataLookupStr(&status, magicTree->data[i], "node");
+            if (!status) {
+                psAbort("failed to lookup value for node column");
+            }
+
+            psString dep = psMetadataLookupStr(&status, magicTree->data[i], "dep");
+            if (!status) {
+                psAbort("failed to lookup value for dep column");
+            }
+
+            pxTreeBuilder(forest, node, dep, magicTree->data[i]);
+
+        }
+
+        // find the root of the tree
+        pxNode *root = psMemIncrRefCounter(psHashLookup(forest, "root"));
+        psFree(forest);
+        //    pxTreePrint(stdout, root);
+
+        // crawl through the tree and looking for nodes with children that are all
+        // "done"
+        pxTreeCrawl(root, findReadyNodes, output);
+        psFree(root);
+
+    }
 
     if (psArrayLength(output)) {
@@ -882 +906 @@
     }
 
+    psFree(magicTree);
     psFree(output);
     psFree(whereClause);