Changeset 33098 for branches/meh_branches/ppsub_test/pstamp/scripts/pstamp_job_run.pl

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

• . (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (5 diffs)

branches/meh_branches/ppsub_test/pstamp/scripts/pstamp_job_run.pl

@@ -59 +59 @@
 $options = 1 if !$options;
 
+# We don't need to muggle anymore. Ignore those options
+$options &=  ~($PSTAMP_REQUEST_UNCENSORED | $PSTAMP_REQUIRE_UNCENSORED);
 
 my $ipprc = PS::IPP::Config->new(); # IPP Configuration
@@ -88 +90 @@
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
+my $params = read_params_file($outputBase);
+
 my $jobStatus;
 if ($jobType eq "stamp") {
-    my $params = read_params_file($outputBase);
 
     my $argString;
@@ -107 +110 @@
         $nan_masked = 0;
         $muggle = 1;
+    }
+
+    if ($stage eq "raw") {
+        $options &= ~($PSTAMP_SELECT_MASK | $PSTAMP_SELECT_VARIANCE); 
     }
 
@@ -214 +221 @@
     }
 
+    # MAGIC IS DEAD
+    $nan_masked = 0;
+
     my $command = "$ppstamp $outputBase $argString $fileArgs";
     $command .= " -dbname $dbname" if $dbname;
@@ -272 +282 @@
 } elsif ($jobType eq "get_image") {
 
-    my $uri = "";
+    my $pstamp_bundle_root = metadataLookupStr($ipprc->{_siteConfig}, "PSTAMP_BUNDLE_ROOT");
+    my $imagedb = $params->{imagedb};
+
     my $command = "$pstamp_get_image_job --job_id $job_id --output_base $outputBase --rownum $rownum";
+    $command .= " --bundleroot $pstamp_bundle_root" if $pstamp_bundle_root;
+    $command .= " --imagedb $imagedb" if $imagedb;
     $command .= " --dbname $dbname" if $dbname;
     $command .= " --dbserver $dbserver" if $dbserver;