--- loncom/homework/hint.pm 2004/03/19 00:24:42 1.54
+++ loncom/homework/hint.pm 2006/03/07 22:42:47 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.54 2004/03/19 00:24:42 albertel Exp $
+# $Id: hint.pm,v 1.62 2006/03/07 22:42:47 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');
@@ -94,7 +94,7 @@ sub end_hintgroup {
$hinttext.'</td></tr></table>';
}
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::end_table();
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
} elsif ($target eq 'tex') {
$result .= '}';
}
@@ -161,9 +161,9 @@ 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");
@@ -201,7 +201,7 @@ sub end_numericalhint {
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write($token->[1]);
} elsif ($target eq 'edit') {
- $result.='</td></tr>'.&Apache::edit::end_table;
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
}
&Apache::response::end_hintresponse();
return $result;
@@ -255,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");
@@ -267,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';
@@ -293,7 +300,7 @@ sub end_stringhint {
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write($token->[1]);
} elsif ($target eq 'edit') {
- $result.='</td></tr>'.&Apache::edit::end_table;
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
}
&Apache::response::end_hintresponse();
return $result;
@@ -315,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);
@@ -338,7 +345,9 @@ sub start_hintpart {
sub end_hintpart {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ if ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
return $result;
}
@@ -373,12 +382,13 @@ 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);
if ($answer) {
eval('%answer ='.$answer);
+ &Apache::lonxml::debug("answwer hash");
&Apache::lonhomework::showhash(%answer);
my $response = $Apache::lonhomework::history{
"resource.$part_id.submission"};
@@ -414,8 +424,9 @@ sub end_optionhint {
($foilmatch eq '-1' || $foilmatch eq '1') ) {
push(@Apache::hint::which,$name);
}
- } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
- if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
&Apache::response::end_hintresponse();
return $result;
}
@@ -452,7 +463,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"};
@@ -479,7 +490,9 @@ sub end_radiobuttonhint {
}
}
}
- } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+ }
&Apache::response::end_hintresponse();
return $result;
}