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

    r26960 r26981  
    151151    case IPP_STAGE_FAKE:
    152152    case IPP_STAGE_STACK:
    153         psError(PXTOOLS_ERR_DATA, true, "%sRuns do not need to be destreaked", stage);
     153        psError(PXTOOLS_ERR_CONFIG, true, "%sRuns do not need to be destreaked", stage);
    154154        return false;
    155155    case IPP_STAGE_NONE:
    156         psError(PXTOOLS_ERR_DATA, true, "%s is not a valid stage", stage);
     156        psError(PXTOOLS_ERR_CONFIG, true, "%s is not a valid stage", stage);
    157157        return false;
    158158    default:
    … …  
    163163
    164164    if (!query) {
    165         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     165        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    166166        return false;
    167167    }
    … …  
    377377        return false;
    378378      case IPP_STAGE_STACK:
    379         psError(PXTOOLS_ERR_DATA, true, "Stacks do not need to be destreaked");
     379        psError(PXTOOLS_ERR_CONFIG, true, "Stacks do not need to be destreaked");
    380380        return false;
    381381      case IPP_STAGE_NONE:
    382         psError(PXTOOLS_ERR_DATA, true, "%s is not a valid stage", stage);
     382        psError(PXTOOLS_ERR_CONFIG, true, "%s is not a valid stage", stage);
    383383        return false;
    384384      default:
    … …  
    389389
    390390    if (!query) {
    391         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     391        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    392392        return false;
    393393    }
    … …  
    610610    psString query = pxDataGet(sql_file);
    611611    if (!query) {
    612         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file);
     612        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement from %s", sql_file);
    613613        psFree(sql_file);
    614614        return false;
    … …  
    895895    psString query = pxDataGet("magicdstool_completed_runs.sql");
    896896    if (!query) {
    897         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     897        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    898898        return false;
    899899    }
    … …  
    10261026
    10271027    if (!new_state) {
    1028         if (!strcmp(state, "failed_revert")) { 
     1028        if (!strcmp(state, "failed_revert")) {
    10291029            new_state = "new";
    10301030        } else if (!strcmp(state, "failed_cleanup")) {
    … …  
    11341134    psString query = pxDataGet("magicdstool_getskycells.sql");
    11351135    if (!query) {
    1136         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1136        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    11371137        return false;
    11381138    }
    … …  
    12521252    psString query = pxDataGet("magicdstool_toremove.sql");
    12531253    if (!query) {
    1254         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1254        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    12551255        return false;
    12561256    }
    … …  
    13301330    psString query = pxDataGet(sql_file);
    13311331    if (!query) {
    1332         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", sql_file);
     1332        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement from %s", sql_file);
    13331333        psFree(sql_file);
    13341334        return false;
    … …  
    14081408    psString query = pxDataGet("magicdstool_tocleanup.sql");
    14091409    if (!query) {
    1410         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     1410        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    14111411        return false;
    14121412    }
Note: See TracChangeset for help on using the changeset viewer.