Changeset 12262

Timestamp:

Mar 5, 2007, 6:22:26 PM (19 years ago)

Author:

jhoblitt

Message:

move difftool SQL into it's own files

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/difftool_inputskyfile.sql (added)
• share/difftool_skyfile.sql (added)
• share/difftool_todiffskyfile.sql (added)
• src/difftool.c (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -13 +13 @@
         detselect_search.sql \
         detselect_select.sql \
+        difftool_inputskyfile.sql \
+        difftool_skyfile.sql \
+        difftool_todiffskyfile.sql \
         regtool_find_unprocessed_exp.sql \
         regtool_find_unprocessed_imfile.sql \

trunk/ippTools/src/difftool.c

@@ -308 +308 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   warpSkyfile.*,\n"
-        "   diffInputSkyfile.template,\n"
-        "   rawExp.camera\n"
-        " FROM diffRun\n"
-        " JOIN diffInputSkyfile\n"
-        "   USING(diff_id)\n"
-        " JOIN warpSkyfile\n"
-        "   ON diffInputSkyfile.warp_id    = warpSkyfile.warp_id\n"
-        "  AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id\n"
-        "  AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id\n"
-        " JOIN warpInputExp\n"
-        "   ON diffInputSkyfile.warp_id    = warpInputExp.warp_id\n"
-        " JOIN camProcessedExp\n"
-        "   ON warpInputExp.cam_id = camProcessedExp.cam_id\n"
-        " JOIN chipProcessedExp\n"
-        "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id\n"
-        " JOIN rawExp\n"
-        "   ON chipProcessedExp.exp_tag = rawExp.exp_tag\n"
-        " WHERE\n"
-        "   diffRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("difftool_inputskyfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -414 +396 @@
     }
 
-    // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT DISTINCT\n"
-        "   diffRun.diff_id,\n"
-        "   diffRun.workdir\n"
-        " FROM diffRun\n"
-        " JOIN diffInputSkyfile\n"
-        "   USING(diff_id)\n"
-        " JOIN warpSkyfile\n"
-        "   ON diffInputSkyfile.warp_id      = warpSkyfile.warp_id\n"
-        "  AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id\n"
-        "  AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id\n"
-        " LEFT JOIN diffSkyfile\n"
-        "   ON diffInputSkyfile.diff_id      = diffSkyfile.diff_id\n"
-        " WHERE\n"
-        "   diffRun.state = 'run'\n"
-        "   AND diffSkyfile.diff_id IS NULL\n"
-    );
+    psString query = pxDataGet("difftool_todiffskyfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -589 +558 @@
     }
 
-    // find all rawImfiles matching the default query
-    psString query = psStringCopy(
-        "SELECT\n"
-        "   diffRun.skycell_id,\n"
-        "   diffRun.tess_id,\n"
-        "   diffSkyfile.*\n"
-        " FROM diffRun\n"
-        " JOIN diffSkyfile\n"
-        "   USING(diff_id)\n"
-        " WHERE\n"
-        "   diffRun.state = 'run'\n"
-    );
+    psString query = pxDataGet("difftool_skyfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {