IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27856


Ignore:
Timestamp:
May 4, 2010, 10:50:29 AM (16 years ago)
Author:
bills
Message:

Add table Label which through priority column may be used to order
items pending for processing.
Implement usage of this table in the pstamptool pending modes and
chiptool -pendingimfile.
Various other postage stamp changes including adding pstampDependent.outdir

Location:
trunk
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/dbconfig/changes.txt

    r27781 r27856  
    15951595ALTER TABLE pstampDependent ADD KEY (stage);
    15961596ALTER TABLE pstampDependent ADD KEY (stage_id);
     1597ALTER TABLE pstampDependent ADD KEY (component);
     1598ALTER TABLE pstampDependent ADD KEY (imagedb);
    15971599
    15981600ALTER TABLE magicDSRun ADD KEY(stage);
    … …  
    16021604ALTER TABLE distTarget ADD KEY(stage), ADD KEY(dist_group), ADD KEY(filter), ADD KEY(state);
    16031605
     1606CREATE TABLE Label (
     1607    label       VARCHAR(64),
     1608    priority    INT,
     1609    active      TINYINT,
     1610    comment     VARCHAR(80),
     1611    PRIMARY KEY(label),
     1612    KEY(priority),
     1613    KEY(active)
     1614) ENGINE=innodb DEFAULT CHARSET=latin1;
     1615

  • trunk/dbconfig/ipp.m4

    r26296 r27856  
    2121include(stack.md)
    2222include(det.md)
     23include(label.md)
    2324include(magic.md)
    2425include(calibration.md)

  • trunk/ippTools/share/chiptool_pendingimfile.sql

    r27738 r27856  
    1010    rawExp.camera,
    1111    rawExp.telescope,
    12     rawExp.filelevel
     12    rawExp.filelevel,
     13    IFNULL(Label.priority, 10000) AS priority
    1314FROM chipRun
    1415JOIN rawExp
    … …  
    2526LEFT JOIN chipMask
    2627    ON chipRun.label = chipMask.label
     28LEFT JOIN Label ON chipRun.label = Label.label
    2729WHERE
    2830    ((chipRun.state = 'new'
    … …  
    3537    AND chipProcessedImfile.data_state = 'update'
    3638    AND chipProcessedImfile.fault = 0))
     39    AND (Label.active OR Label.active IS NULL)

  • trunk/ippTools/share/pstamptool_completedreq.sql

    r25281 r27856  
    1 SELECT *
     1SELECT pstampRequest.* ,
     2    IFNULL(labels.priority, 0) AS priority
    23FROM pstampRequest
     4    LEFT JOIN labels USING(label)
    35WHERE state = 'run'
    46    AND (

  • trunk/ippTools/share/pstamptool_getdependent.sql

    r27795 r27856  
    11SELECT DISTINCT pstampDependent.*
    22FROM pstampDependent
    3 JOIN pstampJob USING(dep_id)
    4 JOIN pstampRequest USING(req_id)
     3-- JOIN pstampJob USING(dep_id)
     4-- JOIN pstampRequest USING(req_id)
    55WHERE pstampDependent.state = 'new'

  • trunk/ippTools/share/pstamptool_pendingdependent.sql

    r27795 r27856  
    1 SELECT DISTINCT pstampDependent.*
     1SELECT DISTINCT pstampDependent.*,
     2    IFNULL(Label.priority, 10000) AS priority
    23FROM pstampDependent
    34JOIN pstampJob USING(dep_id)
    45JOIN pstampRequest USING(req_id)
     6JOIN Label ON pstampRequest.label = Label.label
    57WHERE pstampDependent.state = 'new'
    68    AND pstampDependent.fault = 0
    79    AND pstampJob.state = 'run'
    810    AND pstampRequest.state = 'run'
     11    AND (Label.active OR Label.active IS NULL)

  • trunk/ippTools/share/pstamptool_pendingjob.sql

    r25793 r27856  
    1 SELECT pstampJob.*
     1SELECT pstampJob.*,
     2    IFNULL(Label.priority, 10000) AS priority
    23FROM pstampJob
    34    JOIN pstampRequest USING(req_id)
    45    LEFT JOIN pstampDependent USING(dep_id)
     6    LEFT JOIN Label ON pstampRequest.label = Label.label
    57WHERE pstampRequest.state = 'run'
    68    AND pstampRequest.fault = 0
    … …  
    810    AND pstampJob.fault = 0
    911    AND (dep_id = 0 OR pstampDependent.state = 'full')
     12    AND (Label.active OR Label.active IS NULL)

  • trunk/ippTools/share/pstamptool_pendingreq.sql

    r25199 r27856  
    11-- postage stamp requests ready for download and parsing
    22SELECT
    3  pstampRequest.*,
    4  pstampDataStore.outProduct as ds_outProduct
    5  FROM pstampRequest
    6  LEFT JOIN pstampDataStore
    7     USING(ds_id)
    8  WHERE pstampRequest.state = 'new'
     3    pstampRequest.*,
     4    pstampDataStore.outProduct AS ds_outProduct,
     5    IFNULL(Label.priority, 10000) AS priority
     6    FROM pstampRequest
     7    LEFT JOIN pstampDataStore USING(ds_id)
     8    LEFT JOIN Label ON pstampRequest.label = Label.label
     9WHERE pstampRequest.state = 'new'
    910    AND pstampRequest.fault = 0
     11    AND (Label.active OR Label.active IS NULL)

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r27781 r27856  
    13321332        imagedb    VARCHAR(64),
    13331333        rlabel     VARCHAR(64),
     1334        outdir     VARCHAR(255),
    13341335        need_magic TINYINT,
    13351336        PRIMARY KEY(dep_id),
    … …  
    15991600) ENGINE=innodb DEFAULT CHARSET=latin1;
    16001601
     1602CREATE TABLE Label (
     1603    label       VARCHAR(64),
     1604    priority    INT,
     1605    active      TINYINT,
     1606    comment     VARCHAR(80),
     1607    PRIMARY KEY(label),
     1608    KEY(priority),
     1609    KEY(active)
     1610) ENGINE=innodb DEFAULT CHARSET=latin1;
     1611
    16011612-- This comment line is here to avoid empty query error.
    16021613-- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

  • trunk/ippTools/share/pxadmin_drop_tables.sql

    r27765 r27856  
    8484DROP TABLE IF EXISTS staticskyResult;
    8585DROP TABLE IF EXISTS staticskyRun;
     86DROP TABLE IF EXISTS Label;
    8687
    8788SET FOREIGN_KEY_CHECKS=1

  • trunk/ippTools/src/pstamptool.c

    r27795 r27856  
    302302    psFree(where);
    303303
     304    psStringAppend(&query, " ORDER BY priority DESC, req_id");
     305
    304306    // treat limit == 0 as "no limit"
    305307    if (limit) {
    … …  
    421423    }
    422424    psFree(where);
     425
     426    psStringAppend(&query, " ORDER BY priority DESC, req_id");
    423427
    424428    // treat limit == 0 as "no limit"
    … …  
    705709    PXOPT_COPY_S64(config->args, where, "-job_id", "job_id", "==");
    706710    PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "==");
    707     pxAddLabelSearchArgs(config, where, "-label", "label", "LIKE");
     711    pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "LIKE");
    708712
    709713    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    723727    }
    724728    psFree(where);
     729
     730    psStringAppend(&query, " ORDER BY priority DESC, req_id");
    725731
    726732    // treat limit == 0 as "no limit"
    … …  
    968974    PXOPT_LOOKUP_STR(imagedb,     config->args, "-imagedb",  true, false);
    969975    PXOPT_LOOKUP_STR(rlabel,      config->args, "-rlabel",  true, false);
     976    PXOPT_LOOKUP_STR(outdir,      config->args, "-outdir",  true, false);
    970977    PXOPT_LOOKUP_BOOL(need_magic, config->args, "-need_magic", false);
    971978    PXOPT_LOOKUP_BOOL(no_create,  config->args, "-no_create", false);
    … …  
    10461053        rlabel,
    10471054        need_magic,
     1055        outdir,
    10481056        0               // fault
    10491057        )) {
    … …  
    10871095    PXOPT_COPY_STR(config->args, where, "-imagedb", "imagedb", "==");
    10881096    PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "==");
     1097    PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "==");
    10891098    PXOPT_COPY_STR(config->args, where, "-rlabel", "rlabel", "==");
    10901099    pxAddLabelSearchArgs(config, where, "-label", "pstampRequest.label", "==");
    … …  
    11051114    }
    11061115    psFree(where);
     1116
     1117    psStringAppend(&query, " ORDER BY priority DESC, req_id");
    11071118
    11081119    // treat limit == 0 as "no limit"

  • trunk/ippTools/src/pstamptoolConfig.c

    r27795 r27856  
    160160    // -getdependent
    161161    psMetadata *getdependentArgs = psMetadataAlloc();
    162     psMetadataAddS64(getdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define id for dependent (required)", 0);
     162    psMetadataAddS64(getdependentArgs, PS_LIST_TAIL, "-stage_id", 0, "define stage id for dependent (required)", 0);
    163163    psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-stage", 0,    "define stage for dependent (required)", NULL);
    164164    psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-component", 0, "define component for depenent (required)", NULL);
    … …  
    166166    psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-rlabel", 0,   "define label for dependent ", NULL);
    167167    psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-need_magic", 0, "define need_magic", false);
     168    psMetadataAddStr(getdependentArgs, PS_LIST_TAIL, "-outdir", 0,    "define output directory for dependent (required)", NULL);
    168169    psMetadataAddBool(getdependentArgs,PS_LIST_TAIL, "-no_create", 0, "if no matching dependent do not create one", false);
    169170
    … …  
    185186    psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-stage", 0,    "define stage for dependent", NULL);
    186187    psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-component", 0,    "define component for dependent", NULL);
     188    psMetadataAddS64(pendingdependentArgs, PS_LIST_TAIL, "-dep_id", 0, "define dep_id for dependent", 0);
    187189    psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK,   "define label for pstampRequest", NULL);
    188190    psMetadataAddStr(pendingdependentArgs, PS_LIST_TAIL, "-rlabel", 0,   "define label for dependent", NULL);
Note: See TracChangeset for help on using the changeset viewer.