Changeset 18680

Timestamp:

Jul 23, 2008, 1:13:50 PM (18 years ago)

Author:

Paul Price

Message:

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

File:

• trunk/ippTools/src/stacktool.c (modified) (8 diffs)

trunk/ippTools/src/stacktool.c

@@ -243 +243 @@
     }
 
+    psArray *list = psArrayAllocEmpty(16); // List of runs, to print
     for (long i = 0; i < output->n; i++) {
         psMetadata *row = output->data[i]; // Row from select
@@ -253 +254 @@
             psFree(output);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -264 +266 @@
             psFree(output);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -275 +278 @@
             psFree(output);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -291 +295 @@
             psFree(run);
             psFree(insert);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -301 +306 @@
         run->stack_id = stack_id;
 
-        if (!stackRunPrintObject(stdout, run, !simple)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to print object");
-            psFree(run);
-            psFree(insert);
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            return false;
-        }
+        psArrayAdd(list, list->n, row);
         psFree(run);
 
@@ -326 +323 @@
             psFree(insert);
             psFree(output);
+            psFree(list);
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -333 +331 @@
         psFree(thisInsert);
     }
+    psFree(output);
 
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
-    psFree(output);
+        psFree(list);
+        return false;
+    }
+
+    if (!stackRunPrintObjects(stdout, list, !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print object");
+        return false;
+    }
+
 
     return true;