Changeset 35039 for trunk/ippTools

Timestamp:

Jan 23, 2013, 4:55:10 PM (13 years ago)

Author:

bills

Message:

Add skycell args to staticskytool -todo -revert and -revertskycal to
allow selecting by coordinates.
Add -abs_glat_min and -abs_glat_max to the skycell args to make it easier
to select things away from or near the galactic plane

Location:

trunk/ippTools

Files:

• share/staticskytool_revert.sql (modified) (1 diff)
• share/staticskytool_revertskycal.sql (modified) (1 diff)
• src/staticskytool.c (modified) (3 diffs)
• src/staticskytoolConfig.c (modified) (3 diffs)

trunk/ippTools/share/staticskytool_revert.sql

@@ -1 +1 @@
 DELETE FROM staticskyResult
-USING staticskyResult, staticskyRun
+USING staticskyResult, staticskyRun, staticskyInput, stackRun, skycell
 WHERE staticskyRun.sky_id = staticskyResult.sky_id
+    AND staticskyRun.sky_id = staticskyInput.sky_id
+    AND staticskyInput.stack_id = stackRun.stack_id
+    AND stackRun.tess_id = skycell.tess_id
+    AND stackRun.skycell_id = skycell.skycell_id
     AND staticskyRun.state = 'new'
     AND staticskyResult.fault != 0

trunk/ippTools/share/staticskytool_revertskycal.sql

@@ -1 +1 @@
 DELETE FROM skycalResult
-USING skycalResult, skycalRun, stackRun
+USING skycalResult, skycalRun, stackRun, skycell
 WHERE skycalRun.skycal_id = skycalResult.skycal_id
     AND stackRun.stack_id = skycalRun.stack_id
     AND skycalRun.state = 'new'
     AND skycalResult.fault != 0
+    AND stackRun.tess_id = skycell.tess_id
+    AND stackRun.skycell_id = skycell.skycell_id

trunk/ippTools/src/staticskytool.c

@@ -503 +503 @@
     PXOPT_COPY_S64(config->args, whereMD, "-sky_id", "sky_id", "==");
     pxAddLabelSearchArgs (config, whereMD, "-label", "staticskyRun.label", "==");
+    pxskycellAddWhere(config, whereMD);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -735 +736 @@
     pxAddLabelSearchArgs(config, where, "-label", "staticskyRun.label", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "staticskyResult.fault", "==");
+
+    if (!pxskycellAddWhere(config, where)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
@@ -1478 +1484 @@
     pxAddLabelSearchArgs(config, where, "-filter", "stackRun.filter", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "skycalResult.fault", "==");
+    if (!pxskycellAddWhere(config, where)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {

trunk/ippTools/src/staticskytoolConfig.c

@@ -103 +103 @@
     psMetadataAddS64(todoArgs, PS_LIST_TAIL, "-sky_id", 0, "search by staticsky ID", 0);
     psMetadataAddStr(todoArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
+    pxskycellAddArguments(todoArgs);
     psMetadataAddU64(todoArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
     psMetadataAddBool(todoArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
@@ -138 +139 @@
     psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", 0);
     psMetadataAddS16(revertArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
+    pxskycellAddArguments(revertArgs);
     psMetadataAddBool(revertArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", false);
 
@@ -238 +240 @@
     psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by data_group", 0);
     psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", 0);
+    pxskycellAddArguments(revertskycalArgs);
     psMetadataAddS16(revertskycalArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
     psMetadataAddBool(revertskycalArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", false);