Changeset 12263

Timestamp:

Mar 5, 2007, 6:33:27 PM (19 years ago)

Author:

jhoblitt

Message:

move stacktool SQL into it's own files

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/stacktool_inputskyfile.sql (added)
• share/stacktool_sumskyfile.sql (added)
• share/stacktool_tosum.sql (added)
• src/stacktool.c (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -22 +22 @@
         regtool_processedexp.sql \
         regtool_processedimfile.sql \
+        stacktool_inputskyfile.sql \
+        stacktool_sumskyfile.sql \
+        stacktool_tosum.sql \
         warptool_exp.sql \
         warptool_imfile.sql \

trunk/ippTools/src/stacktool.c

@@ -318 +318 @@
     }
 
-    // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   warpSkyfile.*,\n"
-        "   rawExp.camera\n"
-        " FROM stackRun\n"
-        " JOIN stackInputSkyfile\n"
-        "   USING(stack_id)\n"
-        " JOIN warpSkyfile\n"
-        "   ON  stackInputSkyfile.warp_id = warpSkyfile.warp_id\n"
-        "   AND stackRun.skycell_id       = warpSkyfile.skycell_id\n"
-        "   AND stackRun.tess_id          = warpSkyfile.tess_id\n"
-        " JOIN warpInputExp\n"
-        "   ON stackInputSkyfile.warp_id  = warpInputExp.warp_id\n"
-        " JOIN rawExp\n"
-        "   ON warpInputExp.exp_tag       = rawExp.exp_tag\n"
-        " WHERE\n"
-        "   stackRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("warptool_inputskyfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
     if (config->where) {
         psString whereClause = psDBGenerateWhereConditionSQL(config->where, "stackInputSkyfile");
@@ -419 +406 @@
     }
 
-    // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   stackRun.stack_id,\n"
-        "   stackRun.workdir\n"
-        " FROM stackRun\n"
-        " LEFT JOIN stackSumSkyfile\n"
-        "   USING(stack_id)\n"
-        " WHERE\n"
-        "   stackRun.state = 'run'\n"
-        "   AND stackSumSkyfile.stack_id IS NULL\n"
-    );
+    psString query = pxDataGet("warptool_tosum.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -592 +572 @@
     }
 
-    // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   stackSumSkyfile.*\n"
-        " FROM stackRun\n"
-        " JOIN stackSumSkyfile\n"
-        "   USING(stack_id)\n"
-        " WHERE\n"
-        "   stackRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("warptool_sumskyfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {