Index: trunk/ippTools/share/magictool_censor_raw.sql
===================================================================
--- trunk/ippTools/share/magictool_censor_raw.sql	(revision 24883)
+++ trunk/ippTools/share/magictool_censor_raw.sql	(revision 24885)
@@ -1,8 +1,7 @@
 UPDATE magicRun
     JOIN magicDSRun USING(magic_id)
+    JOIN magicDSFile USING(magic_ds_id) 
     JOIN rawExp ON rawExp.magicked = magic_ds_id
-    JOIN rawImfile USING(exp_id) 
-    JOIN magicDSFile USING(magic_ds_id) 
-    JOIN magicRun USING(magic_id, exp_id)
+    JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_id
 SET rawImfile.magicked = 0, 
     rawExp.magicked = 0, 
Index: trunk/ippTools/src/magictool.c
===================================================================
--- trunk/ippTools/src/magictool.c	(revision 24883)
+++ trunk/ippTools/src/magictool.c	(revision 24885)
@@ -1373,5 +1373,5 @@
 {
     psString queryFile = NULL;
-    psStringAppend(&queryFile, "magicdstool_censor_%s.sql", stage);
+    psStringAppend(&queryFile, "magictool_censor_%s.sql", stage);
     psString query = pxDataGet(queryFile);
     if (!query) {
@@ -1385,5 +1385,5 @@
     psFree(queryFile);
 
-    psStringAppend(&query, whereClause);
+    psStringAppend(&query, " WHERE %s",  whereClause);
 
     if (!p_psDBRunQuery(config->dbh, query)) {
@@ -1404,4 +1404,7 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    psError(PS_ERR_PROGRAMMING, true, "-censorrun mode not ready yet");
+    return false;
+
     psMetadata *where = psMetadataAlloc();
 
@@ -1435,4 +1438,11 @@
     psFree(query);
 
+    psS32 numUpdated = psDBAffectedRows(config->dbh);
+    if (numUpdated == 0) {
+        psError(PS_ERR_UNKNOWN, false, "failed to censor magicRun");
+        psFree(whereClause);
+        return false;
+    }
+
     // Now queue any destreaked files to be re-verted