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

[sakharuk]

sakharuk		Fri Nov 15 10:14:12 2002 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Added png to gif anf jpg (bug #936).
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.101 loncom/xml/londefdef.pm:1.102
--- loncom/xml/londefdef.pm:1.101	Fri Nov 15 10:01:16 2002
+++ loncom/xml/londefdef.pm	Fri Nov 15 10:14:12 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.101 2002/11/15 15:01:16 sakharuk Exp $
+# $Id: londefdef.pm,v 1.102 2002/11/15 15:14:12 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1566,7 +1566,7 @@
 	    } elsif ($target eq 'tex') {
 	      &image_replication($src);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-              #if original gif/jpg file exist do following:
+              #if original gif/jpg/png file exist do following:
               if (-e $src) {          
                   #defines the default size of image
 		  my $image = Image::Magick->new;
@@ -1599,8 +1599,8 @@
 		      $path = $1.'/'; 
 		  } 
 		  my $newsrc = $src;
-		  $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-		  $file=~s/(\.gif|\.jpg)$/\.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 +2553,7 @@
 	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
 	#replicates eps or ps 
 	my $newsrc = $src;
-	$newsrc =~ s/(.gif|.jpg)$/.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);