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/faketool.c

    r26175 r26981  
    168168        && !psMetadataLookupBool(NULL, config->args, "-all")) {
    169169        psFree(where);
    170         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     170        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
    171171        return false;
    172172    }
    … …  
    190190    psString query = pxDataGet("faketool_find_camrun.sql");
    191191    if (!query) {
    192         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     192        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    193193        psFree(where);
    194194        return false;
    … …  
    341341        psFree(where);
    342342        where = NULL;
    343         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     343        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
    344344        return false;
    345345    }
    … …  
    350350    bool result = pxUpdateRun(config, where, &query, "fakeRun", true);
    351351    if (!result) {
    352         psError(PXTOOLS_ERR_DATA, false, "pxUpdateRun failed");
     352        psError(psErrorCodeLast(), false, "pxUpdateRun failed");
    353353    }
    354354
    … …  
    375375    psString query = pxDataGet("faketool_find_pendingexp.sql");
    376376    if (!query) {
    377         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     377        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    378378        psFree(where);
    379379        return false;
    … …  
    442442    psString query = pxDataGet("faketool_pendingimfile.sql");
    443443    if (!query) {
    444         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     444        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    445445        return false;
    446446    }
    … …  
    563563    psString query = pxDataGet("faketool_processedimfile.sql");
    564564    if (!query) {
    565         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     565        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    566566        return false;
    567567    }
    … …  
    667667        && !psMetadataLookupBool(NULL, config->args, "-all")) {
    668668        psFree(where);
    669         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
     669        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
    670670        return false;
    671671    }
    … …  
    673673    psString query = pxDataGet("faketool_revertprocessedimfile.sql");
    674674    if (!query) {
    675         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     675        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    676676        psFree(where);
    677677        return false;
    … …  
    814814    psString query = pxDataGet("faketool_unmasked.sql");
    815815    if (!query) {
    816         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     816        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    817817        return false;
    818818    }
    … …  
    891891    psString query = pxDataGet("faketool_pendingcleanuprun.sql");
    892892    if (!query) {
    893         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     893        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    894894        return false;
    895895    }
    … …  
    956956    psString query = pxDataGet("faketool_pendingcleanupimfile.sql");
    957957    if (!query) {
    958         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     958        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    959959        return false;
    960960    }
    … …  
    10171017    psString query = pxDataGet("faketool_donecleanup.sql");
    10181018    if (!query) {
    1019         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1019        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    10201020        return false;
    10211021    }
    … …  
    10791079    psString query = pxDataGet("faketool_completely_processed_exp.sql");
    10801080    if (!query) {
    1081         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1081        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    10821082        return false;
    10831083    }
    … …  
    12871287    psString query = pxDataGet(tables[i].sqlFilename);
    12881288    if (!query) {
    1289       psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1289      psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    12901290      return false;
    12911291    }
Note: See TracChangeset for help on using the changeset viewer.