Changeset 16745 for trunk/ippScripts/scripts/ipp_serial_diff.pl

Timestamp:

Feb 28, 2008, 4:32:51 PM (18 years ago)

Author:

Paul Price

Message:

Provide script outroot instead of workdir.

File:

• trunk/ippScripts/scripts/ipp_serial_diff.pl (modified) (3 diffs)

trunk/ippScripts/scripts/ipp_serial_diff.pl

@@ -27 +27 @@
 my ($dbname,                    # Database name to use
     $verbose,                   # Verbose operations?
+    $workdir_global,            # Global working directory
     $no_op,                     # No operations?
     $no_update,                 # No updating?
@@ -33 +34 @@
            'dbname=s' => \$dbname,
            'verbose' => \$verbose,
+           'workdir' => \$workdir_global,
            'no-op' => \$no_op,
            'no-update' => \$no_update,
@@ -73 +75 @@
         my $workdir = $item->{workdir};
         
-        my $command = "$diff_skycell --diff_id $diff_id --dbname $dbname";
+        $workdir = $workdir_global unless defined $workdir and $workdir ne "NULL";
+        die "No working directory specified.\n" unless defined $workdir;
+        
+        my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.diff.$diff_id" );
+
+        my $command = "$diff_skycell --diff_id $diff_id --dbname $dbname --outroot $outroot";
         $command .= " --verbose" if defined $verbose;
         $command .= " --no-op" if defined $no_op;
         $command .= " --no-update" if defined $no_update;
-        $command .= " --workdir $workdir" if defined $workdir;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run( command => $command, verbose => 1 );
-###     die "Unable to do difference for $diff_id: $error_code\n" if not $success;
+        die "Unable to do difference for $diff_id: $error_code\n" if not $success;
     }
 }