Changeset 33003 for branches/haf_add201112/ippTools/src/pxmerge.c

Timestamp:

Dec 22, 2011, 2:21:40 PM (15 years ago)

Author:

heather

Message:

whoo hooo! mergetool changes, now to test on maui

File:

• branches/haf_add201112/ippTools/src/pxmerge.c (modified) (1 diff)

branches/haf_add201112/ippTools/src/pxmerge.c

@@ -47 +47 @@
         }
     }
+    if (!p_psDBRunQueryF(config->dbh,"INSERT INTO mergedvodbRun SELECT         0,   minidvodb_id, '%s', '%s', 'new', NULL FROM minidvodbRun     WHERE    minidvodbRun.minidvodb_id = %lld and minidvodbRun.state = 'merged'", mergedvodb, mergedvodb_path, (long long) minidvodb_id))
+    {
+      psError(PS_ERR_UNKNOWN, false, "database error %s", query);
+        return false;
+    }
+    // just to be safe, we should have changed at least one row
+    if (psDBAffectedRows(config->dbh) < 1) {
+        psError(PS_ERR_UNKNOWN, false,
+                "no rows affected - should have changed at least one row \n%s", query);
+        return false;
+    }
+    return true;
+}
 
-    // queue the exp
-    // Note: cam_id is being cast here work around psS64 have a different type different
-    // on 32/64
-    //if (!p_psDBRunQueryF(config->dbh, query,
-    //                   minidvodb_rsync_path   ? minidvodb_rsync_path     : "NULL",
-    //                   destination_host  ? destination_host   : "NULL",
-    //                           0,  //fault
-                           //                    "new", // state
-    //                   "NULL",
-                                                   //                      0, //dtime
-                       
-                                                                             //                    (long long) minidvodb_id
-    //    )) 
-    if (!p_psDBRunQueryF(config->dbh,"INSERT INTO mergedvodbRun SELECT         0,   minidvodb_id, '%s', '%s', 'new', NULL FROM minidvodbRun     WHERE    minidvodbRun.minidvodb_id = %lld and minidvodbRun.state = 'merged'", mergedvodb, mergedvodb_path, (long long) minidvodb_id))
+bool pxaddQueueByMergeID(pxConfig *config,
+                       psS64 merge_id,
+                       char *destination_host,
+                       char *mergedvodb_rsync_path
+  )
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // load the SQL to enqueue our exp_ids from disk once
+    static psString query = NULL;
+    if (!query) {
+        query = pxDataGet("mergetool_queue_mergecopy_id.sql");
+        psMemSetPersistent(query, true);
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            return false;
+        }
+    }
+
+    if (!p_psDBRunQueryF(config->dbh,"INSERT INTO mergedvodbCopy SELECT         0,   merge_id, '%s', '%s', 0, 'new', NULL, 0 FROM mergedvodbRun     WHERE    mergedvodbRun.merge_id = %lld and (mergedvodbRun.state = 'merged' or mergedvodbRun.state = 'full')", mergedvodb_rsync_path, destination_host, (long long) merge_id))
 
     {