IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 29962


Ignore:
Timestamp:
Dec 6, 2010, 3:00:09 PM (15 years ago)
Author:
Serge CHASTEL
Message:

ppMops -version flag supported

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/dbconfig/publish.md

    r27028 r29962  
    99    workdir      STR         255
    1010    comment      STR         255
     11    name         STR         64
     12    output_format S16        0
    1113END             
    1214                 

  • trunk/ippScripts/scripts/publish_file.pl

    r29622 r29962  
    4444my ( $pub_id, $camera, $stage, $stage_id, $fileset, $format, $product, $workdir );
    4545my ( $dbname, $verbose, $no_update, $no_op, $save_temps, $redirect );
     46my ( $output_format );
    4647
    4748GetOptions(
    … …  
    5960    'save-temps'        => \$save_temps, # Save temporary files?
    6061    'redirect-output'   => \$redirect,   # Redirect output to log file?
     62    'output_format'        => \$output_format, # Output format for ppMops
    6163    ) or pod2usage( 2 );
    6264
    … …  
    335337    $command .= " -zp_error " . $data->{zp_err} if defined $data->{zp_err};
    336338    $command .= " -astrom_rms " . $data->{astrom} if defined $data->{astrom};
     339    $command .= " -version " . $data->{output_format} if defined $data->{output_format};
    337340
    338341    unless ($no_op) {

  • trunk/ippTasks/publish.pro

    r29724 r29962  
    130130    book getword publishRun $pageName stage_id -var STAGE_ID
    131131    book getword publishRun $pageName dbname -var DBNAME
     132    book getword publishRun $pageName output_format -var OUTPUT_FORMAT
    132133
    133134    stdout $LOGDIR/publish.run.log
    … …  
    137138    strsub $WORKDIR_TEMPLATE @HOST@ $default_host -var WORKDIR
    138139
    139     $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
     140    $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --output_format $OUTPUT_FORMAT --redirect-output
    140141    add_standard_args run
    141142

  • trunk/ippTools/share/pubtool_definerun.sql

    r28428 r29962  
    33    client_id,
    44    stage_id,
    5     src_label
     5    src_label,
     6    output_format
    67FROM (
    78    -- Get diffs to publish
    … …  
    910        client_id,
    1011        diff_id AS stage_id,
    11         diffRun.label AS src_label
     12        diffRun.label AS src_label,
     13        output_format
    1214    FROM publishClient
    1315    JOIN diffRun
    … …  
    2830        client_id,
    2931        cam_id AS stage_id,
    30         camRun.label AS src_label
     32        camRun.label AS src_label,
     33        output_format
    3134    FROM publishClient
    3235    JOIN camRun
    … …  
    4346        client_id,
    4447        diff_phot_id AS stage_id,
    45         diffPhotRun.label AS src_label
     48        diffPhotRun.label AS src_label,
     49        output_format
    4650    FROM publishClient
    4751    JOIN diffPhotRun

  • trunk/ippTools/share/pubtool_pending.sql

    r28491 r29962  
    99        publishClient.stage,
    1010        publishClient.workdir,
     11        publishClient.output_format,
    1112        diffRun.diff_id AS stage_id,
    1213        rawExp.camera,
    … …  
    3536        publishClient.stage,
    3637        publishClient.workdir,
     38        publishClient.output_format,
    3739        camRun.cam_id AS stage_id,
    3840        rawExp.camera,
    … …  
    5658        publishClient.stage,
    5759        publishClient.workdir,
     60        publishClient.output_format,
    5861        diffPhotRun.diff_phot_id AS stage_id,
    5962        rawExp.camera,

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r29923 r29962  
    16431643    workdir VARCHAR(255) NOT NULL, -- working directory
    16441644    comment VARCHAR(255),            -- for human memory
    1645     PRIMARY KEY(client_id)
     1645    name varchar(64) default NULL, -- unique client_id verbose identifier
     1646    output_format SMALLINT NOT NULL default 1, -- format output versioning
     1647    PRIMARY KEY(client_id),
     1648    UNIQUE KEY name (name)
    16461649) ENGINE=innodb DEFAULT CHARSET=latin1;
    16471650

  • trunk/ippTools/src/pubtool.c

    r29321 r29962  
    9696    PXOPT_LOOKUP_STR(comment, config->args, "-comment",  false, false);
    9797    PXOPT_LOOKUP_BOOL(unmagicked, config->args, "-unmagicked",  false);
    98 
    99     if (!publishClientInsert(config->dbh, 0, 0, product, stage, !unmagicked, workdir, comment)) {
     98    PXOPT_LOOKUP_STR(name, config->args, "-name",  false, false);
     99    PXOPT_LOOKUP_S16(output_format, config->args, "-output_format",  false, false);
     100
     101    if (!publishClientInsert(config->dbh, 0, 0, product, stage, !unmagicked, workdir, comment, name, output_format)) {
    100102        psError(PS_ERR_UNKNOWN, false, "Database error");
    101103        return false;
    … …  
    313315    PXOPT_COPY_STR(config->args, where, "-stage", "publishClient.stage", "==");
    314316    PXOPT_COPY_STR(config->args, where, "-comment", "publishClient.comment", "LIKE");
     317    PXOPT_COPY_STR(config->args, where, "-name", "publishClient.name", "LIKE");
    315318    pxAddLabelSearchArgs(config, where, "-label", "publishRun.label", "==");
    316319

  • trunk/ippTools/src/pubtoolConfig.c

    r28371 r29962  
    8383    psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple",  0, "use simple output format?", false);
    8484    psMetadataAddU64(pendingArgs, PS_LIST_TAIL, "-limit",  0, "limit result set", 0);
     85    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-name", 0, "search on client name", NULL);
    8586
    8687    // -add
Note: See TracChangeset for help on using the changeset viewer.