--- loncom/homework/hint.pm	2004/08/24 16:01:18	1.56
+++ loncom/homework/hint.pm	2006/12/18 21:37:47	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.56 2004/08/24 16:01:18 albertel Exp $
+# $Id: hint.pm,v 1.64 2006/12/18 21:37:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,12 +29,14 @@
 package Apache::hinttags; 
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use capa;
+use Apache::lonmaxima();
+use Apache::response();
 use Apache::lonlocal;
 
 BEGIN {
-    &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));
+    &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint'));
 }
 
 
@@ -54,10 +56,10 @@ 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') {
@@ -94,7 +96,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 +163,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 +203,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;
@@ -215,6 +217,133 @@ sub end_formulahint {
     return &end_numericalhint(@_);
 }
 
+sub start_mathhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    #do everything in end, so intervening <responseparams> and <answer> work
+    &Apache::response::start_hintresponse($parstack,$safeeval);
+    &Apache::lonxml::register('Apache::response',('answer'));
+    my $result;
+    if ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Name:','name',$token);
+        $result.=&Apache::edit::select_arg('Algebra System:',
+                                           'cas',
+                                           ['maxima'],
+                                           $token);
+        $result.=&Apache::edit::text_arg('Argument Array:',
+                                         'args',$token);
+        $result.=&Apache::edit::end_row();
+        $result.=&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag;
+        $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                  $safeeval,'name','cas',
+                                                  'args');
+        $result  = &Apache::edit::rebuild_tag($token);
+        $result .= &Apache::edit::handle_insert();
+    } elsif ($target eq 'web') {
+        &Apache::response::reset_params();
+    }
+    return $result;
+}
+
+sub end_mathhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'web') {
+        if (!$Apache::lonxml::default_homework_loaded) {
+            &Apache::lonxml::default_homework_load($safeeval);
+        }
+	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+        &Apache::response::setup_params('mathhint',$safeeval);
+        my $partid=$Apache::inputtags::part;
+        my $submitid=$Apache::inputtags::response[-1];
+        my $response = $Apache::lonhomework::history{
+                            "resource.$partid.$submitid.submission"};
+	
+	my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
+	my $award;
+	if ($cas eq 'maxima') {
+	    my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+	    $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
+	}
+        if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') {
+            push (@Apache::hint::which,$name);
+        }
+        $result='';
+    } elsif ($target eq 'meta') {
+        $result=&Apache::response::meta_package_write($token->[1]);
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+    }
+    pop(@Apache::response::custom_answer);
+    pop(@Apache::response::custom_answer_type);
+    &Apache::response::end_hintresponse();
+    return $result;
+}
+
+sub start_customhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    #do everything in end, so intervening <responseparams> and <answer> work
+    &Apache::response::start_hintresponse($parstack,$safeeval);
+    &Apache::lonxml::register('Apache::response',('answer'));
+    my $result;
+    if ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Name:','name',$token);
+        $result.=&Apache::edit::end_row();
+        $result.=&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag;
+        $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                  $safeeval,'name');
+        $result  = &Apache::edit::rebuild_tag($token);
+        $result .= &Apache::edit::handle_insert();
+    } elsif ($target eq 'web') {
+        &Apache::response::reset_params();
+    }
+    return $result;
+}
+
+sub end_customhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'web') {
+        if (!$Apache::lonxml::default_homework_loaded) {
+            &Apache::lonxml::default_homework_load($safeeval);
+        }
+	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+        &Apache::response::setup_params('customhint',$safeeval);
+        my $partid=$Apache::inputtags::part;
+        my $submitid=$Apache::inputtags::response[-1];
+        my $response = $Apache::lonhomework::history{
+                            "resource.$partid.$submitid.submission"};
+        my $award;	
+	if ( $response =~ /[^\s]/ && 
+	     $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
+	    if (!$Apache::lonxml::default_homework_loaded) {
+		&Apache::lonxml::default_homework_load($safeeval);
+	    }
+	    ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
+		$response;
+	    
+	    $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
+	}
+        if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') {
+            push (@Apache::hint::which,$name);
+        }
+        $result='';
+    } elsif ($target eq 'meta') {
+        $result=&Apache::response::meta_package_write($token->[1]);
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::end_row().&Apache::edit::end_table();
+    }
+    pop(@Apache::response::custom_answer);
+    pop(@Apache::response::custom_answer_type);
+    &Apache::response::end_hintresponse();
+    return $result;
+}
+
 sub start_stringhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     #do everything in end, so intervening <responseparams> work
@@ -255,9 +384,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 +396,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 +429,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 +451,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 +474,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 +511,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 +553,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 +592,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 +619,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;
 }