--- loncom/homework/imageresponse.pm	2003/05/06 15:48:55	1.28
+++ loncom/homework/imageresponse.pm	2003/06/09 22:31:56	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.28 2003/05/06 15:48:55 albertel Exp $
+# $Id: imageresponse.pm,v 1.30 2003/06/09 22:31:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,10 +51,13 @@ sub start_imageresponse {
 }
 
 sub end_imageresponse {
-  &Apache::response::end_response;
-  pop @Apache::lonxml::namespace;
-  &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    &Apache::response::end_response;
+    pop @Apache::lonxml::namespace;
+    &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
+    my $result;
+    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+    return $result;
 }
 
 %Apache::response::foilgroup=();
@@ -136,7 +139,8 @@ sub gradefoils {
     $x=$ENV{"form.HWVAL_$id:$temp.x"};
     $y=$ENV{"form.HWVAL_$id:$temp.y"};
     &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
-    if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
+    if (defined($x) && defined($y) &&
+	defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
       my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
       my $grade="INCORRECT";
       foreach my $area (@areas) {