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

Diff for /loncom/homework/imageresponse.pm between versions 1.58 and 1.63

version 1.58, 2004/12/08 01:00:41 version 1.63, 2005/03/02 22:26:36
Line 227  sub clean_up_image { Line 227  sub clean_up_image {
  }   }
     } else {      } else {
  $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);   $image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);
  if (&Apache::lonnet::repcopy($image) ne OK) {   if (&Apache::lonnet::repcopy($image) ne 'OK') {
     $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
Line 270  sub gradefoils { Line 270  sub gradefoils {
     $temp++;      $temp++;
  }   }
     }      }
       my $responsestr="$x:$y";
       my $part=$Apache::inputtags::part;
       my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
     if ($result       if ($result 
  && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }   && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";      &Apache::response::handle_previous(\%previous,$result);
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;      $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;
       $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
     return '';      return '';
 }  }
   
Line 340  sub start_foil { Line 344  sub start_foil {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {   $target eq 'analyze') {
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  if ($name eq '') { $name=$Apache::lonxml::curdepth; }   if (!$name) {
       &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
       $name=$Apache::lonxml::curdepth;
    }
  if (defined($Apache::response::foilnames{$name})) {   if (defined($Apache::response::foilnames{$name})) {
     &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));      &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
  }   }
Line 426  sub end_image { Line 433  sub end_image {
     my $result;      my $result;
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     if ($target eq 'web') {      if ($target eq 'web') {
  my $image = &Apache::lonxml::endredirection;   my $image = &Apache::lonxml::endredirection();
  &Apache::lonxml::debug("original image is $image");   &Apache::lonxml::debug("original image is $image");
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      #&& !&Apache::response::showallfoils()       #&& !&Apache::response::showallfoils()
Line 436  sub end_image { Line 443  sub end_image {
     $Apache::response::foilgroup{"$name.image"} = $image;      $Apache::response::foilgroup{"$name.image"} = $image;
  }   }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  my $image = &Apache::lonxml::endredirection;   my $image = &Apache::lonxml::endredirection();
  if ( $Apache::imageresponse::conceptgroup   if ( $Apache::imageresponse::conceptgroup
      #&& !&Apache::response::showallfoils()       #&& !&Apache::response::showallfoils()
      ) {       ) {
Line 447  sub end_image { Line 454  sub end_image {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $src = &Apache::lonxml::endredirection;   my $src = &Apache::lonxml::endredirection();
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   my ($path,$file) = &Apache::londefdef::get_eps_image($src);
  my $width_param = '';   my ($height_param,$width_param)=
  my $height_param = '';      &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
  my $scaling = .3;   $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
  my $image = Image::Magick->new;  
  my $current_figure = $image->Read($src);  
  $width_param = $image->Get('width') * $scaling;;  
  $height_param = $image->Get('height') * $scaling;;  
  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|\.jpeg)$/\.eps/i;  
  $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;  
  #do we have any specified size of the picture?  
  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);  
  if ($TeXwidth ne '') {   
     $width_param = $TeXwidth;   
  } elsif ($TeXheight ne '') {   
     $width_param = $TeXheight/$height_param*$width_param;  
  } elsif ($width ne '') {  
     $width_param = $width*$scaling;        
  }  
  $width_param=&Apache::randomlabel::adjust_textwidth($width_param);  
  #where can we find the picture?  
  if (-e $newsrc) {  
     if ($path) {  
  $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
     }  
  } else {  
     #care about eps dynamical generation  
     $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param);  
  }  
     }       } 
     return $result;      return $result;
 }  }
Removed from v.1.58  
changed lines
  Added in v.1.63

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