Changeset 10419 for trunk/ippScripts/scripts/phase3.pl

Timestamp:

Dec 3, 2006, 8:42:44 AM (20 years ago)

Author:

eugene

Message:

added ipprc.convert_filename method, replaced workdir conversions with convert_filename

File:

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

trunk/ippScripts/scripts/phase3.pl

@@ -97 +97 @@
 # Generate the file list, and get the statistics
 my $outputRoot = $exp_tag . '.p3'; # Root output name
-$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
+$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
+$outputRoot = $ipprc->convert_filename ($outputRoot);
 my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
 my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
@@ -105 +106 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File (File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n");
-    print $list2File (File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n");
+    print $list1File ($ipprc->convert_filename ($file->{b1_uri}) . "\n");
+    print $list2File ($ipprc->convert_filename ($file->{b2_uri}) . "\n");
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -135 +136 @@
 
 # Add the result into the database
-$outputRoot = File::Spec->abs2rel( $outputRoot, $ipprc->workdir() );
-$jpeg1  = File::Spec->abs2rel( $jpeg1, $ipprc->workdir() );
-$jpeg2  = File::Spec->abs2rel( $jpeg2, $ipprc->workdir() );
+$outputRoot = $ipprc->convert_filename ($outputRoot);
+$jpeg1  = $ipprc->convert_filename ($jpeg1);
+$jpeg2  = $ipprc->convert_filename ($jpeg2);
 unless ($no_update) {
     my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .