Changeset 26969

Timestamp:

Feb 16, 2010, 5:34:49 PM (16 years ago)

Author:

watersc1

Message:

Added dbCommit statement, and confirmed that it will not requeue an identical run.

File:

• trunk/ippTools/src/difftool.c (modified) (6 diffs)

trunk/ippTools/src/difftool.c

@@ -1965 +1965 @@
   }
 
+  psArray *list = psArrayAllocEmpty(16); // List of runs defined, to print
   for (long i = 0; i < output->n; i++) {
     psMetadata *row = output->data[i]; // Output row from query
@@ -2052 +2053 @@
       return false;
     }
-    //    diffRunPrintObject(stdout,run,1);
+/*     diffRunPrintObject(stdout,run,1); */
     run->diff_id = psDBLastInsertID(config->dbh);
     for (long j = 0; j < diff_id_output->n; j++) {
@@ -2082 +2083 @@
       }
 
-      //      diffInputSkyfilePrintObject(stdout,input,1);
+/*       diffInputSkyfilePrintObject(stdout,input,1); */
       psFree(input);
     }
@@ -2092 +2093 @@
         psFree(diffQuery);
         psFree(run);
+        psFree(list);
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -2097 +2099 @@
         return false;
     }
-
+    psArrayAdd(list, list->n, run);
     psFree(run);
   }
+
+  if (!psDBCommit(config->dbh)) {
+    psError(PS_ERR_UNKNOWN, false, "database error");
+    psFree(list);
+    return false;
+  }
+  
+  if (!diffRunPrintObjects(stdout, list, !simple)) {
+    psError(PS_ERR_UNKNOWN, false, "failed to print object");
+    psFree(list);
+    return false;
+  }
+  
   psFree(query);
   psFree(stack1Query);
@@ -2105 +2120 @@
   psFree(diffQuery);
   psFree(output);
+  psFree(list);
 
   return(true);