--- loncom/homework/hint.pm	2004/03/16 22:24:31	1.53
+++ loncom/homework/hint.pm	2005/12/01 18:46:31	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.53 2004/03/16 22:24:31 albertel Exp $
+# $Id: hint.pm,v 1.61 2005/12/01 18:46:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 package Apache::hinttags; 
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use capa;
 use Apache::lonlocal;
 
@@ -54,17 +54,17 @@ sub start_hintgroup {
 	    $Apache::lonhomework::history{"resource.$id.solved"};
 	my $showoncorrect=lc(&Apache::lonxml::get_param('showoncorrect',$parstack,$safeeval));	
 	&Apache::lonxml::debug("onc orrect $showoncorrect, $gradestatus");
-	if ( ($showoncorrect ne 'yes' && $gradestatus =~ /^correct/) ||
+	if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) ||
 	     ( $numtries < $hinttries) ) {
 	    &Apache::lonxml::debug("Grabbin all");
-	    &Apache::lonxml::get_all_text("/hintgroup",$parser);
+	    &Apache::lonxml::get_all_text("/hintgroup",$parser,$style);
 	}
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'tex') {
 	$result .= '\keephidden{';
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
-	$result.=&Apache::edit::select_arg('Show hint when problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]]);
+	$result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]],$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');
@@ -161,14 +161,13 @@ sub end_numericalhint {
 	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	&Apache::response::setup_params('numericalhint',$safeeval);
 	my $partid=$Apache::inputtags::part;
-	my $id=$Apache::inputtags::response['-1'];
+	my $id=$Apache::inputtags::hint[-1];
 	#id submissions occured under
-	my $submitid=$Apache::inputtags::response['-2'];
+	my $submitid=$Apache::inputtags::response[-1];
 	my $response = $Apache::lonhomework::history{
 			    "resource.$partid.$submitid.submission"};
 	&Apache::lonxml::debug("hintgroup is using $response<br />\n");
-	my $hideunit=&Apache::response::get_response_param($submitid.'_'.$id,
-							   'turnoffunit');
+	my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
 	my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
 	$$args_ref{'response'}=$response;
 	#need to get all possible parms
@@ -256,9 +255,9 @@ sub end_stringhint {
 	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	&Apache::response::setup_params('stringhint',$safeeval);
 	my $partid=$Apache::inputtags::part;
-	my $id=$Apache::inputtags::response['-1'];
+	my $id=$Apache::inputtags::hint[-1];
 	#id submissions occured under
-	my $submitid=$Apache::inputtags::response['-2'];
+	my $submitid=$Apache::inputtags::response[-1];
 	my $response = $Apache::lonhomework::history{
 			    "resource.$partid.$submitid.submission"};
 	&Apache::lonxml::debug("hintgroup is using $response<br />\n");
@@ -268,7 +267,14 @@ sub end_stringhint {
 	my ($ad,$msg);
 	if ($type eq 're' ) {
 	    ${$safeeval->varglob('LONCAPA::response')}=$response;
-	    $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);
+	    my $compare='=';
+	    if ($answer=~/^\s*NOT\s*/) {
+		$answer=~s/^\s*NOT\s*//;
+		$compare='!';
+	    }
+	    my $test='$LONCAPA::response'.$compare.'~m'.$answer;
+	    &Apache::lonxml::debug("test $test");
+	    $result = &Apache::run::run("return $test",$safeeval);
 	    &Apache::lonxml::debug("current $response");
 	    &Apache::lonxml::debug("current $answer");
 	    $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
@@ -316,10 +322,10 @@ sub start_hintpart {
 	    foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
 	}
 	if (!$show) {
-	    &Apache::lonxml::get_all_text("/hintpart",$parser);
+	    &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
 	}
     } elsif ($target eq 'grade') {
-	&Apache::lonxml::get_all_text("/hintpart",$parser);
+	&Apache::lonxml::get_all_text("/hintpart",$parser,$style);
     } elsif ($target eq 'edit') {
 	$result.= &Apache::edit::tag_start($target,$token);
 	$result.= &Apache::edit::text_arg('On:','on',$token);
@@ -374,7 +380,7 @@ sub end_optionhint {
 	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	my $partid=$Apache::inputtags::part;
 	#id submissions occured under
-	my $submitid=$Apache::inputtags::response['-2'];
+	my $submitid=$Apache::inputtags::response[-1];
 	my $part_id="$partid.$submitid";
 	my %answer;
 	my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
@@ -453,7 +459,7 @@ sub end_radiobuttonhint {
 	eval('@answer ='.$answer);
 	my $partid=$Apache::inputtags::part;
 	#id submissions occured under
-	my $submitid=$Apache::inputtags::response['-2'];
+	my $submitid=$Apache::inputtags::response[-1];
 	my $part_id="$partid.$submitid";
 	my $response = $Apache::lonhomework::history{
 			    "resource.$part_id.submission"};