IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23389


Ignore:
Timestamp:
Mar 18, 2009, 10:18:37 AM (17 years ago)
Author:
bills
Message:

change states from 'run' and 'stop' to 'new' and 'full'
add label to magicDSRun

Location:
trunk/ippTools
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/magicdstool_completed_runs.sql

    r20973 r23389  
    1212        AND magicDSFile.component = rawImfile.class_id
    1313    WHERE
    14         magicDSRun.state = 'run'
     14        magicDSRun.state = 'new'
    1515        AND magicDSRun.stage = 'raw'
    1616    GROUP BY
    … …  
    3030        AND magicDSFile.component = chipProcessedImfile.class_id
    3131    WHERE
    32         magicDSRun.state = 'run'
     32        magicDSRun.state = 'new'
    3333        AND magicDSRun.stage = 'chip'
    3434    GROUP BY
    … …  
    4848        AND magicDSFile.component = warpSkyfile.skycell_id
    4949    WHERE
    50         magicDSRun.state = 'run'
     50        magicDSRun.state = 'new'
    5151        AND magicDSRun.stage = 'warp'
    5252        AND warpSkyfile.fault = 0
    … …  
    7272        AND magicDSFile.component = diffSkyfile.skycell_id
    7373    WHERE
    74         magicDSRun.state = 'run'
     74        magicDSRun.state = 'new'
    7575        AND magicDSRun.stage = 'diff'
    7676        AND diffSkyfile.fault = 0

  • trunk/ippTools/share/magicdstool_todestreak.sql

    r20973 r23389  
    2626    AND magicDSFile.component = rawImfile.class_id
    2727WHERE
    28     magicDSRun.state = 'run'
     28    magicDSRun.state = 'new'
    2929    AND magicDSRun.stage = 'raw'
    3030    AND magicDSFile.component IS NULL
    … …  
    5757    AND magicDSFile.component = chipProcessedImfile.class_id
    5858WHERE
    59     magicDSRun.state = 'run'
     59    magicDSRun.state = 'new'
    6060    AND magicDSRun.stage = 'chip'
    6161    AND chipRun.state = 'full'
    … …  
    9191    AND magicDSFile.component = warpSkyfile.skycell_id
    9292WHERE
    93     magicDSRun.state = 'run'
     93    magicDSRun.state = 'new'
    9494    AND magicDSRun.stage = 'warp'
    9595    AND warpRun.state = 'full'
    … …  
    127127    AND magicDSFile.component = diffSkyfile.skycell_id
    128128WHERE
    129     magicDSRun.state = 'run'
     129    magicDSRun.state = 'new'
    130130    AND magicDSRun.stage = 'diff'
    131131    AND diffSkyfile.fault = 0

  • trunk/ippTools/share/magictool_addmask.sql

    r18526 r23389  
    22    magicRun
    33SET
    4     state = 'stop'
     4    state = 'full'
    55WHERE
    6     state != 'stop'
     6    state != 'full'

  • trunk/ippTools/share/magictool_chipprocessedimfile.sql

    r20706 r23389  
    2626    chipRun.state = 'full'
    2727    AND chipProcessedImfile.fault = 0
    28 --   AND magicRun.state = 'stop'
     28--   AND magicRun.state = 'full'
    2929--   AND magicMask.fault = 0

  • trunk/ippTools/share/magictool_diffskyfile.sql

    r20701 r23389  
    2424    diffRun.state = 'full'
    2525    AND diffSkyfile.fault = 0
    26 --   AND magicRun.state = 'stop'
     26--   AND magicRun.state = 'full'
    2727--   AND magicMask.fault = 0

  • trunk/ippTools/share/magictool_inputskyfile.sql

    r20973 r23389  
    99    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    1010WHERE
    11     magicRun.state = 'run'
     11    magicRun.state = 'new'

  • trunk/ippTools/share/magictool_mask.sql

    r20735 r23389  
    66    USING(magic_id)
    77WHERE
    8     magicRun.state = 'stop'
     8    magicRun.state = 'full'
    99    AND magicMask.fault = 0

  • trunk/ippTools/share/magictool_rawimfile.sql

    r20706 r23389  
    2424WHERE
    2525    rawImfile.fault = 0
    26 --   AND magicRun.state = 'stop'
     26--   AND magicRun.state = 'full'
    2727--   AND magicMask.fault = 0

  • trunk/ippTools/share/magictool_tomask.sql

    r18781 r23389  
    1010LEFT JOIN magicNodeResult USING(magic_id, node)
    1111WHERE
    12     magicRun.state = 'run'
     12    magicRun.state = 'new'
    1313    AND magicNodeResult.node = 'root'
    1414    AND magicNodeResult.fault = 0

  • trunk/ippTools/share/magictool_toprocess_inputs.sql

    r21004 r23389  
    1919    AND magicTree.node = magicNodeResult.node
    2020WHERE
    21     magicRun.state = 'run'
     21    magicRun.state = 'new'
    2222    AND magicNodeResult.magic_id IS NULL
    2323    AND magicNodeResult.node IS NULL

  • trunk/ippTools/share/magictool_toprocess_tree.sql

    r21099 r23389  
    1515    AND magicTree.node = magicNodeResult.node
    1616WHERE
    17     magicRun.state = 'run'
     17    magicRun.state = 'new'
    1818    -- where hook %s
    1919ORDER BY

  • trunk/ippTools/share/magictool_toskyfilemask.sql

    r15348 r23389  
    77    USING(magic_id)
    88WHERE
    9     magicRun.state = 'run'
     9    magicRun.state = 'new'
    1010    AND magicSkyfileMask.magic_id IS NULL

  • trunk/ippTools/share/magictool_totree.sql

    r20474 r23389  
    1212    USING(magic_id)
    1313WHERE
    14     magicRun.state = 'run'
     14    magicRun.state = 'new'
    1515    AND magicTree.node IS NULL
    1616    AND magicRun.fault = 0

  • trunk/ippTools/share/magictool_warpskyfile.sql

    r20701 r23389  
    2121    warpRun.state = 'full'
    2222    AND warpSkyfile.fault = 0
    23 --   AND magicRun.state = 'stop'
     23--   AND magicRun.state = 'full'
    2424--   AND magicMask.fault = 0

  • trunk/ippTools/src/magicdstool.c

    r21433 r23389  
    242242
    243243        // create a new magicRun for this group
    244         magicRunRow *run = magicRunRowAlloc(0, exp_id, "run", workdir, "dirty", label, dvodb, registered, 0);
     244        magicRunRow *run = magicRunRowAlloc(0, exp_id, "new", workdir, "dirty", label, dvodb, registered, 0);
    245245        if (!run) {
    246246            psAbort("failed to alloc magicRun object");
    … …  
    320320    PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false);
    321321    PXOPT_LOOKUP_STR(outroot, config->args, "-outroot", true, false);
     322
     323    // optional
    322324    PXOPT_LOOKUP_STR(recoveryroot, config->args, "-recoveryroot", false, false);
    323325    PXOPT_LOOKUP_BOOL(re_place, config->args, "-replace", false);
    324326    PXOPT_LOOKUP_BOOL(remove, config->args, "-remove", false);
    325 
    326     // optional
    327327    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     328    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
    328329
    329330    psS64 stage_id = 0, cam_id = 0;
    … …  
    337338            0,          // ID
    338339            magic_id,
    339             "run",      // state
     340            "new",      // state
    340341            stage,
    341342            stage_id,
    342343            cam_id,
     344            label,
    343345            outroot,
    344346            recoveryroot,
    … …  
    396398    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
    397399    PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
    398 //    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
     400    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
    399401
    400402    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    685687        psS64 magic_ds_id = psMetadataLookupS64(NULL, row, "magic_ds_id");
    686688
    687         // set magicDSRun.state to 'stop'
    688         if (!setmagicDSRunState(config, magic_ds_id, "stop")) {
     689        // set magicDSRun.state to 'full'
     690        if (!setmagicDSRunState(config, magic_ds_id, "full")) {
    689691            psError(PS_ERR_UNKNOWN, false, "failed to change magicDSRun.state for magic_ds_id: %" PRId64,
    690692                magic_ds_id);
    … …  
    795797    // check that state is a valid string value
    796798    if (!(
    797             (strncmp(state, "run", 4) == 0)
    798             || (strncmp(state, "stop", 5) == 0)
     799            (strncmp(state, "new", 4) == 0)
     800            || (strncmp(state, "full", 5) == 0)
    799801        )
    800802    ) {

  • trunk/ippTools/src/magicdstoolConfig.c

    r21433 r23389  
    7070    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-replace", 0, "use the simple output format", false);
    7171    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-remove", 0, "use the simple output format", false);
    72 //    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL);
     72    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL);
    7373    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
    7474
    … …  
    8888    psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0);
    8989    psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0);
    90 //    psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0);
     90    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL);
    9191    psMetadataAddU64(todestreakArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
    9292    psMetadataAddBool(todestreakArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);

  • trunk/ippTools/src/magictool.c

    r21402 r23389  
    217217
    218218        // create a new magicRun for this group
    219         magicRunRow *run = magicRunRowAlloc(0, exp_id, diff_id, "run", workdir, "dirty", label, dvodb, registered, 0);
     219        magicRunRow *run = magicRunRowAlloc(0, exp_id, diff_id, "new", workdir, "dirty", label, dvodb, registered, 0);
    220220        if (!run) {
    221221            psAbort("failed to alloc magicRun object");
    … …  
    538538
    539539    if (code > 0) {
    540         char *query = "UPDATE magicRun SET fault = %d, state = 'stop' WHERE magic_id = %" PRId64;
     540        char *query = "UPDATE magicRun SET fault = %d, state = 'full' WHERE magic_id = %" PRId64;
    541541        if (!p_psDBRunQueryF(config->dbh, query, code, magic_id)) {
    542542            psError(PS_ERR_UNKNOWN, false,
    … …  
    10881088    }
    10891089
    1090     // Set to "run"
     1090    // Set to "new"
    10911091    {
    10921092        psString query = psStringCopy("UPDATE magicRun JOIN magicMask USING(magic_id) "
    1093                                       "SET magicRun.state = 'run' WHERE magicMask.fault != 0");
     1093                                      "SET magicRun.state = 'new' WHERE magicMask.fault != 0");
    10941094
    10951095        if (psListLength(where->list)) {
    … …  
    14811481    // check that state is a valid string value
    14821482    if (!(
    1483             (strncmp(state, "run", 4) == 0)
    1484             || (strncmp(state, "stop", 5) == 0)
     1483            (strncmp(state, "new", 4) == 0)
     1484            || (strncmp(state, "full", 5) == 0)
    14851485            || (strncmp(state, "reg", 4) == 0)
    14861486        )
Note: See TracChangeset for help on using the changeset viewer.