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

Timestamp:

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

Author:

eugene

Message:

added ipprc.convert_filename method, replaced workdir conversions with convert_filename

File:

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

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -59 +59 @@
 
 my ($vol, $dir, $file) = File::Spec->splitpath( $input );
-$input = File::Spec->rel2abs( $input, $ipprc->workdir() );
+$input = $ipprc->convert_filename ( $input );
 
 # Output name
 my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # 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 $output = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
@@ -99 +100 @@
 
 # Update the database
-$output = File::Spec->abs2rel( $output, $ipprc->workdir() );
-$b1name = File::Spec->abs2rel( $b1name, $ipprc->workdir() );
-$b2name = File::Spec->abs2rel( $b2name, $ipprc->workdir() );
+$output = $ipprc->convert_filename ( $output );
+$b1name = $ipprc->convert_filename ( $b1name );
+$b2name = $ipprc->convert_filename ( $b2name );
 unless ($no_update) {
     my $command = "$dettool -addnormalizedimfile -det_id $detId -iteration $iter -class_id $classId ".