IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 30907


Ignore:
Timestamp:
Mar 15, 2011, 9:06:58 AM (15 years ago)
Author:
bills
Message:

for chiptool, difftool, camtool, and stacktool have -updateprocessedXXX to take -set_quality.
This is useful for giving up on processing that is stuck.

Location:
trunk/ippTools/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/addtool.c

    r30729 r30907  
    684684    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
    685685
    686     if (!pxSetFaultCode(config->dbh, "addProcessedExp", where, fault)) {
     686    if (!pxSetFaultCode(config->dbh, "addProcessedExp", where, fault, 0)) {
    687687        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    688688        psFree (where);

  • trunk/ippTools/src/camtool.c

    r30729 r30907  
    983983
    984984    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
     985    PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
    985986
    986987    psMetadata *where = psMetadataAlloc();
    … …  
    990991    PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
    991992
    992     if (!pxSetFaultCode(config->dbh, "camProcessedExp", where, fault)) {
     993    if (!pxSetFaultCode(config->dbh, "camProcessedExp", where, fault, quality)) {
    993994        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    994995        psFree (where);

  • trunk/ippTools/src/camtoolConfig.c

    r30805 r30907  
    244244    psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    245245    psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-fault",  0,            "set fault code (required)", INT16_MAX);
     246    psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-set_quality",  0,            "set quality", 0);
    246247
    247248    // -block

  • trunk/ippTools/src/chiptool.c

    r30729 r30907  
    963963    if (!state) {
    964964      PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
    965 
    966       if (!pxSetFaultCode(config->dbh, "chipProcessedImfile", where, fault)) {
     965      PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
     966
     967      if (!pxSetFaultCode(config->dbh, "chipProcessedImfile", where, fault, quality)) {
    967968        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    968969        return false;

  • trunk/ippTools/src/chiptoolConfig.c

    r30729 r30907  
    235235    psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-fault",  0,            "set fault code (required)", 0);
    236236    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-set_state", 0,         "set state", NULL);
    237 
     237    psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-set_quality",  0,            "set quality", 0);
    238238    // -processedExp
    239239    psMetadata *listrunArgs = psMetadataAlloc();

  • trunk/ippTools/src/difftool.c

    r30729 r30907  
    26812681
    26822682    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
     2683    PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
    26832684
    26842685    psMetadata *where = psMetadataAlloc();
    … …  
    26862687    PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id",   "==");
    26872688
    2688     if (!pxSetFaultCode(config->dbh, "diffSkyfile", where, fault)) {
     2689    if (!pxSetFaultCode(config->dbh, "diffSkyfile", where, fault, quality)) {
    26892690        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    26902691        psFree (where);

  • trunk/ippTools/src/difftoolConfig.c

    r30729 r30907  
    411411    psMetadata *updatediffskyfileArgs = psMetadataAlloc();
    412412    psMetadataAddS64(updatediffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,      "define diff ID (required)", 0);
     413    psMetadataAddStr(updatediffskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,   "search by skycell ID", NULL);
    413414    psMetadataAddS16(updatediffskyfileArgs, PS_LIST_TAIL, "-fault", 0,        "set fault code (required)", 0);
    414     psMetadataAddStr(updatediffskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,   "search by skycell ID", NULL);
     415    psMetadataAddS16(updatediffskyfileArgs, PS_LIST_TAIL, "-set_quality", 0,      "set quality", 0);
    415416
    416417    // -tocleanedskyfile

  • trunk/ippTools/src/faketool.c

    r30729 r30907  
    706706    PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
    707707
    708     if (!pxSetFaultCode(config->dbh, "fakeProcessedImfile", where, fault)) {
     708    if (!pxSetFaultCode(config->dbh, "fakeProcessedImfile", where, fault, 0)) {
    709709        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    710710        psFree(where);

  • trunk/ippTools/src/pxfault.c

    r13580 r30907  
    2626#include "pxtools.h"
    2727
    28 bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code)
     28bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code, psS16 quality)
    2929{
    3030    PS_ASSERT_PTR_NON_NULL(dbh, false);
    … …  
    4848        return false;
    4949    }
     50    if (quality) {
     51        if (!psMetadataAddS16(values, PS_LIST_HEAD, "quality", 0, NULL, quality)) {
     52            psError(PS_ERR_UNKNOWN, false, "failed to add metadata item quality");
     53            psFree(values);
     54            return false;
     55        }
     56    }
    5057
    5158    long rowsAffected = psDBUpdateRows(dbh, tableName, where, values);

  • trunk/ippTools/src/pxtools.h

    r30729 r30907  
    7575bool pxAddLabelSearchArgs (pxConfig *config, psMetadata *where, char *field, char *name, char *op);
    7676
    77 bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code);
     77bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code, psS16 quality);
    7878bool pxExportVersion(pxConfig *config, FILE *f);
    7979bool pxCheckImportVersion(pxConfig *config, psMetadata *md);

  • trunk/ippTools/src/pztool.c

    r30437 r30907  
    798798    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
    799799
    800     if (!pxSetFaultCode(config->dbh, "pzDownloadImfile", where, fault)) {
     800    if (!pxSetFaultCode(config->dbh, "pzDownloadImfile", where, fault, 0)) {
    801801        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    802802        psFree (where);

  • trunk/ippTools/src/regtool.c

    r30652 r30907  
    894894    if (fault != INT16_MAX) {
    895895        // this is fairly dangerous : can set all if the where is not set...
    896         if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault)) {
     896        if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault, 0)) {
    897897            psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    898898            psFree (where);
    … …  
    16081608  PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
    16091609
    1610   if (!pxSetFaultCode(config->dbh, "rawExp", where, fault)) {
     1610  if (!pxSetFaultCode(config->dbh, "rawExp", where, fault, 0)) {
    16111611    psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    16121612    psFree(where);

  • trunk/ippTools/src/stacktool.c

    r30729 r30907  
    16601660
    16611661    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
     1662    PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
    16621663
    16631664    psMetadata *where = psMetadataAlloc();
    16641665    PXOPT_COPY_S64(config->args, where, "-stack_id",   "stack_id",   "==");
    16651666
    1666     if (!pxSetFaultCode(config->dbh, "stackSumSkyfile", where, fault)) {
     1667    if (!pxSetFaultCode(config->dbh, "stackSumSkyfile", where, fault, quality)) {
    16671668        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    16681669        psFree (where);

  • trunk/ippTools/src/stacktoolConfig.c

    r29299 r30907  
    266266    psMetadataAddS64(updatesumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,            "define stack ID (required)", 0);
    267267    psMetadataAddS16(updatesumskyfileArgs, PS_LIST_TAIL, "-fault", 0,            "set fault code (required)", 0);
     268    psMetadataAddS16(updatesumskyfileArgs, PS_LIST_TAIL, "-set_quality", 0,            "set quality", 0);
    268269
    269270    // -exportrun

  • trunk/ippTools/src/staticskytool.c

    r30729 r30907  
    716716    PXOPT_COPY_S64(config->args, where, "-sky_id",   "sky_id",   "==");
    717717
    718     if (!pxSetFaultCode(config->dbh, "staticskyResult", where, fault)) {
     718    if (!pxSetFaultCode(config->dbh, "staticskyResult", where, fault, 0)) {
    719719        psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
    720720        psFree (where);
Note: See TracChangeset for help on using the changeset viewer.