Index: trunk/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 21399)
+++ trunk/ippTools/src/camtool.c	(revision 21402)
@@ -886,5 +886,5 @@
     char *query = "DELETE FROM camMask WHERE label = '%s'";
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 21399)
+++ trunk/ippTools/src/chiptool.c	(revision 21402)
@@ -809,5 +809,5 @@
     char *query = "DELETE FROM chipMask WHERE label = '%s'";
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -1173,5 +1173,5 @@
 
     // note only updates if chipRun.state = run_state
-    if (!p_psDBRunQuery(config->dbh, query, data_state, chip_id, class_id, run_state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, chip_id, class_id, run_state)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         // rollback
@@ -1189,5 +1189,5 @@
 
     query = pxDataGet("chiptool_change_exp_state.sql");
-    if (!p_psDBRunQuery(config->dbh, query, data_state, chip_id, data_state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, chip_id, data_state)) {
         // rollback
         if (!psDBRollback(config->dbh)) {
Index: trunk/ippTools/src/dettool.c
===================================================================
--- trunk/ippTools/src/dettool.c	(revision 21399)
+++ trunk/ippTools/src/dettool.c	(revision 21402)
@@ -968,5 +968,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, (long long) newDet_id, (long long) det_id, iteration)) {
+    if (!p_psDBRunQueryF(config->dbh, query, (long long) newDet_id, (long long) det_id, iteration)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -1733,5 +1733,5 @@
 
     char *query = "UPDATE detRun SET iteration = iteration + 1 WHERE det_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, det_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, det_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to increment iteration for det_id %" PRId64, det_id);
@@ -1773,5 +1773,5 @@
 
     char *query = "UPDATE detRun SET state = '%s' WHERE det_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, det_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, det_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to change state for det_id %" PRId64, det_id);
         return false;
@@ -1835,5 +1835,5 @@
 	" AND exp_id = %" PRId64 
 	" AND class_id = '%s'";
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, exp_id, class_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, exp_id, class_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", exp_id %" PRId64 ", class_id %s", 
@@ -1855,5 +1855,5 @@
 	" WHERE det_id = %" PRId64
 	" AND exp_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, exp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, exp_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", exp_id %" PRId64, 
@@ -1878,5 +1878,5 @@
 	" AND iteration = %" PRId32
 	" AND class_id = %s";
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, class_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, class_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32 "class_id %s", 
@@ -1900,5 +1900,5 @@
 	" AND iteration = %" PRId32
 	" AND class_id = %s";
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32, 
@@ -1922,5 +1922,5 @@
 	" AND iteration = %" PRId32
 	" AND class_id = %s";
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, class_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, class_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32 " class %s", 
@@ -1942,5 +1942,5 @@
 	" WHERE det_id = %" PRId64
 	" AND iteration = %" PRId32;
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32, 
@@ -1965,5 +1965,5 @@
 	" AND exp_id = %" PRId64 
 	" AND class_id = '%s'";
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, exp_id, class_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, exp_id, class_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32 ", exp_id %" PRId64 ", class_id %s", 
@@ -1986,5 +1986,5 @@
 	" AND iteration = %" PRId32 
 	" AND exp_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, exp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, exp_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32 ", exp_id %" PRId64, 
Index: trunk/ippTools/src/dettool_detrunsummary.c
===================================================================
--- trunk/ippTools/src/dettool_detrunsummary.c	(revision 21399)
+++ trunk/ippTools/src/dettool_detrunsummary.c	(revision 21402)
@@ -356,11 +356,11 @@
 
     char *query = "UPDATE detRunSummary SET accept = %d WHERE det_id = %"PRId64; 
-    if (!p_psDBRunQuery(config->dbh, query, accept, det_id)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
-    return true;
-}
-
-
+    if (!p_psDBRunQueryF(config->dbh, query, accept, det_id)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+
+
Index: trunk/ippTools/src/dettool_processedexp.c
===================================================================
--- trunk/ippTools/src/dettool_processedexp.c	(revision 21399)
+++ trunk/ippTools/src/dettool_processedexp.c	(revision 21402)
@@ -105,5 +105,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, (long long) det_id, (long long) exp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, (long long) det_id, (long long) exp_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 21399)
+++ trunk/ippTools/src/difftool.c	(revision 21402)
@@ -207,5 +207,5 @@
     psString tess_id = NULL;
     if (warp1) {
-        if (!p_psDBRunQuery(config->dbh, "SELECT * from diffRun WHERE diff_id = %" PRId64, diff_id)) {
+        if (!p_psDBRunQueryF(config->dbh, "SELECT * from diffRun WHERE diff_id = %" PRId64, diff_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             return false;
@@ -249,5 +249,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, "SELECT count(diff_id) FROM diffRun JOIN diffInputSkyfile USING(diff_id) WHERE diff_id = %" PRId64, diff_id)) {
+    if (!p_psDBRunQueryF(config->dbh, "SELECT count(diff_id) FROM diffRun JOIN diffInputSkyfile USING(diff_id) WHERE diff_id = %" PRId64, diff_id)) {
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -355,5 +355,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, whereClause, whereClause, whereClause, whereClause)) {
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause, whereClause, whereClause)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(whereClause);
@@ -737,5 +737,5 @@
 
     char *query = "UPDATE diffRun SET state = '%s' WHERE diff_id = %"PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, diff_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, diff_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for diff_id %"PRId64, diff_id);
@@ -829,5 +829,5 @@
 
     char *query = "UPDATE diffRun SET state = 'new' WHERE diff_id = '%" PRId64 "'";
-    if (!p_psDBRunQuery(config->dbh, query, run->diff_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, run->diff_id)) {
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -999,5 +999,5 @@
 
 
-    if (!p_psDBRunQuery(config->dbh, query, warpQuery, expQuery, diffQuery)) {
+    if (!p_psDBRunQueryF(config->dbh, query, warpQuery, expQuery, diffQuery)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -1098,5 +1098,5 @@
             return false;
         }
-        if (!p_psDBRunQuery(config->dbh, skycell_query, stackQuery, warp_id, filter, warpQuery)) {
+        if (!p_psDBRunQueryF(config->dbh, skycell_query, stackQuery, warp_id, filter, warpQuery)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(warpQuery);
Index: trunk/ippTools/src/faketool.c
===================================================================
--- trunk/ippTools/src/faketool.c	(revision 21399)
+++ trunk/ippTools/src/faketool.c	(revision 21402)
@@ -868,5 +868,5 @@
     char *query = "DELETE FROM fakeMask WHERE label = '%s'";
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -1155,5 +1155,5 @@
 
     // note only updates if fakeRun.state = run_state
-    if (!p_psDBRunQuery(config->dbh, query, data_state, fake_id, class_id, run_state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, fake_id, class_id, run_state)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         // rollback
@@ -1172,5 +1172,5 @@
 
     query = pxDataGet("faketool_change_exp_state.sql");
-    if (!p_psDBRunQuery(config->dbh, query, data_state, fake_id, data_state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, fake_id, data_state)) {
         // rollback
         if (!psDBRollback(config->dbh)) {
Index: trunk/ippTools/src/flatcorr.c
===================================================================
--- trunk/ippTools/src/flatcorr.c	(revision 21399)
+++ trunk/ippTools/src/flatcorr.c	(revision 21402)
@@ -365,5 +365,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, (long long) corr_id, (long long) chip_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, (long long) corr_id, (long long) chip_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -513,5 +513,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, (long long) corr_id, (long long) cam_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, (long long) corr_id, (long long) cam_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -589,5 +589,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, corr_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, corr_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -648,5 +648,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, chip_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, chip_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -685,5 +685,5 @@
     char *query = "UPDATE flatcorrRun SET state = 'full', hostname = '%s', fault = '%hd' WHERE corr_id = %" PRId64;
 
-    if (!p_psDBRunQuery(config->dbh, query, hostname, code, corr_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, hostname, code, corr_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to change state for corr_id %" PRId64, corr_id);
         return false;
@@ -727,5 +727,5 @@
     char *query = "UPDATE flatcorrRun SET state = '%s' WHERE corr_id = %" PRId64;
 
-    if (!p_psDBRunQuery(config->dbh, query, state, corr_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, corr_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to change state for corr_id %" PRId64, corr_id);
         return false;
Index: trunk/ippTools/src/magicdstool.c
===================================================================
--- trunk/ippTools/src/magicdstool.c	(revision 21399)
+++ trunk/ippTools/src/magicdstool.c	(revision 21402)
@@ -159,5 +159,5 @@
         psFree(where);
 
-        if (!p_psDBRunQuery(config->dbh, query, whereClause)) {
+        if (!p_psDBRunQueryF(config->dbh, query, whereClause)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(whereClause);
@@ -215,5 +215,5 @@
 
 
-        if (!p_psDBRunQuery(config->dbh, query, magicSkyCellNumsWhere ? magicSkyCellNumsWhere : "")) {
+        if (!p_psDBRunQueryF(config->dbh, query, magicSkyCellNumsWhere ? magicSkyCellNumsWhere : "")) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(magicSkyCellNumsWhere);
@@ -298,5 +298,5 @@
         }
 
-        if (!p_psDBRunQuery(config->dbh, thisInsert, magic_id, exp_id)) {
+        if (!p_psDBRunQueryF(config->dbh, thisInsert, magic_id, exp_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(thisInsert);
@@ -560,5 +560,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, magic_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, magic_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -692,5 +692,5 @@
     psFree(where);
 
-    if (!p_psDBRunQuery(config->dbh, query, magic_ds_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, magic_ds_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -749,5 +749,5 @@
 
     char *query = "UPDATE magicDSRun SET state = '%s' WHERE magic_ds_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, magic_ds_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, magic_ds_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for magic_id %" PRId64, magic_ds_id);
Index: trunk/ippTools/src/magictool.c
===================================================================
--- trunk/ippTools/src/magictool.c	(revision 21399)
+++ trunk/ippTools/src/magictool.c	(revision 21402)
@@ -171,5 +171,5 @@
         }
 
-        if (!p_psDBRunQuery(config->dbh, query, queryWhere)) {
+        if (!p_psDBRunQueryF(config->dbh, query, queryWhere)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(queryWhere);
@@ -255,5 +255,5 @@
         }
 
-        if (!p_psDBRunQuery(config->dbh, thisInsert, magic_id, exp_id)) {
+        if (!p_psDBRunQueryF(config->dbh, thisInsert, magic_id, exp_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(thisInsert);
@@ -539,5 +539,5 @@
     if (code > 0) {
         char *query = "UPDATE magicRun SET fault = %d, state = 'stop' WHERE magic_id = %" PRId64;
-        if (!p_psDBRunQuery(config->dbh, query, code, magic_id)) {
+        if (!p_psDBRunQueryF(config->dbh, query, code, magic_id)) {
             psError(PS_ERR_UNKNOWN, false,
                     "failed to set fault for magic_id %" PRId64, magic_id);
@@ -795,5 +795,5 @@
         whereClause = new;
     }
-    if (!p_psDBRunQuery(config->dbh, query, whereClause ? whereClause :  "")) {
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause ? whereClause :  "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(whereClause);
@@ -1492,5 +1492,5 @@
 
     char *query = "UPDATE magicRun SET state = '%s' WHERE magic_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, magic_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, magic_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for magic_id %" PRId64, magic_id);
Index: trunk/ippTools/src/pstamptool.c
===================================================================
--- trunk/ippTools/src/pstamptool.c	(revision 21399)
+++ trunk/ippTools/src/pstamptool.c	(revision 21402)
@@ -231,5 +231,5 @@
                      " (state, uri, ds_id, fault)"
                      " VALUES( 'new', '%s', %" PRId64 ", 0 )";
-    if (!p_psDBRunQuery(config->dbh, query, uri, ds_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, uri, ds_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -480,9 +480,9 @@
     // printf("Revert request %" PRId64 "\n", req_id);
     
-    if (!p_psDBRunQuery(config->dbh, "DELETE FROM pstampJob where req_id = %" PRId64, req_id)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-    if (!p_psDBRunQuery(config->dbh, 
+    if (!p_psDBRunQueryF(config->dbh, "DELETE FROM pstampJob where req_id = %" PRId64, req_id)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!p_psDBRunQueryF(config->dbh, 
         "UPDATE pstampRequest set state ='new', name=NULL, reqType=NULL, fault=0 where req_id = %" PRId64, req_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -535,5 +535,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, req_id, rownum, stateString, job_type, uri, exp_id, outputBase, fault, argString)) {
+    if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, uri, exp_id, outputBase, fault, argString)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -705,5 +705,5 @@
 	" WHERE job_id = %" PRId64;
     
-    if (!p_psDBRunQuery(config->dbh, query, state, faultStr, job_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, faultStr, job_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
Index: trunk/ippTools/src/pxcam.c
===================================================================
--- trunk/ippTools/src/pxcam.c	(revision 21399)
+++ trunk/ippTools/src/pxcam.c	(revision 21402)
@@ -134,5 +134,5 @@
 
     char *query = "UPDATE camRun SET state = '%s' WHERE cam_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, cam_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, cam_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for cam_id %" PRId64, cam_id);
@@ -164,5 +164,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -182,5 +182,5 @@
 
     char *query = "UPDATE camRun SET camRun.label = '%s' WHERE cam_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, label, cam_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label, cam_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for cam_id %" PRId64, cam_id);
@@ -204,5 +204,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -242,5 +242,5 @@
     // XXX chip_id is being cast here work around psS64 have a different type
     // different on 32/64
-    if (!p_psDBRunQuery(config->dbh, query,
+    if (!p_psDBRunQueryF(config->dbh, query,
                 "new", // state
                 workdir  ? workdir  : "NULL",
Index: trunk/ippTools/src/pxchip.c
===================================================================
--- trunk/ippTools/src/pxchip.c	(revision 21399)
+++ trunk/ippTools/src/pxchip.c	(revision 21402)
@@ -140,5 +140,5 @@
 
     char *query = "UPDATE chipRun SET state = '%s' WHERE chip_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, chip_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, chip_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for chip_id %" PRId64, chip_id);
@@ -170,5 +170,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -188,5 +188,5 @@
 
     char *query = "UPDATE chipRun SET label = '%s' WHERE chip_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, label, chip_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label, chip_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for chip_id %" PRId64, chip_id);
@@ -211,5 +211,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -269,5 +269,5 @@
                      "SELECT %" PRId64 ", class_id, 0 FROM rawImfile WHERE exp_id = %" PRId64;
 
-    if (!p_psDBRunQuery(config->dbh, query, chip_id, exp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, chip_id, exp_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         // rollback
Index: trunk/ippTools/src/pxfake.c
===================================================================
--- trunk/ippTools/src/pxfake.c	(revision 21399)
+++ trunk/ippTools/src/pxfake.c	(revision 21402)
@@ -42,5 +42,5 @@
 
     char *query = "UPDATE fakeRun SET state = '%s' WHERE fake_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, fake_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, fake_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for fake_id %" PRId64, fake_id);
@@ -72,5 +72,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -90,5 +90,5 @@
 
     char *query = "UPDATE fakeRun SET fakeRun.label = '%s' WHERE fake_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, label, fake_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label, fake_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for fake_id %" PRId64, fake_id);
@@ -113,5 +113,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -153,5 +153,5 @@
     // XXX chip_id is being cast here work around psS64 have a different type
     // different on 32/64
-    if (!p_psDBRunQuery(config->dbh, query,
+    if (!p_psDBRunQueryF(config->dbh, query,
                 "new", // state
                 workdir  ? workdir  : "NULL",
Index: trunk/ippTools/src/pxregister.c
===================================================================
--- trunk/ippTools/src/pxregister.c	(revision 21399)
+++ trunk/ippTools/src/pxregister.c	(revision 21402)
@@ -50,5 +50,5 @@
 
     char *query = "UPDATE newExp SET state = '%s' WHERE exp_id = %"PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, exp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, exp_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for exp_id %"PRId64, exp_id);
Index: trunk/ippTools/src/pxwarp.c
===================================================================
--- trunk/ippTools/src/pxwarp.c	(revision 21399)
+++ trunk/ippTools/src/pxwarp.c	(revision 21402)
@@ -41,5 +41,5 @@
 
     char *query = "UPDATE warpRun SET state = '%s' WHERE warp_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, warp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, warp_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for warp_id %" PRId64, warp_id);
@@ -72,5 +72,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -90,5 +90,5 @@
 
     char *query = "UPDATE warpRun SET warpRun.label = '%s' WHERE warp_id = %" PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, label, warp_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label, warp_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change label for warp_id %" PRId64, warp_id);
@@ -113,5 +113,5 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psFree(query);
         psError(PS_ERR_UNKNOWN, false, "database error");
Index: trunk/ippTools/src/pzgetexp.c
===================================================================
--- trunk/ippTools/src/pzgetexp.c	(revision 21399)
+++ trunk/ippTools/src/pzgetexp.c	(revision 21402)
@@ -85,5 +85,5 @@
     if (!all) {
         char *query = "SELECT * from summitExp WHERE camera = \"%s\" and TELESCOPE = \"%s\" ORDER BY dateobs DESC LIMIT 1";
-        if (!p_psDBRunQuery(config->dbh, query, camera, telescope)) {
+        if (!p_psDBRunQueryF(config->dbh, query, camera, telescope)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             return false;
Index: trunk/ippTools/src/pzgetimfiles.c
===================================================================
--- trunk/ippTools/src/pzgetimfiles.c	(revision 21399)
+++ trunk/ippTools/src/pzgetimfiles.c	(revision 21402)
@@ -101,5 +101,5 @@
     if (status != 0) {
         // mark the summitExp row as faulted
-        if (!p_psDBRunQuery(config->dbh, "UPDATE summitExp SET fault = %d WHERE exp_name = '%s' AND camera = '%s' AND telescope = '%s'", WEXITSTATUS(status), filesetid, camera, telescope)) {
+        if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE exp_name = '%s' AND camera = '%s' AND telescope = '%s'", WEXITSTATUS(status), filesetid, camera, telescope)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
@@ -117,5 +117,5 @@
         // download an "empty" fileset.
         // mark the summitExp row as faulted
-        if (!p_psDBRunQuery(config->dbh, "UPDATE summitExp SET fault = %d WHERE exp_name = '%s' AND camera = '%s' AND telescope = '%s'", 250, filesetid, camera, telescope)) {
+        if (!p_psDBRunQueryF(config->dbh, "UPDATE summitExp SET fault = %d WHERE exp_name = '%s' AND camera = '%s' AND telescope = '%s'", 250, filesetid, camera, telescope)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
         }
@@ -145,5 +145,5 @@
             " AND camera = '%s'"
             " AND telescope = '%s'";
-        if (!p_psDBRunQuery(config->dbh, query, imfiles, filesetid, camera, telescope)) {
+        if (!p_psDBRunQueryF(config->dbh, query, imfiles, filesetid, camera, telescope)) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -162,5 +162,5 @@
                 "   AND camera = '%s'"
                 "   AND telescope = '%s'";
-            if (!p_psDBRunQuery(config->dbh, query, filesetid, camera, telescope)) {
+            if (!p_psDBRunQueryF(config->dbh, query, filesetid, camera, telescope)) {
                 // rollback
                 if (!psDBRollback(config->dbh)) {
@@ -281,5 +281,5 @@
             "   AND telescope = '%s'"
             "   AND imfiles IS NULL";
-        if (!p_psDBRunQuery(config->dbh, query, filesetid, camera, telescope, filesetid, camera, telescope)) {
+        if (!p_psDBRunQueryF(config->dbh, query, filesetid, camera, telescope, filesetid, camera, telescope)) {
             // rollback
             if (!psDBRollback(config->dbh)) {
Index: trunk/ippTools/src/pztool.c
===================================================================
--- trunk/ippTools/src/pztool.c	(revision 21399)
+++ trunk/ippTools/src/pztool.c	(revision 21402)
@@ -592,5 +592,5 @@
                 "       AND pzDownloadImfile.telescope = '%s'";
 
-            if (!p_psDBRunQuery(config->dbh, query, exp_id, doneExp->exp_name, doneExp->camera, doneExp->telescope)) {
+            if (!p_psDBRunQueryF(config->dbh, query, exp_id, doneExp->exp_name, doneExp->camera, doneExp->telescope)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
                 psFree(doneExp);
@@ -915,5 +915,5 @@
 
     char *query = "UPDATE pzDownloadExp SET state = '%s' WHERE exp_name = '%s' and camera = '%s' and telescope = '%s'";
-    if (!p_psDBRunQuery(config->dbh, query, state, exp_name, camera, telescope)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, exp_name, camera, telescope)) {
         psError(PS_ERR_UNKNOWN, false, "failed to change state for %s:%s:%s", exp_name, camera, telescope);
         return false;
Index: trunk/ippTools/src/regtool.c
===================================================================
--- trunk/ippTools/src/regtool.c	(revision 21399)
+++ trunk/ippTools/src/regtool.c	(revision 21402)
@@ -481,5 +481,5 @@
 
     // 1st arg: where hook, 2nd arg: limit hook
-    if (!p_psDBRunQuery(config->dbh, query, "", limitString ? limitString : "")) {
+    if (!p_psDBRunQueryF(config->dbh, query, "", limitString ? limitString : "")) {
         // XXX PS_EXIT_PROG_ERROR (incorrect SQL) or SYS_ERROR (database comms)
         psError(PXTOOLS_ERR_PROG, false, "database error");
@@ -630,5 +630,5 @@
 
     // 1st arg: where hook, 2nd arg: limit hook
-    if (!p_psDBRunQuery(config->dbh, query, whereClause ? whereClause : "", "")) {
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause ? whereClause : "", "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(whereClause);
Index: trunk/ippTools/src/stacktool.c
===================================================================
--- trunk/ippTools/src/stacktool.c	(revision 21399)
+++ trunk/ippTools/src/stacktool.c	(revision 21402)
@@ -358,6 +358,6 @@
         // this insert needs to use exactly the same restrictions (race condition is probably not critical)
         // the insert below seems to only restrict matches to the skycell, tess, and filter
-        if ((randomLimit > 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter, randomLimit)) ||
-            (randomLimit <= 0 && !p_psDBRunQuery(config->dbh, thisInsert, skycell_id, filter))) {
+        if ((randomLimit > 0 && !p_psDBRunQueryF(config->dbh, thisInsert, skycell_id, filter, randomLimit)) ||
+            (randomLimit <= 0 && !p_psDBRunQueryF(config->dbh, thisInsert, skycell_id, filter))) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(thisInsert);
@@ -968,5 +968,5 @@
 
     char *query = "UPDATE stackRun SET state = '%s' WHERE stack_id = %"PRId64;
-    if (!p_psDBRunQuery(config->dbh, query, state, stack_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state, stack_id)) {
         psError(PS_ERR_UNKNOWN, false,
                 "failed to change state for stack_id %"PRId64, stack_id);
Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 21399)
+++ trunk/ippTools/src/warptool.c	(revision 21402)
@@ -746,5 +746,5 @@
         psS64 warp_id = item->data.S64;
 
-        if (!p_psDBRunQuery(config->dbh, query, warp_id, skycell_id)) {
+        if (!p_psDBRunQueryF(config->dbh, query, warp_id, skycell_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             return false;
@@ -1385,5 +1385,5 @@
     char *query = "DELETE FROM warpMask WHERE label = '%s'";
 
-    if (!p_psDBRunQuery(config->dbh, query, label)) {
+    if (!p_psDBRunQueryF(config->dbh, query, label)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -1620,5 +1620,5 @@
 
     // note only updates if warpRun.state = run_state
-    if (!p_psDBRunQuery(config->dbh, query, data_state, warp_id, skycell_id, run_state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, warp_id, skycell_id, run_state)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         // rollback
@@ -1632,5 +1632,5 @@
 
     query = pxDataGet("warptool_change_run_state.sql");
-    if (!p_psDBRunQuery(config->dbh, query, data_state, warp_id, data_state)) {
+    if (!p_psDBRunQueryF(config->dbh, query, data_state, warp_id, data_state)) {
         // rollback
         if (!psDBRollback(config->dbh)) {
@@ -1672,5 +1672,5 @@
     psString query = pxDataGet("warptool_updateskyfile.sql");
 
-    if (!p_psDBRunQuery(config->dbh, query, code, warp_id, skycell_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, code, warp_id, skycell_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;