Changeset 10534 for trunk/ippScripts/scripts/phase2.pl

Timestamp:

Dec 7, 2006, 12:56:06 PM (19 years ago)

Author:

Paul Price

Message:

Convert back to relative paths when putting filenames into the database.

File:

• trunk/ippScripts/scripts/phase2.pl (modified) (2 diffs)

trunk/ippScripts/scripts/phase2.pl

@@ -53 +53 @@
 my $outputRoot =  $expTag . '.p2';
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
-$input = $ipprc->convert_filename ( $input );
-my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
-my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $classId);
-my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $classId);
+$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
+$input = $ipprc->convert_filename_absolute ( $input );
+my $outputImage = $ipprc->filename_absolute("PPIMAGE.OUTPUT", $outputRoot, $classId);
+my $outputBin1 = $ipprc->filename_absolute("PPIMAGE.BIN1", $outputRoot, $classId);
+my $outputBin2 = $ipprc->filename_absolute("PPIMAGE.BIN2", $outputRoot, $classId);
 my $outputStats = $outputRoot  . '.' . $classId . '.stats';
 
@@ -88 +88 @@
 
 # Add the processed file to the database
-$outputImage = $ipprc->convert_filename ( $outputImage);
-$outputBin1  = $ipprc->convert_filename ( $outputBin1 );
-$outputBin2  = $ipprc->convert_filename ( $outputBin2 );
+$outputImage = $ipprc->convert_filename_relative( $outputImage);
+$outputBin1  = $ipprc->convert_filename_relative( $outputBin1 );
+$outputBin2  = $ipprc->convert_filename_relative( $outputBin2 );
 unless ($no_update) {
     # Command to run dettool