IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35789 for trunk/ippTools


Ignore:
Timestamp:
Jul 10, 2013, 12:08:57 PM (13 years ago)
Author:
bills
Message:

add chipRun.update_mode. If set do not use the config dump
file when regenerating images using update

Location:
trunk/ippTools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/chiptool_change_exp_state.sql

    r33245 r35789  
    55UPDATE chipRun
    66JOIN rawExp using(exp_id)
    7     SET chipRun.state = '%s'
     7    SET chipRun.state = '%s', chipRun.update_mode = 0
    88    -- set magicked hook %s
    99    WHERE

  • trunk/ippTools/share/chiptool_completely_processed_exp.sql

    r26567 r35789  
    1515    end_stage,
    1616    imfile_magicked as magicked,
     17    0 as update_mode,
    1718    note
    1819FROM

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r35770 r35789  
    1 eREATE TABLE dbversion (
     1CREATE TABLE dbversion (
    22    schema_version VARCHAR(64),
    33    updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP
    … …  
    299299    maskfrac_magic FLOAT,
    300300    maskfrac_advisory FLOAT,
     301    update_mode SMALLINT DEFAULT 0,
    301302    note VARCHAR(255),
    302303    PRIMARY KEY(chip_id),

  • trunk/ippTools/share/pxadmin_drop_tables.sql

    r35227 r35789  
    115115DROP TABLE IF EXISTS survey;
    116116DROP TABLE IF EXISTS lapGroup;
     117DROP TABLE IF EXISTS mergedvodbCopy;
     118DROP TABLE IF EXISTS mergedvodbProcessed;
     119DROP TABLE IF EXISTS mergedvodbRun;
    117120
    118121SET FOREIGN_KEY_CHECKS=1

  • trunk/ippTools/src/chiptool.c

    r35691 r35789  
    20182018    PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", false, false);
    20192019    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
     2020    PXOPT_LOOKUP_S16(update_mode, config->args, "-set_update_mode", false, false);
    20202021
    20212022    psString query = pxDataGet("chiptool_setimfiletoupdate.sql");
    … …  
    20292030        psStringAppend(&setHook, "\n , chipRun.label = '%s'", label);
    20302031    }
     2032    // always set update_mode. If user has not supplied it zero is the right answer.
     2033    psStringAppend(&setHook, "\n, chipRun.update_mode = %d", update_mode);
    20312034
    20322035    if (class_id) {

  • trunk/ippTools/src/chiptoolConfig.c

    r35573 r35789  
    5252
    5353    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",  0,            "define workdir (required)", NULL);
    54     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label (required)", NULL);
     54    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,            "define label", NULL);
    5555    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction",  0,            "define reduction class", NULL);
    5656    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup",  0,            "define exposure group", NULL);
    … …  
    107107    psMetadataAddStr(setimfiletoupdateArgs, PS_LIST_TAIL, "-class_id", 0,  "search by class_id", NULL);
    108108    psMetadataAddStr(setimfiletoupdateArgs, PS_LIST_TAIL, "-set_label",  0,"new value for label", NULL);
     109    psMetadataAddS16(setimfiletoupdateArgs, PS_LIST_TAIL, "-set_update_mode",  0,"new value for update_mode", 0);
    109110
    110111    // -pendingimfile

  • trunk/ippTools/src/pxchip.c

    r33334 r35789  
    283283                       NAN,
    284284                       NAN,
     285            0,         // update_mode
    285286            note
    286287            )
Note: See TracChangeset for help on using the changeset viewer.