--- loncom/homework/imageresponse.pm	2003/06/09 22:29:45	1.29
+++ loncom/homework/imageresponse.pm	2003/09/23 01:52:57	1.31.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.29 2003/06/09 22:29:45 albertel Exp $
+# $Id: imageresponse.pm,v 1.31.2.1 2003/09/23 01:52:57 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=();
@@ -107,7 +110,7 @@ sub displayfoils {
     if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
     my $image=$Apache::response::foilgroup{"$name.image"};
     &Apache::lonxml::debug("image is $image");
-    if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+    if ( &Apache::response::show_answer() ) {
       if ($target eq 'tex') {
 	$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
       } else {
@@ -215,6 +218,16 @@ sub end_conceptgroup {
   return $result;
 }
 
+sub insert_foil {
+    return '
+       <foil>
+           <image></image>
+           <text></text>
+           <rectangle></rectangle>
+       </foil>
+';
+}
+
 $Apache::imageresponse::curname='';
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;