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

[sakharuk]

sakharuk		Fri Nov 15 11:35:23 2002 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Small corrections (png & TeX). 
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.102 loncom/xml/londefdef.pm:1.103
--- loncom/xml/londefdef.pm:1.102	Fri Nov 15 10:14:12 2002
+++ loncom/xml/londefdef.pm	Fri Nov 15 11:35:23 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.102 2002/11/15 15:14:12 sakharuk Exp $
+# $Id: londefdef.pm,v 1.103 2002/11/15 16:35:23 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1575,10 +1575,8 @@
 		  $height_param = $image->Get('height') * $scaling;;
 		  undef $image;
 		  #do we have any specified size of the picture?
-		  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,
-                                                            undef,1); 
-		  my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval,
-                                                             undef,1); 
+		  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval)
+		  my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval)
 		  my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
                                                          undef,1);
 		  if ($TeXwidth ne '') {  
@@ -1599,8 +1597,8 @@
 		      $path = $1.'/'; 
 		  } 
 		  my $newsrc = $src;
-		  $newsrc =~ s/(\.gif|\.jpg|\.png)$/\.eps/i;
-		  $file=~s/(\.gif|\.jpg|\.png)$/\.eps/i;
+		  $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;
+		  $file=~s/\.(gif|jpg|png)$/.eps/i;
 		  #where can we find the picture?
 		  if (-e $newsrc) {
                       #eps counterpart for image exist 
@@ -2553,7 +2551,7 @@
 	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
 	#replicates eps or ps 
 	my $newsrc = $src;
-	$newsrc =~ s/(.gif|.jpg|\.png)$/.eps/;
+	$newsrc =~ s/(.gif|.jpg|.png)$/.eps/;
 	if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
 	    $newsrc =~ s/\.ps$/\.eps/;
 	    &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);