--- loncom/homework/hint.pm	2002/01/17 12:23:31	1.23
+++ loncom/homework/hint.pm	2002/10/28 23:31:48	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.23 2002/01/17 12:23:31 harris41 Exp $
+# $Id: hint.pm,v 1.30 2002/10/28 23:31:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use Apache::lonnet;
 use capa;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
+  &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));
 }
 
 
@@ -58,6 +58,8 @@ sub start_hintgroup {
     if ($skiptoend) {
       &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
     }
+  } elsif ($target eq 'tex') {
+    $result .= '\keephidden{'; 
   }
   @Apache::hint::which=();
   return $result;
@@ -79,6 +81,8 @@ sub end_hintgroup {
     }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
+  } elsif ($target eq 'tex') {
+    $result .= '}'; 
   }
   @Apache::hint::which=();
   return $result;
@@ -93,14 +97,28 @@ sub start_numericalhint {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);
-    $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
-    $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+    if ($token->[1] eq 'numericalhint') {
+      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
+      $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+    } elsif ($token->[1] eq 'stringhint') {
+      $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);
+    } elsif ($token->[1] eq 'formulahint') {
+      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+    }
     $result.=&Apache::edit::end_row();
     $result.=&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
-    my $constructtag=
-      &Apache::edit::get_new_args($token,$parstack,$safeeval,
-				  'name','answer','unit', 'format');
+    my $constructtag;
+    if ($token->[1] eq 'numericalhint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','unit','format');
+    } elsif ($token->[1] eq 'stringhint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','type');
+    } elsif ($token->[1] eq 'formulahint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','samples');
+    }
     if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
@@ -147,6 +165,36 @@ sub end_numericalhint {
   return $result;
 }
 
+sub start_stringhint {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('stringhint');
+  } else {
+    $result.=&start_numericalhint(@_);
+  }
+  return $result;
+}
+
+sub end_stringhint {
+  return end_numericalhint(@_);
+}
+
+sub start_formulahint {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('formulahint');
+  } else {
+    $result.=&start_numericalhint(@_);
+  }
+  return $result;
+}
+
+sub end_formulahint {
+  return end_numericalhint(@_);
+}
+
 # a part shows if it is on, if no specific parts are on, then default shows
 sub start_hintpart {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -184,11 +232,140 @@ sub start_hintpart {
 }
 
 sub end_hintpart {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $result;
-  if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
-  return $result;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+    return $result;
+}
+
+sub start_optionhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    &Apache::response::start_hintresponse($parstack,$safeeval);
+    if ($target eq 'edit') {
+	$result.=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::text_arg('Name:','name',$token);
+	$result.=&Apache::edit::text_arg('Answer:','answer',$token,40);
+	$result.=&Apache::edit::text_arg('Concept:','concept',$token,50);
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'name',
+						     'answer','concept');
+	if ($constructtag) {
+	    $result  = &Apache::edit::rebuild_tag($token);
+	    $result .= &Apache::edit::handle_insert();
+	}
+    } elsif ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('numericalhint');
+    }
+    return $result;
+}
+
+sub end_optionhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq 'web') {
+	my ($foilmatch,$conceptmatch)=(-1,-1);
+	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 $part_id="$partid.$submitid";
+	my %answer;
+	my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+	if ($answer) {
+	    eval('%answer ='.$answer);
+	    &Apache::lonhomework::showhash(%answer);
+	    my $response = $Apache::lonhomework::history{
+				            "resource.$part_id.submission"};
+	    my %response=&Apache::lonnet::str2hash($response);
+	    &Apache::lonhomework::showhash(%response);
+	    foreach my $foil (keys(%answer)) {
+		$foilmatch=1;
+		if ($answer{$foil} ne $response{$foil}) {$foilmatch=0;last;}
+	    }
+	}
+	my %concept;
+	my $constr=&Apache::lonxml::get_param('concept',$parstack,$safeeval);
+	if ( $constr ) { eval('%concept ='.$constr);	}
+	my $response = $Apache::lonhomework::history{
+					"resource.$part_id.submissiongrading"};
+	my %response=&Apache::lonnet::str2hash($response);
+	foreach my $concept (keys(%concept)) {
+	    my $compare;
+	    if ($concept{$concept} eq 'correct') {$compare=1}else{$compare=0}
+	    $conceptmatch=1;
+	    if (ref($Apache::hint::option{"$part_id.concepts"})) {
+		foreach my $foil (@{ $Apache::hint::option{"$part_id.concept.$concept"} }) {
+		    &Apache::lonxml::debug("compare -$foil- -$response{$foil}-$compare-");
+		    if ( exists($response{$foil}) && 
+			 $response{$foil} ne $compare) {$conceptmatch=0;last;}
+		}
+	    } else {
+		$conceptmatch=0;
+	    }
+	    if ($conceptmatch eq '0') { last; }
+	}
+	if ( ($conceptmatch eq '-1' || $conceptmatch eq '1') &&
+	     ($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; }
+    &Apache::response::end_hintresponse();
+    return $result;
 }
 
+sub start_radiobuttonhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    &Apache::response::start_hintresponse($parstack,$safeeval);
+    if ($target eq 'edit') {
+	$result.=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::text_arg('Name:','name',$token);
+	$result.=&Apache::edit::text_arg('Answer:','answer',$token);
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'name',
+						     'answer');
+	if ($constructtag) {
+	    $result  = &Apache::edit::rebuild_tag($token);
+	    $result .= &Apache::edit::handle_insert();
+	}
+    } elsif ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('numericalhint');
+    }
+    return $result;
+}
+
+sp;&end_radiobuttonhint {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq 'web') {
+	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+	my @answer;
+	my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+	eval('@answer ='.$answer);
+	my $partid=$Apache::inputtags::part;
+	#id submissions occured under
+	my $submitid=$Apache::inputtags::response['-2'];
+	my $part_id="$partid.$submitid";
+	my $response = $Apache::lonhomework::history{
+			    "resource.$part_id.submission"};
+	($response)=&Apache::lonnet::str2hash($response);
+	if ($answer[0] eq 'foil' && $response eq $answer[1]) {
+	    push (@Apache::hint::which,$name);
+	} elsif ($answer[0] eq 'concept') {
+	    if (ref($Apache::hint::radiobutton{"$part_id.concept.".$answer[1]})) {
+		my @names=@{ $Apache::hint::radiobutton{"$part_id.concept.".$answer[1]} };
+		if (grep(/^\Q$response\E$/,@names)) {
+		    push(@Apache::hint::which,$name);
+		}
+	    }
+	}
+    } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+    &Apache::response::end_hintresponse();
+    return $result;
+}
 1;
 __END__