Changeset 30732

Timestamp:

Feb 22, 2011, 11:59:03 AM (15 years ago)

Author:

bills

Message:

Don't clean up a file before it's time.

Location:

tags/ipp-20110218

Files:

• ippTools (modified) (1 prop)
• ippTools/share/magicdstool_torevert_diff.sql (modified) (1 diff)
• ippTools/src (modified) (1 prop)
• ippTools/src/addtool.c (modified) (1 diff)
• ippTools/src/bgtool.c (modified) (2 diffs)
• ippTools/src/camtool.c (modified) (1 diff)
• ippTools/src/chiptool.c (modified) (1 diff)
• ippTools/src/chiptoolConfig.c (modified) (1 diff)
• ippTools/src/diffphottool.c (modified) (1 diff)
• ippTools/src/difftool.c (modified) (1 diff)
• ippTools/src/difftoolConfig.c (modified) (1 diff)
• ippTools/src/faketool.c (modified) (1 diff)
• ippTools/src/magicdstool.c (modified) (1 diff, 1 prop)
• ippTools/src/pxtools.c (modified) (2 diffs)
• ippTools/src/pxtools.h (modified) (1 diff)
• ippTools/src/stacktool.c (modified) (1 diff)
• ippTools/src/staticskytool.c (modified) (1 diff)
• ippTools/src/warptool.c (modified) (1 diff)
• ippTools/src/warptoolConfig.c (modified) (1 diff)
• ippconfig/recipes/nightly_science.config (modified) (1 diff, 1 prop)

tags/ipp-20110218/ippTools/share/magicdstool_torevert_diff.sql

@@ -13 +13 @@
     magicDSFile.recovery_path_base,
     "NULL" AS cam_path_base,
-    recovery_path_base,
     CAST(diffRun.bothways AS SIGNED) AS bothways,
     0 AS bytes,

tags/ipp-20110218/ippTools/src/addtool.c

@@ -324 +324 @@
     // pxUpdateRun gets parameters from config->args and runs the update query
     bool result = pxUpdateRun(config, where, &query, "addRun", "add_id",
-        "addProcessedExp", false);
+        "addProcessedExp", false, false);
 
     psFree(query);

tags/ipp-20110218/ippTools/src/bgtool.c

@@ -501 +501 @@
     psString query = psStringCopy("UPDATE chipBackgroundRun");
     bool result = pxUpdateRun(config, where, &query, "chipBackgroundRun", "chip_bg_id",
-                              "chipBackgroundImfile", true);
+                              "chipBackgroundImfile", true, true);
 
     psFree(query);
@@ -1471 +1471 @@
     psString query = psStringCopy("UPDATE warpBackgroundRun");
     bool result = pxUpdateRun(config, where, &query, "warpBackgroundRun", "warp_bg_id",
-                              "warpBackgroundSkyfile", true);
+                              "warpBackgroundSkyfile", true, true);
 
     psFree(query);

tags/ipp-20110218/ippTools/src/camtool.c

@@ -283 +283 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "camRun", "cam_id", "camProcessedExp", true);
+    bool result = pxUpdateRun(config, where, &query, "camRun", "cam_id", "camProcessedExp", true, true);
     if (!result) {
         psError(psErrorCodeLast(), false, "pxUpdateRun failed");

tags/ipp-20110218/ippTools/src/chiptool.c

@@ -443 +443 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "chipRun", "chip_id", "chipProcessedImfile", true);
+    bool result = pxUpdateRun(config, where, &query, "chipRun", "chip_id", "chipProcessedImfile", true, true);
     if (!result) {
         psError(psErrorCodeLast(), false, "pxUpdateRun failed");

tags/ipp-20110218/ippTools/src/chiptoolConfig.c

@@ -99 +99 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0,   "set dist group", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0,         "set note", NULL);
+    pxmagicAddArguments(updaterunArgs);
 
     // -setimfiletoupdate

tags/ipp-20110218/ippTools/src/diffphottool.c

@@ -228 +228 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "diffPhotRun", "diff_phot_id", "diffPhotSkyfile", true);
+    bool result = pxUpdateRun(config, where, &query, "diffPhotRun", "diff_phot_id", "diffPhotSkyfile", true, false);
 
     psFree(query);

tags/ipp-20110218/ippTools/src/difftool.c

@@ -224 +224 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "diffRun", "diff_id", "diffSkyfile", true);
+    bool result = pxUpdateRun(config, where, &query, "diffRun", "diff_id", "diffSkyfile", true, true);
 
     psFree(query);

tags/ipp-20110218/ippTools/src/difftoolConfig.c

@@ -73 +73 @@
     psMetadataAddS16(updaterunArgs, PS_LIST_TAIL, "-set_diff_mode", 0,    "specify type of difference (WW=1,WS=2,SW=3,SS=4)", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0,         "define new note", NULL);
+    pxmagicAddArguments(updaterunArgs);
 
     // -addinputskyfile

tags/ipp-20110218/ippTools/src/faketool.c

@@ -348 +348 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "fakeRun", "fake_id", "fakeProcessedImfile", true);
+    bool result = pxUpdateRun(config, where, &query, "fakeRun", "fake_id", "fakeProcessedImfile", true, false);
     if (!result) {
         psError(psErrorCodeLast(), false, "pxUpdateRun failed");

tags/ipp-20110218/ippTools/src/magicdstool.c

@@ -1395 +1395 @@
           (strcmp(state, "full") == 0) ||
           (strcmp(state, "drop") == 0) ||
+          (strcmp(state, "wait") == 0) ||
           (strcmp(state, "failed_revert") == 0) ||
           (strcmp(state, "error_cleaned") == 0) ||

tags/ipp-20110218/ippTools/src/pxtools.c

@@ -278 +278 @@
 
 // shared code for updating the various strings for a Run
-bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group)
+bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group, bool has_magicked)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -360 +360 @@
     if (fileWhere) {
         psStringAppend(pQuery, "%s", fileWhere);
+    }
+    if (has_magicked) {
+        pxmagicAddWhere(config, pQuery, runTable);
     }
 

tags/ipp-20110218/ippTools/src/pxtools.h

@@ -84 +84 @@
 bool pxGetOptions(FILE *stream, int argc, char **argv, pxConfig *config, psMetadata *modes, psMetadata *argSets);
 
-bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group);
+bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group, bool has_magicked);
 
 #define PXOPT_ADD_MODE(option, comment, modeval, argset) \

tags/ipp-20110218/ippTools/src/stacktool.c

@@ -750 +750 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "stackRun", "stack_id", "stackSumSkyfile", true);
+    bool result = pxUpdateRun(config, where, &query, "stackRun", "stack_id", "stackSumSkyfile", true, false);
 
     psFree(query);

tags/ipp-20110218/ippTools/src/staticskytool.c

@@ -360 +360 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "staticskyRun", "sky_id", "staticskyResult", true);
+    bool result = pxUpdateRun(config, where, &query, "staticskyRun", "sky_id", "staticskyResult", true, false);
     psFree(query);
     psFree(where);

tags/ipp-20110218/ippTools/src/warptool.c

@@ -435 +435 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, "warpRun", "warp_id", "warpSkyfile", true);
+    bool result = pxUpdateRun(config, where, &query, "warpRun", "warp_id", "warpSkyfile", true, true);
 
     psFree(query);

tags/ipp-20110218/ippTools/src/warptoolConfig.c

@@ -149 +149 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0,   "define new dist_group", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0,         "define new note", NULL);
+    pxmagicAddArguments(updaterunArgs);
 
     // -exp

tags/ipp-20110218/ippconfig/recipes/nightly_science.config

@@ -2 +2 @@
 CLEAN_MODES METADATA
   MODE           STR CHIP
-  COMMAND        STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+  COMMAND        STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked
   RETENTION_TIME U16 21
 END
 CLEAN_MODES METADATA
   MODE           STR WARP
-  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+  COMMAND        STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked
   RETENTION_TIME U16 7
 END
 CLEAN_MODES METADATA
   MODE           STR DIFF
-  COMMAND        STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
+  COMMAND        STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked
   RETENTION_TIME S16 21
 END