Changeset 16336 for trunk/ippScripts/scripts/ipp_serial_chip.pl

Timestamp:

Feb 6, 2008, 9:52:57 AM (18 years ago)

Author:

Paul Price

Message:

Adding outroot instead of workdir for chip and camera; adding verbose flags.

File:

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

trunk/ippScripts/scripts/ipp_serial_chip.pl

@@ -13 +13 @@
 
 my ($dbname,                    # Database name to use
+    $workdir_default,           # Default working directory
+    $verbose,                   # Verbose operations?
     $no_op,                     # No operations?
     $no_update,                 # No updating?
     );
 GetOptions(
-           'dbname|d=s' => \$dbname,
+           'dbname=s' => \$dbname,
+           'workdir=s' => \$workdir_default,
+           'verbose' => \$verbose,
            'no-op' => \$no_op,
            'no-update' => \$no_update,
 ) or pod2usage( 2 );
 
-pod2usage(
-          -msg => "Required options: --dbname",
-          -exitval => 3,
-          ) unless defined $dbname;
+pod2usage( -msg => "Required options: --dbname --workdir",
+           -exitval => 3,
+           ) unless
+    defined $dbname;
+
+$workdir_default = `pwd` unless defined $workdir_default;
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Metadata config parser
@@ -35 +41 @@
 die "Can't find required tools.\n" if $missing_tools;
 
-# Phase 2 imfile processing
+# Imfile processing
 my @whole;                      # The whole list for processing
 {
@@ -65 +71 @@
             my $reduction = $item->{reduction};
             my $workdir = $item->{workdir};
-            
-            my $command = "$chip --chip_id $chip_id --exp_id $exp_id --exp_tag $exp_tag --class_id $class_id --uri $uri --dbname $dbname --camera $camera";
+            $workdir = $workdir_default unless (defined $workdir or $workdir ne "NULL");
+
+            my $outroot = $workdir . '/' . ${exp_tag} . '/' . ${exp_tag} . '.ch.' . ${chip_id};
+
+            my $command = "$chip --chip_id $chip_id --exp_id $exp_id --exp_tag $exp_tag --class_id $class_id --uri $uri --dbname $dbname --camera $camera --outroot $outroot";
             $command .= " --reduction $reduction" if defined $reduction;
+            $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 and $workdir ne "NULL";
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                 run( command => $command, verbose => 1 );