Changeset 18681

Timestamp:

Jul 23, 2008, 1:16:12 PM (18 years ago)

Author:

Paul Price

Message:

Print defined runs as a single metadata, not a bunch of discrete ones (confuses pantasks).

File:

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

trunk/ippTools/src/magictool.c

@@ -235 +235 @@
     psString insert = pxDataGet("magictool_definebyquery_insert.sql"); // Insert query
 
-    // iterate over array of grouped warp_ids
+    psArray *list = psArrayAllocEmpty(16); // List of runs, to print
     for (long i = 0; i < psArrayLength(output); i++) {
         psMetadata *row = output->data[i]; // Row of interest
@@ -251 +251 @@
             psFree(insert);
             psFree(output);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -260 +261 @@
         run->magic_id = magic_id;
 
-        if (!magicRunPrintObject(stdout, run, !simple)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to print object");
-            psFree(run);
-            psFree(insert);
-            psFree(output);
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            return false;
-        }
+        psArrayAdd(list, list->n, run);
         psFree(run);
 
@@ -284 +276 @@
             psFree(insert);
             psFree(output);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -297 +290 @@
     }
     psFree(output);
+
+    if (!magicRunPrintObjects(stdout, list, !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print object");
+        psFree(list);
+        return false;
+    }
 
     return true;