Changeset 25511

Timestamp:

Sep 23, 2009, 1:45:03 PM (17 years ago)

Author:

bills

Message:

Finish implementing magictool -censorrun

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (2 diffs)
• share/disttool_listinterests.sql (moved) (moved from trunk/ippTools/share/disttool_listinterest.sql ) (1 prop)
• share/magictool_restore_camera.sql (moved) (moved from trunk/ippTools/share/magictool_censor_camera.sql ) (1 diff, 1 prop)
• share/magictool_restore_chip.sql (moved) (moved from trunk/ippTools/share/magictool_censor_chip.sql ) (1 diff, 1 prop)
• share/magictool_restore_diff.sql (moved) (moved from trunk/ippTools/share/magictool_censor_diff.sql ) (1 diff, 1 prop)
• share/magictool_restore_raw.sql (moved) (moved from trunk/ippTools/share/magictool_censor_raw.sql ) (1 diff, 1 prop)
• share/magictool_restore_warp.sql (moved) (moved from trunk/ippTools/share/magictool_censor_warp.sql ) (1 diff, 1 prop)
• src/Makefile.am (modified) (3 diffs)
• src/magictool.c (modified) (3 diffs)
• src/pxmagic.c (added)
• src/pxmagic.h (added)
• src/pxtools.h (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -111 +111 @@
      disttool_definebyquery_warp.sql \
      disttool_defineinterest.sql \
-     disttool_listinterest.sql \
+     disttool_listinterests.sql \
      disttool_pending_camera.sql \
      disttool_pending_chip.sql \
@@ -150 +150 @@
      flatcorr_dropcamera.sql \
      magictool_addmask.sql \
-     magictool_censor_raw.sql \
-     magictool_censor_chip.sql \
-     magictool_censor_camera.sql \
-     magictool_censor_warp.sql \
-     magictool_censor_diff.sql \
+     magictool_restore_camera.sql \
+     magictool_restore_chip.sql \
+     magictool_restore_diff.sql \
+     magictool_restore_raw.sql \
+     magictool_restore_warp.sql \
      magictool_create_tmp_warpcomplete.sql \
      magictool_definebyquery_insert.sql \

trunk/ippTools/share/magictool_restore_camera.sql

@@ -1 +1 @@
 UPDATE magicRun 
     JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id)
-    JOIN camRun ON magic_ds_id = magicked
+    JOIN camRun ON stage = 'camera' AND stage_id = camRun.cam_id
 SET camRun.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
-
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_chip.sql

@@ -1 @@
-UPDATE chipRun 
-    JOIN chipProcessedImfile USING(chip_id, exp_id) 
-    JOIN magicDSRun ON stage_id = chip_id AND stage = 'chip' AND re_place
-    JOIN magicDSFile USING(magic_ds_id) 
-    JOIN magicRun using(magic_id)
+UPDATE magicRun
+    JOIN magicDSRun USING(magic_id)
+    JOIN chipRun ON stage = 'chip' AND stage_id = chip_id
+    JOIN chipProcessedImfile USING(chip_id)
 SET chipProcessedImfile.magicked = 0, 
     chipRun.magicked = 0, 
-    magicDSRun.state = 'censored', 
-    magicDSFile.fault = 42
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_diff.sql

@@ -1 @@
-UPDATE diffRun
-    JOIN diffSkyfile USING(diff_id)
-    JOIN magicRun USING(diff_id)
-    JOIN magicDSRun ON stage = 'diff' AND stage_id = diff_id AND re_place
-    JOIN magicDSFile USING(magic_ds_id)
+UPDATE magicRun 
+    JOIN magicDSRun USING(magic_id)
+    JOIN diffRun ON stage = 'diff' AND stage_id = diffRun.diff_id
+    JOIN diffSkyfile ON diffRun.diff_id = diffSkyfile.diff_id
 SET diffRun.magicked = 0,
     diffSkyfile.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_raw.sql

@@ -1 +1 @@
 UPDATE magicRun
     JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id) 
-    JOIN rawImfile ON rawImfile.magicked = magic_ds_id
---    JOIN rawExp ON rawExp.magicked = magic_ds_id
+    JOIN rawExp ON stage = 'raw' AND stage_id = rawExp.exp_id
+    JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_id
 SET rawImfile.magicked = 0, 
---    rawExp.magicked = 0, 
---    magicDSRun.state = 'censored', 
-    magicDSFile.fault = 42
-
+    rawExp.magicked = 0, 
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_warp.sql

@@ -1 +1 @@
 UPDATE magicRun 
     JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id)
-    JOIN warpRun ON magic_ds_id = magicked
+    JOIN warpRun ON stage = 'warp' AND stage_id = warp_id
     JOIN warpSkyfile using(warp_id)
 SET warpRun.magicked = 0,
     warpSkyfile.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/src/Makefile.am

@@ -24 +24 @@
         pubtool
 
-
-bin_SCRIPTS = \
-        fakemagic
-
 pkginclude_HEADERS = \
         pxadd.h \
@@ -36 +32 @@
         pxdata.h \
         pxfake.h \
+        pxmagic.h \
         pxregister.h \
         pxtag.h \
@@ -79 +76 @@
         pxfake.c \
         pxfault.c \
+        pxmagic.c \
         pxregister.c \
         pxtag.c \

trunk/ippTools/src/magictool.c

@@ -1393 +1393 @@
 }
 
-static bool censorStage(pxConfig *config, psString stage, psString whereClause)
-{
-    psString queryFile = NULL;
-    psStringAppend(&queryFile, "magictool_censor_%s.sql", stage);
-    psString query = pxDataGet(queryFile);
-    if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", queryFile);
-        psFree(queryFile);
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
-    }
-    psFree(queryFile);
-
-    psStringAppend(&query, " WHERE %s",  whereClause);
-
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(query);
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
-    }
-    psFree(query);
-
-    return true;
-}
-
 static bool censorrunMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
-
-    psError(PS_ERR_PROGRAMMING, true, "-censorrun mode not ready yet");
-    return false;
 
     psMetadata *where = psMetadataAlloc();
@@ -1434 +1401 @@
     // at least one of these required
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "magicRun.exp_id", "==");
 
     if (!psListLength(where->list)) {
@@ -1470 +1437 @@
     // Now queue any destreaked files to be re-verted
 
-    // note: on failure censorStage issues the rollback
-    if (!censorStage(config, "raw", whereClause)) {
+    // note: on failure magicRestoreStage issues the rollback
+    if (!magicRestoreStage(config, "raw", whereClause, "goto_censored")) {
         psFree(whereClause);
         return false;
     }
-    if (!censorStage(config, "chip", whereClause)) {
+    if (!magicRestoreStage(config, "chip", whereClause, "goto_censored")) {
         psFree(whereClause);
         return false;
     }
-    if (!censorStage(config, "camera", whereClause)) {
+    if (!magicRestoreStage(config, "camera", whereClause, "goto_censored")) {
         psFree(whereClause);
         return false;
     }
-    if (!censorStage(config, "warp", whereClause)) {
+    if (!magicRestoreStage(config, "warp", whereClause, "goto_censored")) {
         psFree(whereClause);
         return false;
     }
-    if (!censorStage(config, "diff", whereClause)) {
+    if (!magicRestoreStage(config, "diff", whereClause, "goto_censored")) {
         psFree(whereClause);
         return false;

trunk/ippTools/src/pxtools.h

@@ -46 +46 @@
 #include "pxtag.h"
 #include "pxtree.h"
+#include "pxmagic.h"
 
 # define MAX_ROWS 10e9