Changeset 12056 for trunk/ippScripts/scripts/diff_skycell.pl

Timestamp:

Feb 26, 2007, 11:57:00 AM (19 years ago)

Author:

Paul Price

Message:

Don't need --camera from the command line because it can come through the query.

File:

• trunk/ippScripts/scripts/diff_skycell.pl (modified) (4 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -37 +37 @@
 GetOptions(
     'diff_id|d=s'       => \$diff_id, # Diff identifier
-    'camera|c=s'        => \$camera, # Camera name
     'dbname|d=s'        => \$dbname, # Database name
     'workdir|w=s'       => \$workdir,   # Working directory, for output files
@@ -46 +45 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --diff_id --camera",
+    -msg => "Required options: --diff_id",
     -exitval => 3,
-) unless defined $diff_id
-    and defined $camera;
-
-$ipprc->define_camera($camera);
+          ) unless defined $diff_id;
 
 # Look for programs we need
@@ -88 +84 @@
 my $template;                   # Template file
 my $skycell_id;                 # Skycell identifier
+my $camera;                     # Camera
 foreach my $file (@$files) {
     my $uri = $ipprc->convert_filename_absolute( $file->{uri} ); # URI for file
@@ -101 +98 @@
         $skycell_id = $file->{skycell_id};
     }
+    if (defined $camera) {
+        &my_die("Cameras don't match", $diff_id, $PS_EXIT_SYS_ERROR) unless $file->{camera} eq $camera;
+    } else {
+        $camera = $file->{camera};
+    }
 }
 
 &my_die("Unable to identify template", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $template;
 &my_die("Unable to identify input", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $input;
+$ipprc->define_camera($camera);
 
 ### Working directory