Changeset 24707

Timestamp:

Jul 7, 2009, 1:29:37 PM (17 years ago)

Author:

Paul Price

Message:

Name detection files published to datastore with output root name publish.PUB_ID.EXP_ID, after request from Larry to include 'FPA_ID' in the file name.

Location:

trunk

Files:

• ippScripts/scripts/publish_file.pl (modified) (3 diffs)
• ippTasks/publish.pro (modified) (2 diffs)
• ippTools/share/pubtool_pending.sql (modified) (2 diffs)

trunk/ippScripts/scripts/publish_file.pl

@@ -39 +39 @@
 
 # Parse the command-line arguments
-my ( $pub_id, $camera, $stage, $stage_id, $format, $product, $workdir );
+my ( $pub_id, $exp_id, $camera, $stage, $stage_id, $format, $product, $workdir );
 my ( $dbname, $verbose, $no_update, $save_temps, $redirect );
 
 GetOptions(
     'pub_id=s'          => \$pub_id, # Publish identifier
+    'exp_id=s'          => \$exp_id, # Exposure identifier
     'camera=s'          => \$camera, # Camera name
     'stage=s'           => \$stage,       # Stage of interest
@@ -57 +58 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --pub_id --camera --stage --stage_id --product --workdir",
+pod2usage( -msg => "Required options: --pub_id --exp_id --camera --stage --stage_id --product --workdir",
            -exitval => $PS_EXIT_CONFIG_ERROR) unless
     defined $pub_id and
+    defined $exp_id and
     defined $camera and
     defined $product and
@@ -66 +68 @@
     defined $workdir;
 
-my $outroot = "$workdir/$product.$pub_id"; # Output root name
+my $outroot = "$workdir/$product.$pub_id.$exp_id"; # Output root name
 
 my $ipprc = PS::IPP::Config->new( $camera ) or

trunk/ippTasks/publish.pro

@@ -161 +161 @@
     book getword publishRun $pageName stage -var STAGE
     book getword publishRun $pageName stage_id -var STAGE_ID
+    book getword publishRun $pageName exp_id -var EXP_ID
     book getword publishRun $pageName dbname -var DBNAME
 
@@ -169 +170 @@
     strsub $WORKDIR_TEMPLATE @HOST@ $default_host -var WORKDIR
 
-    $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
+    $run = publish_file.pl --pub_id $PUB_ID --exp_id $EXP_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
     add_standard_args run
 

trunk/ippTools/share/pubtool_pending.sql

@@ -10 +10 @@
         publishClient.workdir,
         diffRun.diff_id AS stage_id,
-        rawExp.camera
+        rawExp.camera,
+        rawExp.exp_id
     FROM publishRun
     JOIN publishClient USING(client_id)
@@ -33 +34 @@
         publishClient.workdir,
         camRun.cam_id AS stage_id,
-        rawExp.camera
+        rawExp.camera,
+        rawExp.exp_id
     FROM publishRun
     JOIN publishClient USING(client_id)