--- loncom/homework/imageresponse.pm	2001/06/26 21:40:37	1.9
+++ loncom/homework/imageresponse.pm	2002/05/03 20:44:46	1.18
@@ -1,27 +1,57 @@
 # The LearningOnline Network with CAPA
-# iimage click response style
+# image click response style
+#
+# $Id: imageresponse.pm,v 1.18 2002/05/03 20:44:46 albertel Exp $
+#
+# 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
 
 package Apache::imageresponse;
 use strict;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
 }
 
 sub start_imageresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
   #when in a radiobutton response use these
   &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
   push (@Apache::lonxml::namespace,'imageresponse');
   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 {
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
+  &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
   return '';
 }
 
@@ -39,6 +69,7 @@ sub getfoilcounts {
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+  if (&Apache::response::showallfoils()) { $max=$count; }
   return ($count,$max);
 }
 
@@ -49,7 +80,12 @@ sub whichfoils {
   my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {
     &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");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
@@ -170,7 +206,8 @@ sub start_foil {
   if ($target eq 'web' || $target eq 'grade') {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ($name eq '') { $name=$Apache::lonxml::curdepth; }
-    if ( $Apache::imageresponse::conceptgroup ) {
+    if ( $Apache::imageresponse::conceptgroup
+	 && !&Apache::response::showallfoils()) {
       push(@{ $Apache::response::conceptgroup{'names'} }, $name);
     } else {
       push(@{ $Apache::response::foilgroup{'names'} }, $name);
@@ -195,7 +232,8 @@ sub end_text {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;
-    if ( $Apache::imageresponse::conceptgroup ) {
+    if ( $Apache::imageresponse::conceptgroup
+       && !&Apache::response::showallfoils() ) {
       $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
     } else {
       $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
@@ -216,7 +254,8 @@ sub end_image {
     my $name = $Apache::imageresponse::curname;
     my $image = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $image");
-    if ( $Apache::imageresponse::conceptgroup ) {
+    if ( $Apache::imageresponse::conceptgroup
+	 && !&Apache::response::showallfoils()) {
       $Apache::response::conceptgroup{"$name.image"} = $image;
     } else {
       $Apache::response::foilgroup{"$name.image"} = $image;
@@ -242,7 +281,9 @@ sub grade_rectangle {
   &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
   if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$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';
 }
 
@@ -252,7 +293,8 @@ sub end_rectangle {
     my $name = $Apache::imageresponse::curname;
     my $area = &Apache::lonxml::endredirection;
     &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";
     } else {
       push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";