IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 13997


Ignore:
Timestamp:
Jul 2, 2007, 4:29:59 PM (19 years ago)
Author:
jhoblitt
Message:

rename chipPendingImfile table -> chipInputImfile

Location:
branches/backtrack
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/backtrack/dbconfig/cam.md

    r13994 r13997  
    1 # imfiles is not here... is it needed?
    2 
    31camRun METADATA
    42    cam_id      S64         0       # Primary Key AUTO_INCREMENT

  • branches/backtrack/dbconfig/chip.md

    r13992 r13997  
    1 # do we need nclass?
    2 # class is missing
     1#
     2#  We are dependant on the assumption that there is only ever one exp_tag in a
     3#  chipRun although the database does not enforce this.
     4#
    35
    46chipRun METADATA
    … …  
    1315END
    1416
    15 # uris in & out ?
    16 
    17 chipPendingImfile METADATA
     17chipInputImfile METADATA
    1818    chip_id     S64         0       # Primary Key fkey (chip_id) ref chipRun(chip_id)
    1919    exp_tag     STR         64      # Primary Key fkey (exp_tag, class_id) ref rawImfile (exp_tag, class_id)
    2020    class_id    STR         64      # Primary Key
    2121END
    22 
    23 # nclass & ndone?
    24 # and/or logging imfile done better?
    25 
    26 chipMask METADATA
    27     label       STR         64      # Primary Key
    28 END
    29 
    30 # uris in & out ?
    31 # state?
    3222
    3323chipProcessedImfile METADATA
    … …  
    5747    fault           S16     0       # Key NOT NULL
    5848END
     49
     50chipMask METADATA
     51    label       STR         64      # Primary Key
     52END

  • branches/backtrack/ippTools/share/chiptool_completely_processed_exp.sql

    r13994 r13997  
    1515        chipProcessedImfile.class_id
    1616    FROM chipRun
    17     JOIN chipPendingImfile
     17    JOIN chipInputImfile
    1818        USING(chip_id)
    1919    JOIN rawExp
    20         ON chipPendingImfile.exp_tag = rawExp.exp_tag
     20        ON chipInputImfile.exp_tag = rawExp.exp_tag
    2121    JOIN chipProcessedImfile
    22         ON chipPendingImfile.chip_id = chipProcessedImfile.chip_id
    23         AND chipPendingImfile.exp_tag = chipProcessedImfile.exp_tag
    24         AND chipPendingImfile.class_id = chipProcessedImfile.class_id
     22        ON chipInputImfile.chip_id = chipProcessedImfile.chip_id
     23        AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag
     24        AND chipInputImfile.class_id = chipProcessedImfile.class_id
    2525    WHERE
    2626        chipRun.state = 'run'
    2727        AND chipProcessedImfile.fault = 0
    2828    GROUP BY
    29         chipPendingImfile.chip_id,
    30         chipPendingImfile.exp_tag
     29        chipInputImfile.chip_id,
     30        chipInputImfile.exp_tag
    3131    HAVING rawExp.imfiles = COUNT(chipProcessedImfile.class_id)) as Foo

  • branches/backtrack/ippTools/share/chiptool_find_unprocessed_imfile.pl

    r12174 r13997  
    11SELECT DISTINCT
    2    chipPendingImfile.*
    3 FROM chipPendingImfile
     2   chipInputImfile.*
     3FROM chipInputImfile
    44LEFT JOIN chipProcessedImfile
    55    USING(chip_id, class_id)

  • branches/backtrack/ippTools/share/chiptool_pendingimfile.sql

    r13990 r13997  
    11SELECT
    22    chipRun.*,
    3     chipPendingImfile.exp_tag,
    4     chipPendingImfile.class_id,
     3    chipInputImfile.exp_tag,
     4    chipInputImfile.class_id,
    55    rawImfile.uri,
    66    rawExp.exp_id,
    … …  
    99    rawExp.filelevel
    1010FROM chipRun
    11 JOIN chipPendingImfile
     11JOIN chipInputImfile
    1212    USING(chip_id)
    1313LEFT JOIN chipProcessedImfile
    14     ON chipPendingImfile.chip_id = chipProcessedImfile.chip_id
    15     AND chipPendingImfile.exp_tag = chipProcessedImfile.exp_tag
    16     AND chipPendingImfile.class_id = chipProcessedImfile.class_id
     14    ON chipInputImfile.chip_id = chipProcessedImfile.chip_id
     15    AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag
     16    AND chipInputImfile.class_id = chipProcessedImfile.class_id
    1717JOIN rawImfile
    18     ON chipPendingImfile.exp_tag = rawImfile.exp_tag
    19     AND chipPendingImfile.class_id = rawImfile.class_id
     18    ON chipInputImfile.exp_tag = rawImfile.exp_tag
     19    AND chipInputImfile.class_id = rawImfile.class_id
    2020JOIN rawExp
    2121    ON rawImfile.exp_tag = rawExp.exp_tag

  • branches/backtrack/ippTools/share/chiptool_queuerawimfile.sql

    r13990 r13997  
    1 INSERT INTO chipPendingImfile
     1INSERT INTO chipInputImfile
    22    SELECT
    33        LAST_INSERT_ID(),

  • branches/backtrack/ippTools/src/chiptool.c

    r13996 r13997  
    282282
    283283    if (config->where) {
    284         psString whereClause = psDBGenerateWhereConditionSQL(config->where, "chipPendingImfile");
     284        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "chipInputImfile");
    285285        psStringAppend(&query, " AND %s", whereClause);
    286286        psFree(whereClause);
    … …  
    329329
    330330    // negative simple so the default is true
    331     if (!ippdbPrintMetadatas(stdout, output, "chipPendingImfile", !simple)) {
     331    if (!ippdbPrintMetadatas(stdout, output, "chipInputImfile", !simple)) {
    332332        psError(PS_ERR_UNKNOWN, false, "failed to print array");
    333333        psFree(output);

  • branches/backtrack/ippTools/src/pxchip.c

    r13996 r13997  
    9696#endif
    9797
    98     // populate the chipPendingImfile table from rawImfile based on exp_tag,
     98    // populate the chipInputImfile table from rawImfile based on exp_tag,
    9999    // where the coresponding newExp.state entry is set to stop
    100100    psString query = pxDataGetCached("chiptool_queuerawimfile.sql");

  • branches/backtrack/ippTools/src/pxtables.c

    r13994 r13997  
    6161    CREATE_TABLE(guidePendingExpCreateTable);
    6262    CREATE_TABLE(chipRunCreateTable);
    63     CREATE_TABLE(chipPendingImfileCreateTable);
     63    CREATE_TABLE(chipInputImfileCreateTable);
    6464    CREATE_TABLE(chipProcessedImfileCreateTable);
    6565    CREATE_TABLE(chipMaskCreateTable);
    … …  
    142142    DROP_TABLE(guidePendingExpDropTable);
    143143    DROP_TABLE(chipRunDropTable);
    144     DROP_TABLE(chipPendingImfileDropTable);
     144    DROP_TABLE(chipInputImfileDropTable);
    145145    DROP_TABLE(chipProcessedImfileDropTable);
    146146    DROP_TABLE(chipMaskDropTable);

  • branches/backtrack/ippTools/src/regtool.c

    r13996 r13997  
    4444// static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp);
    4545//static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp);
    46 //static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile);
     46//static chipInputImfileRow *rawImfileTochipInputImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile);
    4747
    4848static rawExpRow *newToRawExp(pxConfig *config, newExpRow *exp);
    … …  
    822822
    823823
    824 static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile)
    825 {
    826     return chipPendingImfileRowAlloc(
     824static chipInputImfileRow *rawImfileTochipInputImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile)
     825{
     826    return chipInputImfileRowAlloc(
    827827            chip_id,
    828828            rawImfile->class_id,
Note: See TracChangeset for help on using the changeset viewer.