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

Diff for /loncom/homework/imageresponse.pm between versions 1.10 and 1.23

version 1.10, 2001/08/06 17:37:12 version 1.23, 2003/01/16 02:55:05
Line 1 Line 1
 # The LON-CAPA image response handler  # The LearningOnline Network with CAPA
 #   # image 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/
 #  #
 # YEAR=2001  
 # 2/7,2/9,2/22,3/1,5/4,5/15,5/31,6/2,6/26 Guy Albertelli  
 # 8/6 Scott Harrison  
   
 #FIXME assumes multiple possible 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;
   use Image::Magick;
   
 # ======================================================================= BEGIN  BEGIN {
 sub BEGIN {    &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
     &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));  
 }  }
   
 # ======================================================== Start image response  
 sub start_imageresponse {  sub start_imageresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     #when in a radiobutton response use these    my $result;
     &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil',    #when in a radiobutton response use these
        'text','image',    &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
        'rectangle',    push (@Apache::lonxml::namespace,'imageresponse');
        'conceptgroup'));    my $id = &Apache::response::start_response($parstack,$safeeval);
     push (@Apache::lonxml::namespace,'imageresponse');    if ($target eq 'meta') {
     my $id = &Apache::response::start_response($parstack,$safeeval);      $result=&Apache::response::meta_package_write('imageresponse');
     return '';    }
     return $result;
 }  }
   
 # ========================================================== End image response  
 sub end_imageresponse {  sub end_imageresponse {
     &Apache::response::end_response;    &Apache::response::end_response;
     pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
     return '';    &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
     return '';
 }  }
   
 %Apache::response::foilgroup = {};  %Apache::response::foilgroup=();
 # ============================================================ Start foil group  
 sub start_foilgroup {  sub start_foilgroup {
     %Apache::response::foilgroup = {};    %Apache::response::foilgroup=();
     $Apache::imageresponse::conceptgroup = 0;    $Apache::imageresponse::conceptgroup=0;
     &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
     return '';    return '';
 }  }
   
 # =================================== Get foil counts (returns 2 element array)  
 sub getfoilcounts {  sub getfoilcounts {
     my ($parstack,$safeeval) = @_;    my ($parstack,$safeeval)=@_;
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');  
     # +1 since instructors will count from 1    my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     my $count = $#{ $Apache::response::foilgroup{'names'} }+1;    # +1 since instructors will count from 1
     return ($count,$max);    my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
     if (&Apache::response::showallfoils()) { $max=$count; }
     return ($count,$max);
 }  }
   
 # ============================================== Which foils (returns an array)  
 sub whichfoils {  sub whichfoils {
     my ($max) = @_;    my ($max)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }    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;
  &Apache::lonxml::debug("From $#names elms, picking $aopt");      if (&Apache::response::showallfoils()) {
  $aopt = splice(@names,$aopt,1);        $aopt=0;
  &Apache::lonxml::debug("Picked $aopt");      } else {
  push (@whichopt,$aopt);        $aopt=int(&Math::Random::random_uniform() * ($#names+1));
     }      }
     return @whichopt;      &Apache::lonxml::debug("From $#names elms, picking $aopt");
       $aopt=splice(@names,$aopt,1);
       &Apache::lonxml::debug("Picked $aopt");
       push (@whichopt,$aopt);
     }
     return @whichopt;
 }  }
   
 # ======================================= Display foils (returns scalar string)  
 sub displayfoils {  sub displayfoils {
     my (@whichopt) = @_;    my (@whichopt) = @_;
     my $result ='';    my $result ='';
     my $name;    my $name;
     my $temp = 1;    my $temp=1;
     foreach $name (@whichopt) {    foreach $name (@whichopt) {
  $result .= $Apache::response::foilgroup{"$name.text"}."<br />\n";      $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
  my $image = $Apache::response::foilgroup{"$name.image"};      my $image=$Apache::response::foilgroup{"$name.image"};
  if ($Apache::lonhomework::history{'resource.'.      if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
   $Apache::inputtags::part.        $result.="<img src=\"$image\"/> <br />\n";
   '.solved'} =~ /^correct/) {      } else {
     $result .= "<img src=\"$image\"/> <br />\n";        $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
  } else {  
     $result .= "<input type=\"image\" name=\"HWVAL_".  
        $Apache::inputtags::response['-1'].  
        ":$temp\" src=\"$image\"/> <br />\n";  
  }  
  $temp++;  
     }      }
     return $result;      $temp++;
     }
     return $result;
 }  }
   
 # ================================================================= Grade foils  
 sub gradefoils {  sub gradefoils {
     my (@whichopt) = @_;    my (@whichopt) = @_;
     my $result = '';    my $x;
     my $x;    my $y;
     my $y;    my $result;
     my $result;    my $id=$Apache::inputtags::response['-1'];
     my $id = $Apache::inputtags::response['-1'];    my $temp=1;
     my $temp = 1;    foreach my $name (@whichopt) {
     foreach my $name (@whichopt) {      $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");      if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
  if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {        my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
     my @areas = @{ $Apache::response::foilgroup{"$name.area"} };        my $grade="INCORRECT";
     my $grade = "INCORRECT";        foreach my $area (@areas) {
     foreach my $area (@areas) {   &Apache::lonxml::debug("Area is $area for $name");
  &Apache::lonxml::debug("Area is $area for $name");   $area =~ m/([a-z]*):/;
  $area =~ m/([a-z]*):/;   &Apache::lonxml::debug("Area of type $1");
  &Apache::lonxml::debug("Area of type $1");   if ($1 eq 'rectangle') {
  if ($1 eq 'rectangle') {    $grade=&grade_rectangle($area,$x,$y);
     $grade = &grade_rectangle($area,$x,$y);   } else {
  } else {    &Apache::lonxml::error("Unknown area style $area");
     &Apache::lonxml::error("Unknown area style $area");  
  }  
  &Apache::lonxml::debug("Area said $grade");  
  if ($grade eq 'APPROX_ANS') { last; }  
     }  
     &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::lonxml::debug("Area said $grade");
    if ($grade eq 'APPROX_ANS') { last; }
         }
         &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.    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
   ".$id.submission"} = "$x:$y";    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
     $Apache::lonhomework::results{'resource.'.    return '';
   $Apache::inputtags::part.  
   ".$id.awarddetail"} = $result;  
     return '';  
 }  }
   
 # ======================================= End foil group (return scalar string)  
 sub end_foilgroup {  sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';    my $result='';
     my @whichopt;    my @whichopt;
     if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
  my ($count,$max) = &getfoilcounts($parstack,$safeeval);      my ($count,$max) = &getfoilcounts($parstack,$safeeval);
  if ($count > $max) { $count = $max }      if ($count>$max) { $count=$max }
  &Apache::lonxml::debug("Count is $count from $max");      &Apache::lonxml::debug("Count is $count from $max");
  @whichopt = &whichfoils($max);      @whichopt = &whichfoils($max);
     }    }
     if ($target eq 'web') {    if ($target eq 'web') {
  $result = &displayfoils(@whichopt);      $result=&displayfoils(@whichopt);
     }    }
     if ($target eq 'grade') {    if ($target eq 'grade') {
  if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
     &gradefoils(@whichopt);        &gradefoils(@whichopt);
  }  
     }      }
     return $result;    }
     return $result;
 }  }
   
 # ========================================================= Start concept group  
 sub start_conceptgroup {  sub start_conceptgroup {
     $Apache::imageresponse::conceptgroup = 1;    $Apache::imageresponse::conceptgroup=1;
     %Apache::response::conceptgroup = {};    %Apache::response::conceptgroup=();
     return '';    return '';
 }  }
   
 # =========================================================== End concept group  
 sub end_conceptgroup {  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') {
  if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     my @names = @{ $Apache::response::conceptgroup{'names'} };        my @names = @{ $Apache::response::conceptgroup{'names'} };
     my $pick = int(rand($#names+1));        my $pick=int(&Math::Random::random_uniform() * ($#names+1));
     my $name = $names[$pick];        my $name=$names[$pick];
     if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {        if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.text"} =   $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
                                  $Apache::response::conceptgroup{"$name.text"};   $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};
  $Apache::response::foilgroup{"$name.image"} =   push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });
                 $Apache::response::conceptgroup{"$name.image"};   my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
  push(@{ $Apache::response::foilgroup{"$name.area"} },   $Apache::response::foilgroup{"$name.concept"} = $concept;
      @{ $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 '';
 }  }
   
 $Apache::imageresponse::curname = '';  $Apache::imageresponse::curname='';
 # ================================================================== Start foil  
 sub start_foil {  sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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
     push(@{ $Apache::response::conceptgroup{'names'} }, $name);   && !&Apache::response::showallfoils()) {
  } else {        push(@{ $Apache::response::conceptgroup{'names'} }, $name);
     push(@{ $Apache::response::foilgroup{'names'} }, $name);      } else {
  }        push(@{ $Apache::response::foilgroup{'names'} }, $name);
  $Apache::imageresponse::curname=$name;  
     }      }
     return '';      $Apache::imageresponse::curname=$name;
     }
     return '';
 }  }
   
 # ==================================================================== End foil  
 sub end_foil {  sub end_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     return '';    return '';
 }  }
   
 # ================================================================== Start text  
 sub start_text {  sub start_text {
     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') { &Apache::lonxml::startredirection; }
     return '';    return '';
 }  }
   
 # ==================================================================== End text  
 sub end_text {  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::conceptgroup{"$name.text"} =          && !&Apache::response::showallfoils() ) {
                                &Apache::lonxml::endredirection;        $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
  } else {      } else {
     $Apache::response::foilgroup{"$name.text"} =         $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
                                &Apache::lonxml::endredirection;  
  }  
     }      }
     return '';    }
     return '';
 }  }
   
 # ================================================================= Start image  
 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 '';
 }  }
   
 # =================================================================== End image  
 sub end_image {  sub end_image {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;            
     if ($target eq 'web') {    my $currentstring = '';
  my $name = $Apache::imageresponse::curname;    if ($target eq 'web') {
  my $image = &Apache::lonxml::endredirection;      my $name = $Apache::imageresponse::curname;
  &Apache::lonxml::debug("out is $image");      my $image = &Apache::lonxml::endredirection;
  if ( $Apache::imageresponse::conceptgroup ) {      &Apache::lonxml::debug("out is $image");
     $Apache::response::conceptgroup{"$name.image"} = $image;      if ( $Apache::imageresponse::conceptgroup
    && !&Apache::response::showallfoils()) {
         $Apache::response::conceptgroup{"$name.image"} = $image;
       } else {
         $Apache::response::foilgroup{"$name.image"} = $image;
       }
     } elsif ($target eq 'tex') {
       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 {   } else {
     $Apache::response::foilgroup{"$name.image"} = $image;      $localfile = $src;
       $localfile =~ s/.*(\/res)/$1/;
       my $as = &Apache::lonnet::getfile($src);      
  }   }
     }      }
     return '';      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.'}}\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/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
       }
    } 
     return $currentstring;
 }  }
   
 # ============================================================= Start rectangle  
 sub start_rectangle {  sub start_rectangle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade') {     if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
  &Apache::lonxml::startredirection;    return '';
     }  
     return '';  
 }  }
   
 # ============================================================= Grade rectangle  
 sub grade_rectangle {  sub grade_rectangle {
     my ($spec,$x,$y) = @_;    my ($spec,$x,$y) = @_;
     &Apache::lonxml::debug("Spec is $spec");    &Apache::lonxml::debug("Spec is $spec");
     $spec =~ m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;    $spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;
     my $x1 = $1;    my $x1=$1;
     my $y1 = $2;    my $y1=$2;
     my $x2 = $3;    my $x2=$3;
     my $y2 = $4;    my $y2=$4;
     &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 (($x >= $x1) && ($x <= $x2) && ($y >= $y1) && ($y <= $y2)) {
  if ($y <= $y2) { return 'APPROX_ANS'; } } } }      return 'APPROX_ANS';
     return 'INCORRECT';    }
     return 'INCORRECT';
 }  }
   
 # =============================================================== End rectangle  
 sub end_rectangle {  sub end_rectangle {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     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
       push @{ $Apache::response::conceptgroup{"$name.area"} },   && !&Apache::response::showallfoils()) {
            "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";
     }      }
   }    }
   return '';    return '';
 }  }
   
 1;  1;
   
 __END__  __END__
     
Removed from v.1.10  
changed lines
  Added in v.1.23

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