IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 17, 2010, 4:40:03 PM (16 years ago)
Author:
Paul Price
Message:

Reworked all ippTools to put fault=2 (SYS_ERROR) when can't find SQL file (presumably due to NFS problems). Removed DATA_ERROR because ippTools don't work on data (astronomical images or catalogues). This should allow us to turn on revert for fault=2 only.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/stacktool.c

    r26910 r26981  
    169169    if (!psListLength(where->list)) {
    170170        psFree(where);
    171         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     171        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
    172172        return false;
    173173    }
    … …  
    175175    psString select = pxDataGet("stacktool_definebyquery_select.sql");
    176176    if (!select) {
    177         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     177        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    178178        return false;
    179179    }
    … …  
    272272    }
    273273    if (!insert) {
    274         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     274        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    275275        psFree(where);
    276276        return false;
    … …  
    287287        psString part2 = pxDataGet("stacktool_definebyquery_insert_random_part2.sql");
    288288        if (!part2) {
    289             psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     289            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    290290            psFree(insert);
    291291            return false;
    … …  
    593593    if (!psListLength(where->list)) {
    594594        psFree(where);
    595         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     595        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
    596596        return false;
    597597    }
    … …  
    663663    psString query = pxDataGet("stacktool_inputskyfile.sql");
    664664    if (!query) {
    665         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     665        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    666666        return false;
    667667    }
    … …  
    737737    psString query = pxDataGet("stacktool_tosum.sql");
    738738    if (!query) {
    739         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     739        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    740740        return false;
    741741    }
    … …  
    923923    psString query = pxDataGet("stacktool_sumskyfile.sql");
    924924    if (!query) {
    925         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     925        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    926926        return false;
    927927    }
    … …  
    932932        psFree(whereClause);
    933933    } else if (!all) {
    934         psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
     934        psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required");
    935935        return false;
    936936    }
    … …  
    997997    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
    998998        psFree(where);
    999         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     999        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
    10001000        return false;
    10011001    }
    … …  
    10041004    psString delete = pxDataGet("stacktool_revertsumskyfile_delete.sql");
    10051005    if (!delete) {
    1006         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1006        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    10071007        return false;
    10081008    }
    … …  
    10851085    psString query = pxDataGet("stacktool_pendingcleanuprun.sql");
    10861086    if (!query) {
    1087         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1087        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    10881088        return false;
    10891089    }
    … …  
    11491149    psString query = pxDataGet("stacktool_pendingcleanupskyfile.sql");
    11501150    if (!query) {
    1151         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1151        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    11521152        return false;
    11531153    }
    … …  
    12101210    psString query = pxDataGet("stacktool_donecleanup.sql");
    12111211    if (!query) {
    1212         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1212        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    12131213        return false;
    12141214    }
    … …  
    13141314    psString query = pxDataGet(tables[i].sqlFilename);
    13151315    if (!query) {
    1316       psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1316      psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    13171317      return false;
    13181318    }
Note: See TracChangeset for help on using the changeset viewer.