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

[sakharuk]

sakharuk		Wed May 22 17:07:45 2002 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  correctly replicates all graph. files
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.61 loncom/xml/londefdef.pm:1.62
--- loncom/xml/londefdef.pm:1.61	Wed May 15 20:56:46 2002
+++ loncom/xml/londefdef.pm	Wed May 22 17:07:45 2002
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.61 2002/05/16 00:56:46 albertel Exp $
+# $Id: londefdef.pm,v 1.62 2002/05/22 21:07:45 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1444,6 +1444,36 @@
 	      }
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+	      my $epssrc = $src;
+	      $epssrc =~ s/(\.gif|\.jpg|\.GIF|\.JPG)$/\.eps/;
+	      if (not -e $epssrc) {
+		  my $localfile = $epssrc;
+		  $localfile =~ s/.*(\/res)/$1/;	
+		  my $file;
+		  my $path;	
+		  if ($localfile =~ m!(.*)/([^/]*)$!) {
+		      $file = $2;
+		      $path = $1.'/'; 
+		  }	
+		  my $signal_eps = 0;
+		  my @content_directory = &Apache::lonnet::dirlist($path);
+		  for (my $iy=0;$iy<=$#content_directory;$iy++) {
+		      my @tempo_array = split(/&/,$content_directory[$iy]);
+		      $content_directory[$iy] = $tempo_array[0];
+		      if ($file eq $tempo_array[0]) {
+			  $signal_eps = 1;
+			  last;
+		      }
+		  }
+		  if ($signal_eps) {
+		      my $eps_file = &Apache::lonnet::getfile($localfile);
+		  } else {
+		      $localfile = $src;
+		      $localfile =~ s/.*(\/res)/$1/;	
+		      my $as = &Apache::lonnet::getfile($src);
+		      
+		  }
+	      }
 	      my $file;
 	      my $path;	
               if ($src =~ m!(.*)/([^/]*)$!) {
@@ -1451,8 +1481,8 @@
 		  $path = $1.'/'; 
 	      }
 	      my $newsrc = $src;
-	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
-		  $file=~s/(\.gif|\.jpg)$/\.eps/;
+	      $newsrc =~ s/(\.gif|\.jpg|\.GIF|\.JPG)$/\.eps/;
+		  $file=~s/(\.gif|\.jpg|\.GIF|\.JPG)$/\.eps/;
 	      if (-e $newsrc) {
 		  if ($path) {
 		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';