[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[sakharuk]

sakharuk		Thu Jan  8 14:49:59 2004 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Bug 2521 (The eps conversion in construction space does not appear to work) is fixed. See cgi script printout.pl too.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.191 loncom/xml/londefdef.pm:1.192
--- loncom/xml/londefdef.pm:1.191	Sat Nov 15 07:46:41 2003
+++ loncom/xml/londefdef.pm	Thu Jan  8 14:49:59 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.191 2003/11/15 12:46:41 albertel Exp $
+# $Id: londefdef.pm,v 1.192 2004/01/08 19:49:59 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2118,7 +2118,7 @@
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	&image_replication($src);
 	#if original gif/jpg/png file exist do following:
-	if (-e $src) {          
+	if (-e $src) {
 	    #defines the default size of image
 	    my $image = Image::Magick->new;
 	    my $current_figure = $image->Read($src);
@@ -2173,6 +2173,8 @@
 		    $temp_file = Apache::File->new('>>'.$filename); 
 		    print $temp_file "$src\n";
 		    $newsrc=~s/\/home\/httpd\/html\/res//;
+		    $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
+		    $newsrc=~s/\/\.\//\//;
 		    $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
 		    $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		}