IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12261


Ignore:
Timestamp:
Mar 5, 2007, 6:14:15 PM (19 years ago)
Author:
jhoblitt
Message:

move warptool SQL out into it's own files

Location:
trunk/ippTools
Files:
5 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/Makefile.am

    r12259 r12261  
    1919        regtool_processedexp.sql \
    2020        regtool_processedimfile.sql \
    21         warptool_tooverlap.sql
    22 
     21        warptool_exp.sql \
     22        warptool_imfile.sql \
     23        warptool_scmap.sql \
     24        warptool_tooverlap.sql \
     25        warptool_towarped.sql \
     26        warptool_warped.sql

  • trunk/ippTools/src/warptool.c

    r12237 r12261  
    284284
    285285    // find all rawImfiles matching the default query
    286     psString query = psStringCopy(
    287         "SELECT\n"
    288         "   camProcessedExp.*\n"
    289         " FROM warpRun\n"
    290         " JOIN warpInputExp\n"
    291         "   USING(warp_id)\n"
    292         " JOIN camProcessedExp\n"
    293         "   ON warpInputExp.cam_id = camProcessedExp.cam_id\n"
    294         " WHERE\n"
    295         "   warpRun.state = 'run'\n"
    296         "   AND camProcessedExp.fault = 0\n"
    297     );
     286    psString query = pxDataGet("warptool_exp.sql");
     287    if (!query) {
     288        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     289        return false;
     290    }
    298291
    299292    if (config->where) {
    … …  
    380373
    381374    // find all rawImfiles matching the default query
    382     psString query = psStringCopy(
    383         "SELECT\n"
    384         "   rawImfile.*,\n"
    385         "   warpInputExp.cam_id\n"
    386         " FROM warpRun\n"
    387         " JOIN warpInputExp\n"
    388         "   USING(warp_id)\n"
    389         " JOIN camProcessedExp\n"
    390         "   ON warpInputExp.cam_id = camProcessedExp.cam_id"
    391         " JOIN chipProcessedExp\n"
    392         "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id"
    393         " JOIN rawImfile\n" // is there any reason not to refer back to rawimfiles?
    394         "   ON chipProcessedExp.exp_tag = rawImfile.exp_tag\n"
    395         " WHERE\n"
    396         "   warpRun.state = 'run'\n"
    397     );
     375    psString query = pxDataGet("warptool_imfile.sql");
     376    if (!query) {
     377        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     378        return false;
     379    }
     380
    398381    if (config->where) {
    399382        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
    … …  
    667650
    668651    // find all rawImfiles matching the default query
    669     psString query = psStringCopy(
    670         "SELECT\n"
    671         "   warpSkyCellMap.*,\n"
    672         "   chipProcessedImfile.uri\n"
    673         " FROM warpRun\n"
    674         " JOIN warpSkyCellMap\n"
    675         "   USING(warp_id)\n"
    676         " JOIN camProcessedExp\n"
    677         "   ON warpSkyCellMap.cam_id = camProcessedExp.cam_id"
    678         " JOIN chipProcessedImfile\n"
    679         "   ON camProcessedExp.chip_id = chipProcessedImfile.chip_id"
    680         "   AND warpSkyCellMap.class_id = chipProcessedImfile.class_id\n"
    681         " WHERE\n"
    682         "   warpRun.state = 'run'\n"
    683     );
     652    psString query = pxDataGet("warptool_scmap.sql");
     653    if (!query) {
     654        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     655        return false;
     656    }
    684657
    685658    if (config->where) {
    … …  
    766739
    767740    // find all rawImfiles matching the default query
    768     psString query = psStringCopy(
    769         "SELECT\n"
    770         "   warpSkyCellMap.*,\n"
    771         "   rawExp.camera,\n"
    772         "   warpRun.workdir\n"
    773         " FROM warpRun\n"
    774         " JOIN warpSkyCellMap\n"
    775         "   USING(warp_id)\n"
    776         " JOIN camProcessedExp\n"
    777         "   ON warpSkyCellMap.cam_id = camProcessedExp.cam_id"
    778         " JOIN chipProcessedExp\n"
    779         "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id"
    780         " JOIN rawExp\n"
    781         "   ON chipProcessedExp.exp_tag = rawExp.exp_tag\n"
    782         " LEFT JOIN warpSkyfile\n"
    783         "   ON warpRun.warp_id = warpSkyfile.warp_id\n"
    784         "   AND warpSkyCellMap.skycell_id = warpSkyfile.skycell_id\n"
    785         "   AND warpSkyCellMap.tess_id = warpSkyfile.tess_id\n"
    786         " WHERE\n"
    787         "   warpRun.state = 'run'\n"
    788         "   AND warpSkyfile.warp_id IS NULL\n"
    789         "   AND warpSkyfile.skycell_id IS NULL\n"
    790         "   AND warpSkyfile.tess_id IS NULL\n"
    791     );
     741    psString query = pxDataGet("warptool_towarped.sql");
     742    if (!query) {
     743        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     744        return false;
     745    }
    792746
    793747    if (config->where) {
    … …  
    964918    PS_ASSERT_PTR_NON_NULL(config, false);
    965919
     920    // XXX this SQL has not been broken out to into seperate files as the MYSQL
     921    // < 5 & MYSQL 5 versions need to be kept in sync
    966922#if MYSQL5
    967923    // XXX at MySQL 4.1.21 (probably all of 4.1.x) chokes and dies on this
    … …  
    10751031
    10761032    // find all rawImfiles matching the default query
    1077     psString query = psStringCopy(
    1078         "SELECT\n"
    1079         "   warpSkyfile.*\n"
    1080         " FROM warpRun\n"
    1081         " JOIN warpSkyfile\n"
    1082         "   USING(warp_id)\n"
    1083         " WHERE\n"
    1084         "   warpRun.state = 'run'\n"
    1085     );
     1033    psString query = pxDataGet("warptool_warped.sql");
     1034    if (!query) {
     1035        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1036        return false;
     1037    }
    10861038
    10871039    if (config->where) {
Note: See TracChangeset for help on using the changeset viewer.