IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28558 for trunk


Ignore:
Timestamp:
Jun 30, 2010, 10:04:58 AM (16 years ago)
Author:
heather
Message:

detrend reverts - can now revert -all in run state

Location:
trunk/ippTools
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/addtool_revertminidvodbprocessed.sql

    r28266 r28558  
    55    AND addRun.minidvodb_name = minidvodbRun.minidvodb_name
    66    AND minidvodbProcessed.fault != 0
    7     AND minidvodbRun.state = 'new'
     7    AND minidvodbRun.state = 'merged'

  • trunk/ippTools/share/dettool_revertdetrunsummary.sql

    r14269 r28558  
    11DELETE FROM detRunSummary
     2USING detRunSummary, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detRunSummary.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertnormalizedexp.sql

    r14265 r28558  
    11DELETE FROM detNormalizedExp
     2USING detNormalizedExp, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detNormalizedExp.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertnormalizedimfile.sql

    r14243 r28558  
    11DELETE FROM detNormalizedImfile
     2USING detNormalizedImfile, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detNormalizedImfile.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertnormalizedstat.sql

    r14242 r28558  
    11DELETE FROM detNormalizedStatImfile
     2USING detNormalizedStatImfile, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detNormalizedStatImfile.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertprocessedexp.sql

    r14240 r28558  
    11DELETE FROM detProcessedExp
     2USING detProcessedExp, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detProcessedExp.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertprocessedimfile.sql

    r14240 r28558  
    11DELETE FROM detProcessedImfile
     2USING detProcessedImfile, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detProcessedImfile.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertresidexp.sql

    r14268 r28558  
    11DELETE FROM detResidExp
     2USING detResidExp, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detResidExp.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertresidimfile.sql

    r14266 r28558  
    11DELETE FROM detResidImfile
     2USING detResidImfile, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detResidImfile.det_id = detRun.det_id

  • trunk/ippTools/share/dettool_revertstacked.sql

    r14241 r28558  
    11DELETE FROM detStackedImfile
     2USING detStackedImfile, detRun
    23WHERE
    34    fault != 0
     5AND
     6    state = 'run'
     7AND
     8    detStackedImfile.det_id = detRun.det_id

  • trunk/ippTools/src/dettoolConfig.c

    r27082 r28558  
    299299    // -revertprocessedimfile
    300300    psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
    301     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id",  0,            "search for detrend ID (required)", 0);
     301    psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id",  0,            "search for detrend ID", 0);
    302302    psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    303303    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    304304    psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
    305 
     305    psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    306306    // -updateprocessedimfile
    307307    psMetadata *updateprocessedimfileArgs = psMetadataAlloc();
    … …  
    361361    // -revertprocessedexp
    362362    psMetadata *revertprocessedexpArgs = psMetadataAlloc();
    363     psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id",  0,            "search by detrend ID (required)", 0);
     363    psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id",  0,            "search by detrend ID", 0);
    364364    psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    365365    psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
    366 
     366    psMetadataAddBool(revertprocessedexpArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    367367    // -updateprocessedexp
    368368    psMetadata *updateprocessedexpArgs = psMetadataAlloc();
    … …  
    425425    // -revertstacked
    426426    psMetadata *revertstackedArgs= psMetadataAlloc();
    427     psMetadataAddS64(revertstackedArgs, PS_LIST_TAIL, "-det_id",  0,            "search for detrend ID (required)", 0);
     427    psMetadataAddS64(revertstackedArgs, PS_LIST_TAIL, "-det_id",  0,            "search for detrend ID", 0);
    428428    psMetadataAddS32(revertstackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    429429    psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    430430    psMetadataAddS16(revertstackedArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
     431    psMetadataAddBool(revertstackedArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    431432
    432433    // -updatestacked
    … …  
    477478    // -revertnormalizedstat
    478479    psMetadata *revertnormalizedstatArgs= psMetadataAlloc();
    479     psMetadataAddS64(revertnormalizedstatArgs, PS_LIST_TAIL, "-det_id",  0,            "search by detrend ID (required)", 0);
     480    psMetadataAddS64(revertnormalizedstatArgs, PS_LIST_TAIL, "-det_id",  0,            "search by detrend ID", 0);
    480481    psMetadataAddS32(revertnormalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    481482    psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    482483    psMetadataAddS16(revertnormalizedstatArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
    483 
     484    psMetadataAddBool(revertnormalizedstatArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    484485    // -updatenormalizedstat
    485486    psMetadata *updatenormalizedstatArgs = psMetadataAlloc();
    … …  
    539540    // -revertnormalizedimfile
    540541    psMetadata *revertnormalizedimfileArgs = psMetadataAlloc();
    541     psMetadataAddS64(revertnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID (required)", 0);
     542    psMetadataAddS64(revertnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID", 0);
    542543    psMetadataAddS32(revertnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    543544    psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0,            "search by class ID", NULL);
    544545    psMetadataAddS16(revertnormalizedimfileArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
    545 
     546    psMetadataAddBool(revertnormalizedimfileArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    546547    // -updatenormalizedimfile
    547548    psMetadata *updatenormalizedimfileArgs = psMetadataAlloc();
    … …  
    599600    // -revertnormalizedexp
    600601    psMetadata *revertnormalizedexpArgs = psMetadataAlloc();
    601     psMetadataAddS64(revertnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID (required)", 0);
     602    psMetadataAddS64(revertnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID", 0);
    602603    psMetadataAddS32(revertnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    603604    psMetadataAddS16(revertnormalizedexpArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
     605    psMetadataAddBool(revertnormalizedexpArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    604606
    605607    // -updatenormalizedexp
    … …  
    675677    // -revertresidimfile
    676678    psMetadata *revertresidimfileArgs =  psMetadataAlloc();
    677     psMetadataAddS64(revertresidimfileArgs, PS_LIST_TAIL, "-det_id", 0,          "search by detrend ID (required)", 0);
     679    psMetadataAddS64(revertresidimfileArgs, PS_LIST_TAIL, "-det_id", 0,          "search by detrend ID", 0);
    678680    psMetadataAddS32(revertresidimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
    679681    psMetadataAddS64(revertresidimfileArgs, PS_LIST_TAIL, "-exp_id",  0,         "search by detrend ID", 0);
    680682    psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-class_id",  0,       "search for class ID", NULL);
    681683    psMetadataAddS16(revertresidimfileArgs, PS_LIST_TAIL, "-fault",  0,           "search by fault code", 0);
     684    psMetadataAddBool(revertresidimfileArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    682685
    683686    // -updateresidimfile
    … …  
    752755    // -revertresidexp
    753756    psMetadata *revertresidexpArgs = psMetadataAlloc();
    754     psMetadataAddS64(revertresidexpArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID (required)", 0);
     757    psMetadataAddS64(revertresidexpArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID", 0);
    755758    psMetadataAddS32(revertresidexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    756759    psMetadataAddS64(revertresidexpArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by detrend ID", 0);
    757760    psMetadataAddS16(revertresidexpArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
    758 
     761    psMetadataAddBool(revertresidexpArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    759762    // -updateresidexp
    760763    psMetadata *updateresidexpArgs = psMetadataAlloc();
    … …  
    819822    // -revertdetrunsummary
    820823    psMetadata *revertdetrunsummaryArgs = psMetadataAlloc();
    821     psMetadataAddS64(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID (required)", 0);
     824    psMetadataAddS64(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID", 0);
    822825    psMetadataAddS32(revertdetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    823826    psMetadataAddS16(revertdetrunsummaryArgs, PS_LIST_TAIL, "-fault",  0,            "search by fault code", 0);
     827    psMetadataAddBool(revertdetrunsummaryArgs, PS_LIST_TAIL, "-all",  0,            "revert all in state 'run'", false);
    824828
    825829    // -updatedetrunsummary

  • trunk/ippTools/src/dettool_detrunsummary.c

    r26981 r28558  
    306306    PXOPT_COPY_S64(config->args, where, "-det_id",    "det_id", "==");
    307307    PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
    308     PXOPT_COPY_STR(config->args, where, "-fault",      "fault", "==");
     308    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
     309   
     310    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     311        psFree(where);
     312        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     313        return false;
     314    }
    309315
    310316    psString query = pxDataGet("dettool_revertdetrunsummary.sql");
    … …  
    327333    }
    328334    psFree(query);
    329 
    330     if (psDBAffectedRows(config->dbh) < 1) {
    331         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    332         return false;
    333     }
    334335
    335336    return true;

  • trunk/ippTools/src/dettool_normalizedexp.c

    r26981 r28558  
    222222    PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
    223223    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
     224   
     225    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     226        psFree(where);
     227        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     228        return false;
     229    }
    224230
    225231    psString query = pxDataGet("dettool_revertnormalizedexp.sql");
    … …  
    242248    }
    243249    psFree(query);
    244 
    245     if (psDBAffectedRows(config->dbh) < 1) {
    246         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    247         return false;
    248     }
    249250
    250251    return true;

  • trunk/ippTools/src/dettool_normalizedimfile.c

    r26981 r28558  
    202202    PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
    203203    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
     204   
     205    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     206        psFree(where);
     207        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     208        return false;
     209    }
    204210
    205211    psString query = pxDataGet("dettool_revertnormalizedimfile.sql");
    … …  
    222228    }
    223229    psFree(query);
    224 
    225     if (psDBAffectedRows(config->dbh) < 1) {
    226         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    227         return false;
    228     }
    229230
    230231    return true;

  • trunk/ippTools/src/dettool_normalizedstat.c

    r26981 r28558  
    182182    PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
    183183    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
     184   
     185    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     186        psFree(where);
     187        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     188        return false;
     189    }
    184190
    185191    psString query = pxDataGet("dettool_revertnormalizedstat.sql");
    … …  
    202208    }
    203209    psFree(query);
    204 
    205     if (psDBAffectedRows(config->dbh) < 1) {
    206         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    207         return false;
    208     }
    209210
    210211    return true;

  • trunk/ippTools/src/dettool_processedexp.c

    r26981 r28558  
    232232    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
    233233    PXOPT_COPY_S16(config->args, where, "-fault",   "fault", "==");
     234   
     235    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     236        psFree(where);
     237        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     238        return false;
     239    }
    234240
    235241    psString query = pxDataGet("dettool_revertprocessedexp.sql");
    … …  
    252258    }
    253259    psFree(query);
    254 
    255     if (psDBAffectedRows(config->dbh) < 1) {
    256         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    257         return false;
    258     }
    259260
    260261    return true;

  • trunk/ippTools/src/dettool_processedimfile.c

    r26981 r28558  
    264264    PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
    265265    PXOPT_COPY_S16(config->args, where, "-fault", "fault", "==");
     266   
     267    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     268        psFree(where);
     269        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     270        return false;
     271    }
    266272
    267273    psString query = pxDataGet("dettool_revertprocessedimfile.sql");
    … …  
    284290    }
    285291    psFree(query);
    286 
    287     if (psDBAffectedRows(config->dbh) < 1) {
    288         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    289         return false;
    290     }
    291292
    292293    return true;

  • trunk/ippTools/src/dettool_residexp.c

    r26981 r28558  
    275275    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
    276276
     277    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     278        psFree(where);
     279        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     280        return false;
     281    }
     282
    277283    psString query = pxDataGet("dettool_revertresidexp.sql");
    278284    if (!query) {
    … …  
    294300    }
    295301    psFree(query);
    296 
    297     if (psDBAffectedRows(config->dbh) < 1) {
    298         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    299         return false;
    300     }
    301302
    302303    return true;

  • trunk/ippTools/src/dettool_residimfile.c

    r26981 r28558  
    250250    PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
    251251    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
     252   
     253    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     254        psFree(where);
     255        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     256        return false;
     257    }
    252258
    253259    psString query = pxDataGet("dettool_revertresidimfile.sql");
    … …  
    270276    }
    271277    psFree(query);
    272 
    273     if (psDBAffectedRows(config->dbh) < 1) {
    274         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    275         return false;
    276     }
    277278
    278279    return true;

  • trunk/ippTools/src/dettool_stack.c

    r26981 r28558  
    287287    PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
    288288    PXOPT_COPY_S16(config->args, where, "-fault",      "fault", "==");
     289   
     290    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
     291        psFree(where);
     292        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
     293        return false;
     294    }
    289295
    290296    psString query = pxDataGet("dettool_revertstacked.sql");
    … …  
    307313    }
    308314    psFree(query);
    309 
    310     if (psDBAffectedRows(config->dbh) < 1) {
    311         psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
    312         return false;
    313     }
    314315
    315316    return true;
Note: See TracChangeset for help on using the changeset viewer.