Changeset 13663

Timestamp:

Jun 5, 2007, 3:50:47 PM (19 years ago)

Author:

Paul Price

Message:

Using ppSub instead of pois.

File:

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

trunk/ippScripts/scripts/diff_skycell.pl

@@ -30 +30 @@
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
 
-use constant POIS_OPTIONS => '-v -B 1000';
-
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
@@ -53 +51 @@
 my $missing_tools;
 my $difftool = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1);
-my $pois = can_run('pois') or (warn "Can't find pois" and $missing_tools = 1);
+my $ppSub = can_run('ppSub') or (warn "Can't find ppSub" and $missing_tools = 1);
 if ($missing_tools) { 
     warn("Can't find required tools.");
@@ -135 +133 @@
 my $stats = PS::IPP::Metadata::Stats->new(); # Stats parser
 unless ($no_op) {
-    my $command = "$pois " . POIS_OPTIONS() . " $templateResolved $inputResolved $outputNameResolved"; # Command to run pois
+    my $command = "$ppSub $input $template $outputName"; # Command to run ppSub
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -141 +139 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppImage: $error_code", $diff_id, $error_code);
+        &my_die("Unable to perform ppSub: $error_code", $diff_id, $error_code);
     }
     &my_die("Couldn't find expected output file: $outputName", $diff_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputName);
@@ -149 +147 @@
 
     # Get the statistics on the residual image
-    if (0) { ### Disabled because pois doesn't output stats yet
-        my $statsFile;          # File handle
-        open $statsFile, $ipprc->file_resolve($outputStats) or &my_die("Can't open statistics file $outputStats: $!", $diff_id, $PS_EXIT_SYS_ERROR);
-        my @contents = <$statsFile>; # Contents of file
-        close $statsFile;
-        my $metadata = $mdcParser->parse(join "", @contents) or
-            &my_die("Unable to parse metadata config doc", $diff_id, $PS_EXIT_PROG_ERROR);
-        $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $diff_id, $PS_EXIT_PROG_ERROR);
-    }
+    my $statsFile;              # File handle
+    open $statsFile, $ipprc->file_resolve($outputStats) or &my_die("Can't open statistics file $outputStats: $!", $diff_id, $PS_EXIT_SYS_ERROR);
+    my @contents = <$statsFile>; # Contents of file
+    close $statsFile;
+    my $metadata = $mdcParser->parse(join "", @contents) or
+        &my_die("Unable to parse metadata config doc", $diff_id, $PS_EXIT_PROG_ERROR);
+    $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $diff_id, $PS_EXIT_PROG_ERROR);
 }