--- loncom/homework/rankresponse.pm	2003/03/20 17:59:19	1.7
+++ loncom/homework/rankresponse.pm	2004/09/03 18:35:52	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.7 2003/03/20 17:59:19 sakharuk Exp $
+# $Id: rankresponse.pm,v 1.37 2004/09/03 18:35:52 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -24,12 +24,12 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
 
 package Apache::rankresponse;
 use strict;
 use HTML::Entities();
-use Apache::optionresponse;
+use Apache::optionresponse();
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -44,6 +44,7 @@ sub start_rankresponse {
     push (@Apache::lonxml::namespace,'rankresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);
     %Apache::hint::rank=();
+    undef(%Apache::response::foilnames);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('rankresponse');
     } elsif ($target eq 'edit' ) {
@@ -63,6 +64,9 @@ sub start_rankresponse {
 						     $safeeval,'max',
 						     'randomize');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    } elsif ($target eq 'analyze') {
+	my $part_id="$Apache::inputtags::part.$id";
+	push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
     }
     return $result;
 }
@@ -75,6 +79,7 @@ sub end_rankresponse {
     pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::rankresponse',
 				('foilgroup','foil','conceptgroup'));
+    undef(%Apache::response::foilnames);
     return $result;
 }
 
@@ -84,14 +89,15 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::rankresponse::conceptgroup=0;
-    &Apache::response::setrandomnumber();
+    &Apache::response::pushrandomnumber();
     return $result;
 }
 
 sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
 	my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 						   $safeeval,'-2');
@@ -103,8 +109,16 @@ sub end_foilgroup {
 	    $result=&displayanswers($max,$randomize,$tol);
 	} elsif ( $target eq 'grade') {
 	    &grade_response($max,$randomize,$tol);
+	} elsif ( $target eq 'analyze') {
+	    my @shown = &whichfoils($max,$randomize);
+	    &Apache::response::analyze_store_foilgroup(\@shown,
+						  ['text','value','location']);
 	}
+	&Apache::lonxml::increment_counter(&getfoilcounts($max));
+    } elsif ($target eq 'edit') {
+	$result=&Apache::edit::end_table();
     }
+    &Apache::response::poprandomnumber();
     return $result;
 }
 
@@ -118,7 +132,7 @@ sub get_correct_order {
     }
     @value_names =
 	sort {
-	    if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);}
+	    if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);}
 	    return 0;
 	} @value_names;
     my @value_names_tmp=@value_names;
@@ -181,13 +195,14 @@ sub grade_response {
     if (!defined($ENV{'form.submitted'})) { return; }
     my %responsehash;
     my %grade;
-    my ($temp,$right,$wrong,$ignored)=(0,0,0,0);
+    my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
     my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $name (@whichfoils) {
-	my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
-	$responsehash{$name}=$response;
+	# get response returns a=>0, when we want a=>1
+	my $response = &Apache::response::getresponse($temp)+1;
 	my $value=shift(@correctorder);
 	if ( $response =~ /[^\s]/) {
+	    $responsehash{$name}=$response;
 	    &Apache::lonxml::debug("submitted a $response for $value<br />\n");
 	    if ($value eq $response) {
 		$grade{$name}='1'; $right++;
@@ -235,23 +250,24 @@ sub displayfoils {
     my (@whichfoils)=&whichfoils($max,$randomize);
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-    my $status=$Apache::inputtags::status[-1];
     my @whichopt=(1..($#whichfoils+1));
     my @correctorder=&get_correct_order($tol,@whichfoils);
-    if (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) {
+    if ( &Apache::response::show_answer() && ($target ne 'tex')) {
 	foreach my $name (@whichfoils) {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=shift(@correctorder);
-	    $result.='<br />'.$value.':'.$text;
+	    if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}
+	    $result.=$value.':'.$text;
 	}
     } else {
 	my $i = 0;
-	my $temp=0;
+	my $temp=1;
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
 	my @alp = splice @alphabet, 0, $#whichopt + 1;
+	my $internal_counter=$Apache::lonxml::counter;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $optionlist='';
@@ -264,7 +280,7 @@ sub displayfoils {
 		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
 		}
 	    }
-	    if ($target ne 'tex') {
+	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
 		$optionlist='<select name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
@@ -273,16 +289,22 @@ sub displayfoils {
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
-		$result.='<br />'.$optionlist.$text."\n";
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $result.='<br />'.$optionlist.$text."\n";
+		} else {
+		    $result.='<br />'.$text."\n";
+		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt);
+		    my @values=(1..scalar(@whichopt));
+		    $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt);
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\vskip 0 mm '.$text."\n";
-		    $result.=&Apache::optionresponse::bubbles(\@alp,\@whichopt).'\end{enumerate} \vskip -7 mm \strut ';
+		    $result.='\vskip 0 mm   '.$text.' \vskip 0 mm '."\n";
+		    $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut ';
+		    $internal_counter++;
 		} else {
-		    $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+		    $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
 		}
 	    }
 	    $temp++;
@@ -304,52 +326,9 @@ sub getfoilcounts {
 
 sub whichfoils {
     my ($max,$randomize)=@_;
-    $max = &getfoilcounts($max);
- #   &Apache::lonxml::debug("man $max randomize $randomize");
-    if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
-    my @names = @{ $Apache::response::foilgroup{'names'} };
-    my @whichopt =();
-    my (%top,@toplist,%bottom,@bottomlist);
-    if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
-	my $current=0;
-	foreach my $name (@names) {
-	    $current++;
-	    if ($Apache::response::foilgroup{"$name.location"} eq 'top') {
-		$top{$name}=$current;
-	    } elsif ($Apache::response::foilgroup{"$name.location"} eq
-		     'bottom') {
-		$bottom{$name}=$current;
-	    }
-	}
-    }
-    while ((($#whichopt+1) < $max) && ($#names > -1)) {
-#	&Apache::lonxml::debug("Have $#whichopt max is $max");
-	my $aopt;
-	if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
-	    $aopt=0;
-	} else {
-	    $aopt=int(&Math::Random::random_uniform() * ($#names+1));
-	}
-#	&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
-	$aopt=splice(@names,$aopt,1);
-#	&Apache::lonxml::debug("Picked $aopt");
-	if ($top{$aopt}) {
-	    $toplist[$top{$aopt}]=$aopt;
-	} elsif ($bottom{$aopt}) {
-	    $bottomlist[$bottom{$aopt}]=$aopt;
-	} else {
-	    push (@whichopt,$aopt);
-	}
-    }
-#    &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
-    for (my $i=0;$i<=$#toplist;$i++) {
-	if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
-    }
-    for (my $i=0;$i<=$#bottomlist;$i++) {
-	if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
-    }
-    &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);
-    return @whichopt;
+    return &Apache::response::whichorder($max,$randomize,
+					 &Apache::response::showallfoils(),
+					 \%Apache::response::foilgroup);
 }
 
 sub start_conceptgroup {
@@ -375,31 +354,13 @@ sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::rankresponse::conceptgroup=0;
     my $result='';
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	#if not there aren't any foils to display and thus no question
-	if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
-	    my @names = @{ $Apache::response::conceptgroup{'names'} };
-	    my $pick=int(&Math::Random::random_uniform() * ($#names+1));
-	    my $name=$names[$pick];
-	    push @{ $Apache::response::foilgroup{'names'} }, $name;
-	    $Apache::response::foilgroup{"$name.value"} =
-		$Apache::response::conceptgroup{"$name.value"};
-	    $Apache::response::foilgroup{"$name.text"} =
-		$Apache::response::conceptgroup{"$name.text"};
-	    $Apache::response::foilgroup{"$name.location"} =
-		$Apache::response::conceptgroup{"$name.location"};
-	    my $concept = &Apache::lonxml::get_param('concept',$parstack,
-						     $safeeval);
-	    $Apache::response::foilgroup{"$name.concept"} = $concept;
-	    &Apache::lonxml::debug("Selecting $name in $concept");
-	    if ($target eq 'web') {
-		my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
-		push(@{ $Apache::hint::rank{"$part_id.concepts"} },
-		     $concept);
-		$Apache::hint::rank{"$part_id.concept.$concept"}=
-		    $Apache::response::conceptgroup{'names'};
-	    }
-	}
+	&Apache::response::pick_foil_for_concept($target,
+						 ['value','text','location'],
+						 \%Apache::hint::rank,
+						 $parstack,$safeeval);
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -414,7 +375,7 @@ sub insert_conceptgroup {
 sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    if ($target eq 'web' || $target eq 'tex') {
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token,"Foil");
@@ -442,27 +403,45 @@ sub end_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $text ='';
     my $result = '';
-    if ($target eq 'web' || $target eq 'tex') {
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	$text=&Apache::lonxml::endredirection;
     }
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
 	my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
 	if ($value ne 'unused') {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
-	    my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
 	    if (!$name) { $name=$Apache::lonxml::curdepth; }
 	    &Apache::lonxml::debug("Using a name of :$name:");
+	    if (defined($Apache::response::foilnames{$name})) {
+		&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+	    }
+	    $Apache::response::foilnames{$name}++;
+	    my $location =&Apache::lonxml::get_param('location',$parstack,
+						     $safeeval);
 	    if ( $Apache::rankresponse::conceptgroup
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		$Apache::response::conceptgroup{"$name.text"} = $text;
+		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		} else {
+		    $Apache::response::conceptgroup{"$name.text"} = $text;
+		}
 		$Apache::response::conceptgroup{"$name.location"} = $location;
 	    } else {
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
-		$Apache::response::foilgroup{"$name.text"} = $text;
+		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		} else {
+		    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		    } else {
+			$Apache::response::foilgroup{"$name.text"} = $text;
+		    } 
+		}
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}