[WWcvs] pg: Fixed a bug that interferec with constructing the correct path to a gif file

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
 Fixed a bug that interferec with constructing the correct path to a gif file

Modified Files:
--------------
    pg/lib:
        PGalias.pm

Revision Data
-------------
Index: PGalias.pm
===================================================================
RCS file: /webwork/cvs/system/pg/lib/PGalias.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -Llib/PGalias.pm -Llib/PGalias.pm -u -r1.4 -r1.5
--- lib/PGalias.pm
+++ lib/PGalias.pm
@@ -57,9 +57,9 @@
 use strict;
 use Exporter;
 use PGcore;
-use WeBWorK::PG::IO;
+#use WeBWorK::PG::IO;
 
-our @ISA = ( qw ( PGcore  ) );  # look up features in PGcore -- in this case we want the environment.
+our @ISA =  qw ( PGcore  );  # look up features in PGcore -- in this case we want the environment.
 
 # new 
 #   Create one alias object per question (and per PGcore object)
@@ -266,7 +266,8 @@
 	my $self = shift;
 	my $aux_file_path = shift;
     # warn "aux_file for html $aux_file_path";
-	my $envir               = $self->{envir};  	my $fileName            = $envir->{fileName};
+	my $envir               = $self->{envir};  	
+	my $fileName            = $self->{fileName};
 	my $htmlDirectory       = $envir->{htmlDirectory};
 	my $htmlURL             = $envir->{htmlURL};
 	my $tempDirectory       = $envir->{tempDirectory};
@@ -311,7 +312,7 @@
 			# $fileName is obtained from environment for PGeval
 			# it gives the  full path to the current problem
 			my $filePath = $self->directoryFromPath($fileName);
-			my $htmlFileSource = convertPath("$templateDirectory${filePath}$aux_file_path.html");
+			my $htmlFileSource = $self->convertPath("$templateDirectory${filePath}$aux_file_path.html");
 			my $link = "html/".$self->{uniqIDstub}."-$aux_file_path.$ext";
 			my $linkPath = $self->surePathToTmpFile($link);
 			$adr_output = "${tempURL}$link";
@@ -335,7 +336,8 @@
 	my $aux_file_path = shift;
 #    warn "entering alias_for_gif_in_html_mode $aux_file_path";
     
-	my $envir               = $self->{envir};  	my $fileName            = $envir->{fileName};
+	my $envir               = $self->{envir};  	
+	my $fileName            = $self->{fileName};
 	my $htmlDirectory       = $envir->{htmlDirectory};
 	my $htmlURL             = $envir->{htmlURL};
 	my $tempDirectory       = $envir->{tempDirectory};
@@ -380,12 +382,14 @@
 				# For a gif file the alias macro creates an alias under the html/images directory
 				# which points to the gif file in the problem directory.
 				# All of the subdirectories of html/tmp/gif which are needed are also created.
-				my $filePath = $self->directoryFromPath($fileName);
-
+		  #warn "fileName is $fileName   $self";
+				my $filePath = ( $self->directoryFromPath($fileName) );
+          #warn "filePath is $filePath";
 				# $fileName is obtained from environment for PGeval
 				# it gives the full path to the current problem
-				my $gifSourceFile = convertPath("$templateDirectory${filePath}$aux_file_path.gif");
+				my $gifSourceFile = $self->convertPath("$templateDirectory${filePath}$aux_file_path.gif");
 				#my $link = "gif/$studentLogin-$psvnNumber-set$setNumber-prob$probNum-$aux_file_path.$ext";
+		   #warn "fileName is $fileName filePath is $filePath gifSourceFile is $gifSourceFile";
 
 				#  Make file names work in Library Browser when the images in several
 				#  files have the same names.
@@ -462,7 +466,6 @@
 				my $gifFileName = $self->fileFromPath($gifFilePath);
 
 				$gifFileName =~ /^(.*)\.gif$/;
-#				my $pngFilePath = $self->surePathToTmpFile("${tempDirectory}png/$probNum-$1.png");
 				my $pngFilePath = $self->surePathToTmpFile("${tempDirectory}png/$setNumber-$probNum-$1.png");
 				my $returnCode = system "cat $gifFilePath | ${$envir->{externalGif2PngPath}} > $pngFilePath";