Changeset 26204 for trunk/pstamp/scripts/pstamp_get_image_job.pl

Timestamp:

Nov 19, 2009, 5:32:10 PM (16 years ago)

Author:

bills

Message:

change "params" file for get_image jobs to be mdc doc that contains "all" of
the data for the component. Various other changes.

File:

• trunk/pstamp/scripts/pstamp_get_image_job.pl (modified) (2 diffs)

trunk/pstamp/scripts/pstamp_get_image_job.pl

@@ -53 +53 @@
 die $err if $err;
 
-my $params_file = $output_base . ".params";
+my $params_file = $output_base . ".mdc";
 if (! open(INPUT, "<$params_file") ) {
     die("failed to open params file: $params_file");
 }
 
+my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
+
 my $params = join "", (<INPUT>);
 
-print STDERR "\nparams is $params\n";
+my $data = $mdcParser->parse($params) or die("failed to parse metadata config doc");
+my $components = parse_md_list($data);
+my $n = scalar @$components;
+if ($n != 1) {
+    die("params file $params_file contains unexpected number of components: $n");
+}
+my $comp = $components->[0];
+my $stage = $comp->{stage};
+my $stage_id = $comp->{stage_id};
+my $component = $comp->{component};
+my $path_base = $comp->{path_base};
+my $camera = $comp->{camera};
+my $magicked = $comp->{magicked};
 
-my ($stage, $stage_id, $component, $path_base, $camera) = split " ", $params;
-if (!$camera or !$path_base or !$component or !$stage_id or !$stage) {
-   die "failed to parse params: $params";
+if ($verbose) {
+    print STDERR "\nstage is $stage\n";
+    print STDERR "stage_id is $stage_id\n";
+    print STDERR "path_base is $path_base\n";
+    print STDERR "path_base is $path_base\n";
+    print STDERR "CAMERA is $camera\n";
+    print STDERR "magicked is " . (defined $magicked ? $magicked : "undefined") . "\n";
 }
 
-print STDERR "\nCAMERA is $camera\n";
+if (!$camera or !$path_base or !$component or !$stage_id or !$stage) {
+       die "failed to parse params from: $params_file";
+}
+
 
 my $out_dir = dirname($output_base);
-my $prefix = basename($output_base);
+my $prefix = basename($output_base) . "_";
 my $results_file = $output_base . ".bundle_results";
 
@@ -86 +107 @@
     $command .= " --path_base $path_base --outdir $out_dir --results_file $results_file";
     $command .= " --prefix $prefix";
-    # ignore magic for now
-    $command .= " --no_magic";
-
+    $command .= " --magicked" if $magicked;
     $command .= " --dbname $dbname" if $dbname;
+    $command .= " --verbose" if $verbose;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);