--- loncom/homework/optionresponse.pm	2001/06/26 21:41:58	1.18
+++ loncom/homework/optionresponse.pm	2001/09/14 20:14:46	1.25
@@ -17,17 +17,22 @@ sub start_optionresponse {
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
-    $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
-<td>Delete:".
-  &Apache::edit::deletelist($target,$token)
-    ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
-    $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4')."</td></tr>";
+    $result.=&Apache::edit::start_table($token).
+      "<tr><td>Multiple Option Response Question</td><td>Delete:".
+	&Apache::edit::deletelist($target,$token)
+	  ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
+    $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
+      "</td></tr>";
     $result.="<tr><td colspan=\"3\">\n";
   }
   if ($target eq 'modified') {
-    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						 $safeeval,'max');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('optionresponse');
+  }
   return $result;
 }
 
@@ -40,14 +45,6 @@ sub end_optionresponse {
   return $result;
 }
 
-sub insert_optionresponse {
-  return '
-<optionresponse max="10">
-    <foilgroup options=\"\">
-    </foilgroup>
-</optionresponse>';
-}
-
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -117,7 +114,7 @@ sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
-  if ($target eq 'grade' || $target eq 'web') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
     my $name;
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max } 
@@ -126,7 +123,9 @@ sub end_foilgroup {
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     &Apache::lonxml::debug("Options are $#opt");
     if ($target eq 'web') {
-      $result=&displayfoils($count,@opt);
+      $result.=&displayfoils($count,@opt);
+    } elsif ( $target eq 'answer') {
+      $result.=&displayanswers($count,@opt);
     } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {
 	my @whichopt = &whichfoils($count);
@@ -157,8 +156,7 @@ sub end_foilgroup {
 	}
       }
     }
-  }
-  if ($target eq 'edit') {
+  } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
   }
   return $result;
@@ -187,6 +185,19 @@ sub whichfoils {
   return @whichopt;
 }
 
+sub displayanswers {
+  my ($max,@opt)=@_;
+  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my @whichopt = &whichfoils($max);
+  my $result=&Apache::response::answer_header('optionresponse');
+  foreach my $name (@whichopt) {
+    $result.=&Apache::response::answer_part('optionresponse',
+		     $Apache::response::foilgroup{$name.'.value'})
+  }
+  $result.=&Apache::response::answer_footer('optionresponse');
+  return $result;
+}
+
 sub displayfoils {
   my ($max,@opt)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -200,7 +211,7 @@ sub displayfoils {
   foreach $option (@opt) {
     $optionlist.="<option>$option</option>\n";
   }
-  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+  if (($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach $name (@whichopt) {
       $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
 	":".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -239,7 +250,7 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=0;
   my $result='';
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     #if not there aren't any foils to display and thus no question
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
@@ -267,18 +278,18 @@ sub insert_conceptgroup {
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web') { &Apache::lonxml::startredirection; }
-  if ($target eq 'edit') {
+  if ($target eq 'web') {
+    &Apache::lonxml::startredirection;
+  } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
     my $level='-2';
     if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
-    $result.=&Apache::edit::text_arg('Name:','name',$token).
-      &Apache::edit::select_arg('Correct Option:','value',['unused',(@opt)],$token).
-      '</td></tr><tr><td colspan="3">';
-  }
-  if ($target eq 'modified') {
+    $result.=&Apache::edit::text_arg('Name:','name',$token);
+    $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
+    $result .= '</td></tr><tr><td colspan="3">';
+  } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
@@ -290,7 +301,7 @@ sub end_foil {
   my $text ='';
   my $result = '';
   if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);