Changeset 34786 for branches/czw_branch/20120906/ippTools

Timestamp:

Dec 10, 2012, 4:35:46 PM (14 years ago)

Author:

watersc1

Message:

Merge from trunk

Location:

branches/czw_branch/20120906

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (3 diffs)
• ippTools/share/camtool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/chiptool_pendingcleanupimfile_all.sql (copied) (copied from trunk/ippTools/share/chiptool_pendingcleanupimfile_all.sql )
• ippTools/share/chiptool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/difftool_pendingcleanuprun.sql (modified) (4 diffs)
• ippTools/share/difftool_pendingcleanupskyfile_all.sql (copied) (copied from trunk/ippTools/share/difftool_pendingcleanupskyfile_all.sql )
• ippTools/share/pstamptool_revertdependent.sql (modified) (1 diff)
• ippTools/share/stacktool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/staticskytool_defineskycalrun.sql (modified) (2 diffs)
• ippTools/share/warptool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/warptool_pendingcleanupskyfile_all.sql (copied) (copied from trunk/ippTools/share/warptool_pendingcleanupskyfile_all.sql )
• ippTools/src/chiptool.c (modified) (2 diffs)
• ippTools/src/chiptoolConfig.c (modified) (1 diff)
• ippTools/src/difftool.c (modified) (3 diffs)
• ippTools/src/difftoolConfig.c (modified) (3 diffs)
• ippTools/src/staticskytool.c (modified) (5 diffs)
• ippTools/src/staticskytoolConfig.c (modified) (3 diffs)
• ippTools/src/warptool.c (modified) (2 diffs)
• ippTools/src/warptoolConfig.c (modified) (1 diff)

branches/czw_branch/20120906/ippTools/share/Makefile.am

@@ -88 +88 @@
         chiptool_listrun.sql \
         chiptool_pendingcleanupimfile.sql \
+        chiptool_pendingcleanupimfile_all.sql \
         chiptool_pendingcleanuprun.sql \
         chiptool_pendingimfile.sql \
@@ -172 +173 @@
         difftool_pendingcleanuprun.sql \
         difftool_pendingcleanupskyfile.sql \
+        difftool_pendingcleanupskyfile_all.sql \
         difftool_revertdiffskyfile_delete.sql \
         difftool_revertdiffskyfile_updated.sql \
@@ -424 +426 @@
         warptool_pendingcleanuprun.sql \
         warptool_pendingcleanupskyfile.sql \
+        warptool_pendingcleanupskyfile_all.sql \
         warptool_revertoverlap.sql \
         warptool_revertwarped_delete.sql \

branches/czw_branch/20120906/ippTools/share/camtool_pendingcleanuprun.sql

@@ -2 +2 @@
     camRun.cam_id,
     rawExp.camera,
+    rawExp.exp_tag,
+    camRun.workdir,
     camRun.state
 FROM camRun

branches/czw_branch/20120906/ippTools/share/chiptool_pendingcleanuprun.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     chipRun.chip_id,
     rawExp.camera,
-    chipRun.state
+    rawExp.exp_tag,
+    chipRun.state,
+    chipRun.workdir
 FROM chipRun
 JOIN rawExp 

branches/czw_branch/20120906/ippTools/share/difftool_pendingcleanuprun.sql

@@ -6 +6 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -35 +37 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -64 +68 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -93 +99 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun

branches/czw_branch/20120906/ippTools/share/pstamptool_revertdependent.sql

@@ -4 +4 @@
 SET pstampDependent.fault = 0
 -- fault count hook %s
-WHERE pstampDependent.state = 'new'
+WHERE pstampRequest.state ='run'
+    AND pstampJob.state ='run'
+    AND pstampDependent.state = 'new'
     AND (pstampDependent.fault > 0)

branches/czw_branch/20120906/ippTools/share/stacktool_pendingcleanuprun.sql

@@ -8 +8 @@
     stackRun.stack_id,
     rawExp.camera,
-    stackRun.state
+    stackRun.state,
+    stackSumSkyfile.path_base
 FROM stackRun
+JOIN stackSumSkyfile using(stack_id)
 JOIN stackInputSkyfile
     USING(stack_id)

branches/czw_branch/20120906/ippTools/share/staticskytool_defineskycalrun.sql

@@ -2 +2 @@
     sky_id,
     stack_id,
+    skycell_id,
+    filter,
     staticskyRun.workdir,
     staticskyRun.label,
@@ -11 +13 @@
     JOIN stackRun USING(stack_id)
     JOIN stackSumSkyfile USING(stack_id)
+    JOIN skycell USING(tess_id, skycell_id)
     LEFT JOIN skycalRun USING(sky_id, stack_id)
 WHERE staticskyRun.state = 'full'

branches/czw_branch/20120906/ippTools/share/warptool_pendingcleanuprun.sql

@@ -1 +1 @@
 SELECT
     warpRun.warp_id,
+    warpRun.workdir,
     rawExp.camera,
+    rawExp.exp_tag,
     warpRun.state
 FROM warpRun

branches/czw_branch/20120906/ippTools/src/chiptool.c

@@ -1311 +1311 @@
     PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
@@ -1319 +1320 @@
     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
-    psString query = pxDataGet("chiptool_pendingcleanupimfile.sql");
+    char *sql_file = all ? "chiptool_pendingcleanupimfile_all.sql" : "chiptool_pendingcleanupimfile.sql";
+    psString query = pxDataGet(sql_file);
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");

branches/czw_branch/20120906/ippTools/src/chiptoolConfig.c

@@ -296 +296 @@
     psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-chip_id", 0,          "search by chip ID", 0);
     psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-exp_id",                 0,            "search by exp_id", NULL);
+    psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-all",  0,            "list all components regardless of data_state", false);
     psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     psMetadataAddU64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);

branches/czw_branch/20120906/ippTools/src/difftool.c

@@ -2561 +2561 @@
 
     PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", false, false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2570 +2571 @@
     pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "==");
 
-    psString query = pxDataGet("difftool_pendingcleanupskyfile.sql");
+    char * sql_file  = all ? "difftool_pendingcleanupskyfile_all.sql": "difftool_pendingcleanupskyfile.sql" ;
+    psString query = pxDataGet(sql_file);
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -2740 +2742 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
-    PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
-
-    psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-diff_id",   "diff_id",   "==");
-    PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id",   "==");
-
-    if (!pxSetFaultCode(config->dbh, "diffSkyfile", where, fault, quality)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
+
+    if (!state) {
+        psMetadata *where = psMetadataAlloc();
+        PXOPT_COPY_S64(config->args, where, "-diff_id",   "diff_id",   "==");
+        PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id",   "==");
+
+        PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
+        PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
+
+        if (!pxSetFaultCode(config->dbh, "diffSkyfile", where, fault, quality)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
+            psFree (where);
+            return false;
+        }
         psFree (where);
-        return false;
-    }
-    psFree (where);
+    } else {
+      if (strcmp(state,"error_cleaned") == 0) {
+        change_skyfile_data_state(config,"error_cleaned", "goto_cleaned");
+      }
+      else if (strcmp(state, "error_scrubbed") == 0) {
+        change_skyfile_data_state(config,"error_scrubbed", "goto_scrubbed");
+      }
+      else if (strcmp(state, "error_purged") == 0) {
+        change_skyfile_data_state(config,"error_purged", "goto_purged");
+      }
+      else {
+        psError(PS_ERR_UNKNOWN, false, "unhandled state given");
+        return(false);
+      }
+    }
 
     return true;

branches/czw_branch/20120906/ippTools/src/difftoolConfig.c

@@ -395 +395 @@
     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
     psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,          "search by diff ID", 0);
+    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-all",  0,            "list all skycells regardless of data_state", false);
     psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
@@ -411 +412 @@
     psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple",  0,          "use the simple output format", false);
     psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
+
     // -updatediffskyfile
     psMetadata *updatediffskyfileArgs = psMetadataAlloc();
@@ -416 +418 @@
     psMetadataAddStr(updatediffskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,   "search by skycell ID", NULL);
     psMetadataAddS16(updatediffskyfileArgs, PS_LIST_TAIL, "-fault", 0,        "set fault code (required)", 0);
-    psMetadataAddS16(updatediffskyfileArgs, PS_LIST_TAIL, "-set_quality", 0,      "set quality", 0);
+    psMetadataAddS16(updatediffskyfileArgs, PS_LIST_TAIL, "-set_quality", 0,  "set quality", 0);
+    psMetadataAddStr(updatediffskyfileArgs, PS_LIST_TAIL, "-set_state", 0,    "set data_state state", NULL);
 
     // -tocleanedskyfile

branches/czw_branch/20120906/ippTools/src/staticskytool.c

@@ -132 +132 @@
     pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
-#ifdef notdef
-    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_min",      "skycell.glat",              ">=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_max",      "skycell.glat",              "<=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_min",   "skycell.radeg/15",          ">=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_max",   "skycell.radeg/15",          "<=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_min",     "skycell.radeg",             ">=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_max",     "skycell.radeg",             "<=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_min",    "skycell.decdeg",             ">=");
-    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_max",    "skycell.decdeg",             "<=");
-#endif
     if (!pxskycellAddWhere(config, whereMD)) {
         psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
@@ -686 +676 @@
     psStringAppend(&query, "\nGROUP BY sky_id");
     if (num_filters) {
-        psStringAppend(&query, "\nHAVING COUNT(filter) >= %d", num_filters);
+        psStringAppend(&query, "\nHAVING COUNT(filter) = %d", num_filters);
     }
         
@@ -1049 +1039 @@
     pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "staticskyRun.data_group",       "LIKE");
     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
+    if (!pxskycellAddWhere(config, whereMD)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
@@ -1128 +1122 @@
         psString sky_label =  psMetadataLookupStr(&status, row, "label");
         psString sky_data_group =  psMetadataLookupStr(&status, row, "data_group");
+        psString sky_dist_group =  psMetadataLookupStr(&status, row, "dist_group");
 
         // create a staticskyRun
@@ -1138 +1133 @@
                                 label ? label : sky_label,
                                 data_group ? data_group : sky_data_group,
-                                dist_group,
+                                dist_group ? dist_group : sky_dist_group,
                                 reduction,
                                 registered,

branches/czw_branch/20120906/ippTools/src/staticskytoolConfig.c

@@ -126 +126 @@
     psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
     psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);
-    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-num_filters", 0, "search by number of filters in the inputs (>=)", 0);
+    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-num_filters", 0, "search by number of filters in the inputs", 0);
     pxskycellAddArguments(resultArgs);
     psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
@@ -166 +166 @@
     psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
     psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
+    pxskycellAddArguments(defineskycalrunArgs);
     psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL);
     psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-set_label", 0, "define label", NULL);
@@ -183 +184 @@
     psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
     psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
+    pxskycellAddArguments(updateskycalrunArgs);
     psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-set_label", 0, "define new value for label", NULL);
     psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-set_state", 0, "define new state", NULL);

branches/czw_branch/20120906/ippTools/src/warptool.c

@@ -1838 +1838 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1843 +1844 @@
     pxAddLabelSearchArgs (config, where, "-label", "warpRun.label", "==");
 
-    psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");
+    char * sql_file = all ? "warptool_pendingcleanupskyfile_all.sql" : "warptool_pendingcleanupskyfile.sql";
+    psString query = pxDataGet(sql_file);
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");

branches/czw_branch/20120906/ippTools/src/warptoolConfig.c

@@ -364 +364 @@
     psMetadataAddStr(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "list blocks for specified label", NULL);
     psMetadataAddS64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,          "search by warp ID (required)", 0);
+    psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-all",  0,            "list all skycells regardless of data_state", false);
     psMetadataAddBool(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     psMetadataAddU64(pendingcleanupskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);