Changeset 24447

Timestamp:

Jun 16, 2009, 3:00:31 PM (17 years ago)

Author:

Paul Price

Message:

Fix commands.
Need camera to be supplied.

File:

• branches/pap_mops/ippScripts/scripts/publish_file.pl (modified) (5 diffs)

branches/pap_mops/ippScripts/scripts/publish_file.pl

@@ -44 +44 @@
 GetOptions(
     'pub_id=s'          => \$pub_id, # Publish identifier
+    'camera=s'          => \$camera, # Camera name
     'stage=s'           => \$stage,       # Stage of interest
     'stage_id=s'        => \$stage_id,    # Stage identifier
@@ -65 +66 @@
 my $outroot = "$workdir/$product.$pub_id"; # Output root name
 
-my $ipprc = PS::IPP::Config->new() or
+my $ipprc = PS::IPP::Config->new( $camera ) or
     &my_die( "Unable to set up", $pub_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
@@ -78 +79 @@
 
     if ($stage eq 'diff') {
-        $command =  "difftool -skyfile -diff_id $stage_id";
+        $command =  "difftool -diffskyfile -diff_id $stage_id";
     } elsif ($stage eq 'camera') {
         $command =  "camtool -processedexp -cam_id $stage_id";
@@ -84 +85 @@
         &my_die( "Unrecognised stage: $stage", $pub_id, $PS_EXIT_CONFIG_ERROR );
     }
+    $command .= " -dbname $dbname" if defined $dbname;
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -150 +152 @@
 unless ($no_update) {
     my $command = "$pubtool -add -pub_id $pub_id -path_base $outroot";
+    $command .= " -dbname $dbname" if defined $dbname;
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =