Diff for /loncom/homework/imageresponse.pm between versions 1.8 and 1.19

version 1.8, 2001/06/02 03:59:59 version 1.19, 2002/07/23 14:41:06
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # iimage click response style  # image click response style
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   
 #FIXME assumes multiple possbile submissions but only one is possible currently  #FIXME assumes multiple possbile submissions but only one is possible currently
   
 package Apache::imageresponse;  package Apache::imageresponse;
 use strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));    &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
 }  }
   
 sub start_imageresponse {  sub start_imageresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
   #when in a radiobutton response use these    #when in a radiobutton response use these
   &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));    &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
   push (@Apache::lonxml::namespace,'imageresponse');    push (@Apache::lonxml::namespace,'imageresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';    if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('imageresponse');
     }
     return $result;
 }  }
   
 sub end_imageresponse {  sub end_imageresponse {
   &Apache::response::end_response;    &Apache::response::end_response;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
   return '';    return '';
 }  }
   
Line 39  sub getfoilcounts { Line 69  sub getfoilcounts {
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');    my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   # +1 since instructors will count from 1    # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} }+1;    my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
     if (&Apache::response::showallfoils()) { $max=$count; }
   return ($count,$max);    return ($count,$max);
 }  }
   
 sub whichfoils {  sub whichfoils {
   my ($max)=@_;    my ($max)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
   my @names = @{ $Apache::response::foilgroup{'names'} };    my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();    my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {    while ((($#whichopt+1) < $max) && ($#names > -1)) {
     &Apache::lonxml::debug("Have $#whichopt max is $max");      &Apache::lonxml::debug("Have $#whichopt max is $max");
     my $aopt=int(rand($#names+1));      my $aopt;
       if (&Apache::response::showallfoils()) {
         $aopt=0;
       } else {
         $aopt=int(rand($#names+1));
       }
     &Apache::lonxml::debug("From $#names elms, picking $aopt");      &Apache::lonxml::debug("From $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);      $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");      &Apache::lonxml::debug("Picked $aopt");
Line 87  sub gradefoils { Line 124  sub gradefoils {
     $x=$ENV{"form.HWVAL_$id:$temp.x"};      $x=$ENV{"form.HWVAL_$id:$temp.x"};
     $y=$ENV{"form.HWVAL_$id:$temp.y"};      $y=$ENV{"form.HWVAL_$id:$temp.y"};
     &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");      &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
     my @areas = @{ $Apache::response::foilgroup{"$name.area"} };      if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
     my $grade="INCORRECT";        my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
     foreach my $area (@areas) {        my $grade="INCORRECT";
       &Apache::lonxml::debug("Area is $area for $name");        foreach my $area (@areas) {
       $area =~ m/([a-z]*):/;   &Apache::lonxml::debug("Area is $area for $name");
       &Apache::lonxml::debug("Area of type $1");   $area =~ m/([a-z]*):/;
       if ($1 eq 'rectangle') {   &Apache::lonxml::debug("Area of type $1");
  $grade=&grade_rectangle($area,$x,$y);   if ($1 eq 'rectangle') {
       } else {    $grade=&grade_rectangle($area,$x,$y);
  &Apache::lonxml::error("Unknown area style $area");   } else {
     &Apache::lonxml::error("Unknown area style $area");
    }
    &Apache::lonxml::debug("Area said $grade");
    if ($grade eq 'APPROX_ANS') { last; }
       }        }
       &Apache::lonxml::debug("Area said $grade");        &Apache::lonxml::debug("Foil was $grade");
       if ($grade eq 'APPROX_ANS') { last; }        if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }
         if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }
         &Apache::lonxml::debug("Question is $result");
         $temp++;
     }      }
     &Apache::lonxml::debug("Foil was $grade");  
     if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }  
     if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }  
     &Apache::lonxml::debug("Question is $result");  
     $temp++;  
   }    }
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
Line 143  sub end_conceptgroup { Line 182  sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::imageresponse::conceptgroup=0;      $Apache::imageresponse::conceptgroup=0;  
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     my $pick=int(rand($#names+1));        my @names = @{ $Apache::response::conceptgroup{'names'} };
     my $name=$names[$pick];        my $pick=int(rand($#names+1));
     push @{ $Apache::response::foilgroup{'names'} }, $name;        my $name=$names[$pick];
     $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};        if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {
     $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};   push @{ $Apache::response::foilgroup{'names'} }, $name;
     push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });   $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
     my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);   $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};
     $Apache::response::foilgroup{"$name.concept"} = $concept;   push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });
     &Apache::lonxml::debug("Selecting $name in $concept");   my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
    $Apache::response::foilgroup{"$name.concept"} = $concept;
    &Apache::lonxml::debug("Selecting $name in $concept");
         }
       }
   }    }
   return '';    return '';
 }  }
Line 163  sub start_foil { Line 206  sub start_foil {
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     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 eq '') { $name=$Apache::lonxml::curdepth; }
     if ( $Apache::imageresponse::conceptgroup ) {      if ( $Apache::imageresponse::conceptgroup
    && !&Apache::response::showallfoils()) {
       push(@{ $Apache::response::conceptgroup{'names'} }, $name);        push(@{ $Apache::response::conceptgroup{'names'} }, $name);
     } else {      } else {
       push(@{ $Apache::response::foilgroup{'names'} }, $name);        push(@{ $Apache::response::foilgroup{'names'} }, $name);
Line 188  sub end_text { Line 232  sub end_text {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {    if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     if ( $Apache::imageresponse::conceptgroup ) {      if ( $Apache::imageresponse::conceptgroup
          && !&Apache::response::showallfoils() ) {
       $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;        $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
     } else {      } else {
       $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;        $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
Line 199  sub end_text { Line 244  sub end_text {
   
 sub start_image {  sub start_image {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') { &Apache::lonxml::startredirection; }    if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; }
   return '';    return '';
 }  }
   
 sub end_image {  sub end_image {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;            
     my $currentstring = '';
   if ($target eq 'web') {    if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     my $image = &Apache::lonxml::endredirection;      my $image = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $image");      &Apache::lonxml::debug("out is $image");
     if ( $Apache::imageresponse::conceptgroup ) {      if ( $Apache::imageresponse::conceptgroup
    && !&Apache::response::showallfoils()) {
       $Apache::response::conceptgroup{"$name.image"} = $image;        $Apache::response::conceptgroup{"$name.image"} = $image;
     } else {      } else {
       $Apache::response::foilgroup{"$name.image"} = $image;        $Apache::response::foilgroup{"$name.image"} = $image;
     }      }
   }    } elsif ($target eq 'tex') {
   return '';      my $src = &Apache::lonxml::endredirection;
       $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
       my $width_param = '';
       my $height_param = '';
       my $scaling = .3;
       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)$/\.eps/i;
       $file=~s/(\.gif|\.jpg)$/\.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;      
       }
       #where can we find the picture?
       if (-e $newsrc) {
    if ($path) {
       $currentstring .= '\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
    }
       } else {
    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 .= '\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
       }
    } 
     return $currentstring;
 }  }
   
 sub start_rectangle {  sub start_rectangle {
Line 235  sub grade_rectangle { Line 354  sub grade_rectangle {
   &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");    &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
   if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }    if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
   if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }    if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
   if ($x => $x1) { if ($x <= $x2) { if ($y => $y1) { if ($y <= $y2) { return 'APPROX_ANS'; } } } }    if (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {
       return 'APPROX_ANS';
     }
   return 'INCORRECT';    return 'INCORRECT';
 }  }
   
Line 245  sub end_rectangle { Line 366  sub end_rectangle {
     my $name = $Apache::imageresponse::curname;      my $name = $Apache::imageresponse::curname;
     my $area = &Apache::lonxml::endredirection;      my $area = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $area for $name");      &Apache::lonxml::debug("out is $area for $name");
     if ( $Apache::imageresponse::conceptgroup ) {      if ( $Apache::imageresponse::conceptgroup
    && !&Apache::response::showallfoils()) {
       push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";        push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
     } else {      } else {
       push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";        push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";

Removed from v.1.8  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.