Changeset 30812 for branches/eam_branches/ipp-20110213/ippTools

Timestamp:

Mar 6, 2011, 2:34:55 PM (15 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20110213/ippTools

Files:

• share/camtool_find_pendingimfile.sql (modified) (1 prop)
• share/magicdstool_todestreak_raw.sql (modified) (2 diffs)
• share/magicdstool_torevert_diff.sql (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• src (modified) (1 prop)
• src/addtool.c (modified) (1 diff)
• src/bgtool.c (modified) (2 diffs)
• src/camtool.c (modified) (1 diff)
• src/camtoolConfig.c (modified) (2 diffs)
• src/chiptool.c (modified) (1 diff)
• src/chiptoolConfig.c (modified) (1 diff)
• src/diffphottool.c (modified) (1 diff)
• src/difftool.c (modified) (1 diff)
• src/difftoolConfig.c (modified) (1 diff)
• src/faketool.c (modified) (1 diff)
• src/magicdstool.c (modified) (1 diff)
• src/magictool.c (modified) (1 prop)
• src/pubtool.c (modified) (3 diffs)
• src/pubtool.h (modified) (1 diff)
• src/pubtoolConfig.c (modified) (2 diffs)
• src/pxtools.c (modified) (2 diffs)
• src/pxtools.h (modified) (1 diff)
• src/stacktool.c (modified) (1 diff)
• src/staticskytool.c (modified) (1 diff)
• src/warptool.c (modified) (1 diff)
• src/warptoolConfig.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_todestreak_raw.sql

@@ -24 +24 @@
     re_place,
     remove,
-    10000 AS priority
+    IFNULL(Label.priority, 10000) AS priority
 FROM magicDSRun
 JOIN magicMask USING (magic_id)
@@ -35 +35 @@
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = rawImfile.class_id
+LEFT JOIN Label ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
     AND magicDSRun.stage = 'raw'
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)
+

branches/eam_branches/ipp-20110213/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,

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/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");

branches/eam_branches/ipp-20110213/ippTools/src/camtoolConfig.c

@@ -86 +86 @@
     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);
 
     // -pendingexp
@@ -299 +300 @@
     PXOPT_ADD_MODE("-addprocessedexp",      "add a processed exposure",             CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
     PXOPT_ADD_MODE("-processedexp",         "show processed exposures",             CAMTOOL_MODE_PROCESSEDEXP,  processedexpArgs);
-    PXOPT_ADD_MODE("-revertprocessedexp",   "change procesed exp properties",       CAMTOOL_MODE_REVERTPROCESSEDEXP,  revertprocessedexpArgs);
-    PXOPT_ADD_MODE("-updateprocessedexp",   "undo a processed exposure",            CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
+    PXOPT_ADD_MODE("-revertprocessedexp",   "undo a processed exposure",       CAMTOOL_MODE_REVERTPROCESSEDEXP,  revertprocessedexpArgs);
+    PXOPT_ADD_MODE("-updateprocessedexp",   "changed processed exp properties",            CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
     PXOPT_ADD_MODE("-block",                "set a label block",                    CAMTOOL_MODE_BLOCK,         blockArgs);
     PXOPT_ADD_MODE("-masked",               "show blocked labels",                  CAMTOOL_MODE_MASKED,        maskedArgs);

branches/eam_branches/ipp-20110213/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");

branches/eam_branches/ipp-20110213/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

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/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

branches/eam_branches/ipp-20110213/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");

branches/eam_branches/ipp-20110213/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) ||

branches/eam_branches/ipp-20110213/ippTools/src/pubtool.c

@@ -37 +37 @@
 static bool addMode(pxConfig *config);
 static bool revertMode(pxConfig *config);
+static bool updaterunMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -63 +64 @@
         MODECASE(PUBTOOL_MODE_ADD, addMode);
         MODECASE(PUBTOOL_MODE_REVERT, revertMode);
+        MODECASE(PUBTOOL_MODE_UPDATERUN, updaterunMode);
       default:
         psAbort("invalid option (this should not happen)");
@@ -459 +461 @@
 }
 
+static bool updaterunMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc(); // WHERE conditions
+    PXOPT_COPY_S64(config->args, where, "-pub_id", "pub_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-client_id", "client_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_STR(config->args, where, "-fault", "fault", "==");
+
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state",  true, false);
+
+    psString query = NULL;              // Query to run
+    psStringAppend(&query, "UPDATE publishRun LEFT JOIN publishDone using(pub_id) SET state = '%s'", state);
+
+    if (psListLength(where->list)) {
+        psString clause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, "\n WHERE %s", clause);
+        psFree(clause);
+    } else {
+        psError(PS_ERR_UNKNOWN, false, "select arguments are required");
+        return false;
+    }
+    psFree(where);
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    long numUpdated = psDBAffectedRows(config->dbh);
+    psLogMsg("pubtool", PS_LOG_INFO, "%ld rows updated.", numUpdated);
+
+    return true;
+}

branches/eam_branches/ipp-20110213/ippTools/src/pubtool.h

@@ -31 +31 @@
     PUBTOOL_MODE_ADD,
     PUBTOOL_MODE_REVERT,
+    PUBTOOL_MODE_UPDATERUN,
 } pubtoolMode;
 

branches/eam_branches/ipp-20110213/ippTools/src/pubtoolConfig.c

@@ -102 +102 @@
     psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on label", NULL);
 
+    // -updaterun
+    psMetadata *updaterunArgs = psMetadataAlloc();
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "new value for state (required)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-pub_id", 0, "search on pub_id", 0);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-client_id", 0, "search on client_id", 0);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-fault", 0, "search by fault", NULL);
+
 
     psMetadata *argSets = psMetadataAlloc();
@@ -112 +121 @@
     PXOPT_ADD_MODE("-add", "", PUBTOOL_MODE_ADD, addArgs);
     PXOPT_ADD_MODE("-revert", "", PUBTOOL_MODE_REVERT, revertArgs);
+    PXOPT_ADD_MODE("-updaterun", "", PUBTOOL_MODE_UPDATERUN, updaterunArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

branches/eam_branches/ipp-20110213/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);
     }
 

branches/eam_branches/ipp-20110213/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) \

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/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);

branches/eam_branches/ipp-20110213/ippTools/src/warptoolConfig.c

@@ -141 +141 @@
     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-registered_begin", 0, "search for runs by registration time (>=)", NULL);
     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-registered_end", 0, "search for runs by registration time (<)", NULL);
-    psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-destreaked", 0, "search for runs that have been destreaked", false);
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-pretend", 0, "only pretend to run the query", false);
 
@@ -149 +148 @@
     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