[BACK]Return to londefdef.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.83 and 1.84

version 1.83, 2002/08/05 15:36:44 version 1.84, 2002/08/12 14:32:00
Line 1532  EDITBUTTON Line 1532  EDITBUTTON
             my $currentstring = '';              my $currentstring = '';
     my $width_param = '';      my $width_param = '';
     my $height_param = '';      my $height_param = '';
     my $scaling = .3;      my $scaling = .3; 
   
     if ($target eq 'web') {      if ($target eq 'web') {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
       my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);        my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
       $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);        $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
               if (-e $src) {          #new one                #if original gif/jpg file exist do following:
                 if (-e $src) {          
                     #defines the default size of image
   my $image = Image::Magick->new;    my $image = Image::Magick->new;
   my $current_figure = $image->Read($src);    my $current_figure = $image->Read($src);
   $width_param = $image->Get('width') * $scaling;;    $width_param = $image->Get('width') * $scaling;;
   $height_param = $image->Get('height') * $scaling;;    $height_param = $image->Get('height') * $scaling;;
   undef $image;    undef $image;
   my $epssrc = $src;  
   $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;  
   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!(.*)/([^/]*)$!) {  
       $file = $2;   
       $path = $1.' /';   
   }   
   my $newsrc = $src;  
   $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;  
   $file=~s/(\.gif|\.jpg)$/\.eps/i;  
   #do we have any specified size of the picture?    #do we have any specified size of the picture?
   my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
   my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
Line 1594  EDITBUTTON Line 1558  EDITBUTTON
   } elsif ($width ne '') {    } elsif ($width ne '') {
       $width_param = $width*$scaling;              $width_param = $width*$scaling;      
   }    }
     my $file;
     my $path;
     if ($src =~ m!(.*)/([^/]*)$!) {
         $file = $2; 
         $path = $1.'/'; 
     } 
     my $newsrc = $src;
     $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
     $file=~s/(\.gif|\.jpg)$/\.eps/i;
   #where can we find the picture?    #where can we find the picture?
   if (-e $newsrc) {    if (-e $newsrc) {
                         #eps counterpart for image exist 
       if ($path) {        if ($path) {
   $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';    $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
       }        }
   } else {    } else {
       my $temp_file;                        #there is no eps counterpart for image - check for ps one
       my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";        $newsrc =~ s/\.eps$/\.ps/;
       $temp_file = Apache::File->new('>>'.$filename);         if (-e $newsrc) {
       print $temp_file "$src\n";    #ps counterpart for image exist 
       $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';    $file =~ s/\.eps$/\.ps/;
     if ($path) {
         $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
     }
         } else {
     #there aren't eps or ps - so create eps 
     my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
     $temp_file = Apache::File->new('>>'.$filename); 
     print $temp_file "$src\n";
     $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
         }
   }    }
       } else {        } else {
     #original image file doesn't exist so check the alt attribute
   my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);    my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
                   if ($alt) {                    if ($alt) {
       $currentstring .= ' '.$alt.' ';        $currentstring .= ' '.$alt.' ';
   } else {    } else {
                       $currentstring .= ' THE ORIGINAL PROBLEM CONTAINS EMPTY IMG TAG WITHOUT IMAGE ';                    #there are no image and alt attribute
                         $currentstring .= ' THE ORIGINAL PROBLEM CONTAINS EMPTY IMG TAG WITHOUT IMAGE AND ALT ATTRIBUTE ';
   }    }
       }        }
     }      }
Removed from v.1.83  
changed lines
  Added in v.1.84

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>