--- loncom/homework/response.pm	2003/05/16 20:16:18	1.78
+++ loncom/homework/response.pm	2003/09/23 01:52:57	1.82.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.78 2003/05/16 20:16:18 albertel Exp $
+# $Id: response.pm,v 1.82.2.1 2003/09/23 01:52:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,7 +52,7 @@ sub start_response {
 }
 
 sub end_response {
-    pop @Apache::inputtags::response;
+    #pop @Apache::inputtags::response;
     @Apache::inputtags::inputlist=();
     return '';
 }
@@ -62,6 +62,7 @@ sub start_hintresponse {
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
     push (@Apache::inputtags::response,$id);
+    push (@Apache::inputtags::responselist,$id);
     push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
     return $id;
 }
@@ -92,10 +93,13 @@ sub setrandomnumber {
        $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);
     }
     if ($rndseed =~/,/) {
-	my ($num1,$num2)=split(/,/,$rndseed);
-	$num1+=$rndmod;
-	$num2+=$rndmod;
-	$rndseed="$num1,$num2";
+	{
+	    use integer;
+	    my ($num1,$num2)=split(/,/,$rndseed);
+	    $num1+=$rndmod;
+	    $num2+=$rndmod;
+	    $rndseed="$num1,$num2";
+	}
     } else {
 	$rndseed+=$rndmod;
     }
@@ -367,13 +371,8 @@ sub answer_header {
 	$result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: '.
                   $Apache::inputtags::part.' \\\\ \hline ';
     } else {
-	if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
-	    $result = '<table border="1"><tr><th>Answer for Part:'.
-		$Apache::inputtags::part. '</th></tr><tr>'."\n";
-	} else {
-	    $result = '<table border="1"><tr><td>Answer for Part:'.
-		$Apache::inputtags::part. '</td>'."\n";
-	}
+	$result = '<table border="1"><tr><td>Answer for Part:'.
+	    $Apache::inputtags::part. '</td>'."\n";
     }
     return $result;
 }
@@ -382,13 +381,9 @@ sub answer_part {
     my ($type,$answer) = @_;
     my $result;
     if ($ENV{'form.answer_output_mode'} eq 'tex') {
-	$result = ' '.$answer.'\\\\ \hline ';
+	$result = ' \verb|'.$answer.'|\\\\ \hline ';
     } else {
-	if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
-	    $result = '<td>'.$answer.'</td>';
-	} else {
-	    $result = '<td>'.$answer.'</td>';
-	}
+	$result = '<td>'.$answer.'</td>';
     }
     return $result;
 }
@@ -399,11 +394,7 @@ sub answer_footer {
     if ($ENV{'form.answer_output_mode'} eq 'tex') {
 	$result = ' \end{tabular} \vskip 0 mm ';
     } else {
-	if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
-	    $result = '</tr></table>';
-	} else {
-	    $result = '</tr></table>';
-	}
+	$result = '</tr></table>';
     }
     return $result;
 }
@@ -521,6 +512,14 @@ sub whichorder {
     return @whichopt;
 }
 
+sub show_answer {
+    my $part   = $Apache::inputtags::part;
+    my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
+    my $status = $Apache::inputtags::status[-1];
+    return  ( ($award =~ /^correct/
+	       && lc($Apache::lonhomework::problemstatus) ne 'no')
+	      || $status eq "SHOW_ANSWER");
+}
 1;
 __END__