Changeset 26044

Timestamp:

Nov 5, 2009, 10:22:11 AM (17 years ago)

Author:

bills

Message:

use a temporary file for output from dist_bundle.pl. stdout is too noisy

Location:

trunk/ippScripts/scripts

Files:

• dist_bundle.pl (modified) (3 diffs)
• dist_component.pl (modified) (3 diffs)

trunk/ippScripts/scripts/dist_bundle.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
-print "\n\n";
-print "Starting script $0 on $host\n\n";
+# print "\n\n";
+# print "Starting script $0 on $host\n\n";
 
 use vars qw( $VERSION );
@@ -60 +60 @@
 # Parse the command-line arguments
 my ($camera, $stage, $stage_id, $component, $path_base, $chip_path_base, $clean);
-my ($outdir, $run_state, $data_state, $magicked, $no_magic, $poor_quality);
+my ($outdir, $run_state, $data_state, $magicked, $no_magic, $poor_quality, $results_file);
 my ($dbname, $save_temps, $verbose, $no_update, $logfile);
 
 GetOptions(
+           'results_file=s' => \$results_file,     # camera for evaluating file rules
            'camera=s'       => \$camera,     # camera for evaluating file rules
            'stage=s'        => \$stage,      # raw, chip, warp, or diff
@@ -303 +304 @@
 }
 
-print "bundleResults MULTI\n\n";
-print "bundleResults METADATA\n";
-print "   name      STR    $file_name\n";
-print "   bytes     S64    $bytes\n";
-print "   md5sum    STR    $md5sum\n";
-print "END\n\n";
+if ($results_file) {
+    open RF, ">$results_file" or &my_die("unable to open results file $results_file", $component, $PS_EXIT_UNKNOWN_ERROR);
+    print RF "bundleResults MULTI\n\n";
+    print RF "bundleResults METADATA\n";
+    print RF "   name      STR    $file_name\n";
+    print RF "   bytes     S64    $bytes\n";
+    print RF "   md5sum    STR    $md5sum\n";
+    print RF "END\n\n";
+
+    close RF;
+}
 
 exit 0;

trunk/ippScripts/scripts/dist_component.pl

@@ -83 +83 @@
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
+my ($rf, $rf_name) = tempfile("/tmp/bundleresults.$dist_id.$component.XXXX", UNLINK => !$save_temps);
+close $rf;
+
 my ($file_name, $bytes, $md5sum);
 {
     my $command = "$dist_make_bundle --camera $camera --stage $stage --stage_id $stage_id";
+    $command .= " --results_file $rf_name";
     $command .= " --component $component --path_base $path_base --outdir $outdir";
     $command .= " --chip_path_base $chip_path_base" if $chip_path_base;
@@ -105 +109 @@
     }
 
-    # parse stdout_buf to get ($file_name, $bytes, $md5sum);
-    my $metadata = $mdcParser->parse (join "", @$stdout_buf) or
+    open $rf, "<$rf_name" or &my_die("failed to open results file $rf_name", $dist_id, $component, $PS_EXIT_UNKNOWN_ERROR);
+
+    my @lines = (<$rf>);
+
+    my $metadata = $mdcParser->parse (join "", @lines) or
         &my_die("Unable to parse metadata config doc", $dist_id, $component, $PS_EXIT_PROG_ERROR);
+
     my $results = parse_md_list($metadata);
 
@@ -114 +122 @@
         &my_die("Unexected number of results from dist_make_bundle.pl: $n", $dist_id, $component, $PS_EXIT_PROG_ERROR);
     }
+    my $result = $results->[0];
 
-    $file_name = $results->{name};
+    $file_name = $result->{name};
     &my_die("undefined file name from dist_bundle.pl", $dist_id, $component, $PS_EXIT_PROG_ERROR) unless defined $file_name;
 
-    $bytes = $results->{bytes};
+    $bytes = $result->{bytes};
     &my_die("undefined file size from dist_bundle.pl", $dist_id, $component, $PS_EXIT_PROG_ERROR) unless defined $bytes;
 
-    $md5sum = $results->{md5sum};
+    $md5sum = $result->{md5sum};
     &my_die("undefined file md5sum from dist_bundle.pl", $dist_id, $component, $PS_EXIT_PROG_ERROR) unless defined $md5sum;
 }