--- loncom/homework/matchresponse.pm	2003/09/22 20:49:01	1.23
+++ loncom/homework/matchresponse.pm	2004/07/02 08:20:55	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.23 2003/09/22 20:49:01 albertel Exp $
+# $Id: matchresponse.pm,v 1.42 2004/07/02 08:20:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,13 +25,13 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
 
 package Apache::matchresponse;
 use strict;
 use HTML::Entities();
 use Math::Random();
-use Apache::optionresponse;
+use Apache::optionresponse();
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -47,6 +47,7 @@ sub start_matchresponse {
     push (@Apache::lonxml::namespace,'matchresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);
     %Apache::hint::match=();
+    undef(%Apache::response::foilnames);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('matchresponse');
     } elsif ($target eq 'edit' ) {
@@ -66,6 +67,9 @@ sub start_matchresponse {
 						     $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;
 }
@@ -78,6 +82,7 @@ sub end_matchresponse {
     pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::matchresponse',
 				('foilgroup','foil','conceptgroup'));
+    undef(%Apache::response::foilnames);
     return $result;
 }
 
@@ -121,6 +126,10 @@ sub end_itemgroup {
 	@names=&Apache::response::whichorder($#names+1,$randomize,0,
 					 \%Apache::response::itemgroup);
     }
+    if ($target eq 'analyze') {
+	my $partid="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	push (@{ $Apache::lonhomework::analyze{"$partid.items"} }, @names);
+    }
     my %letter_name_map;
     my %name_letter_map;
     my @alphabet=('A'..'Z');
@@ -144,7 +153,7 @@ sub end_itemgroup {
 	$table.='</table>';
 	$Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {
-	my $table=' \begin{description} ';
+	my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
 	my $i=0;
 	foreach my $name (@names) {
 	    $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
@@ -152,7 +161,8 @@ sub end_itemgroup {
 		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
 	}
-	$table.=' \end{description} \strut ';
+	$table.=' \end{description}  \strut ';
+	if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
 	$Apache::matchresponse::itemtable{'display'}=$table;
     }
     return $result;
@@ -161,7 +171,7 @@ sub end_itemgroup {
 sub start_item {
     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') {
 	my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
@@ -187,11 +197,11 @@ sub end_item {
     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 'edit' || $target eq 'tex') {
+	$target eq 'edit' || $target eq 'tex' || $target eq 'analyze') {
 	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	my $location=&Apache::lonxml::get_param('location',$parstack,
 						$safeeval);
@@ -222,7 +232,7 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::matchresponse::conceptgroup=0;
-    &Apache::response::setrandomnumber();
+    &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {
 	$result.=&Apache::edit::start_table($token)
 	    ."<tr><td>Collection Of Foils</td><td>Delete:"
@@ -236,7 +246,7 @@ sub start_foilgroup {
 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');
@@ -246,14 +256,28 @@ sub end_foilgroup {
 	    $result=&displayanswers($max,$randomize);
 	} elsif ( $target eq 'grade') {
 	    &grade_response($max,$randomize);
+	} elsif ( $target eq 'analyze') {
+	    my @shown=&whichfoils($max,$randomize);
+	    &Apache::response::analyze_store_foilgroup(\@shown,
+						 ['text','value','location']);
+	    #FIXME need to store options in some way
 	}
 	&Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
+    &Apache::response::poprandomnumber();
     return $result;
 }
 
+sub whichfoils {
+    my ($max,$randomize)=@_;
+    return &Apache::response::whichorder(&getfoilcounts($max),
+					 $randomize,
+					 &Apache::response::showallfoils(),
+					 \%Apache::response::foilgroup);
+}
+
 sub displayanswers {
     my ($max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
@@ -287,19 +311,21 @@ 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 %letter_name_map;
     if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
 	%letter_name_map=
 	    %{ $Apache::response::itemgroup{'letter_name_map'} };
     }
+    my @items;
     foreach my $name (@whichfoils) {
-	my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+	my $response = &Apache::response::getresponse($temp,'letter');
+	push(@items,$response);
 	my $responsename = $letter_name_map{$response};
-	$responsehash{$name}=$responsename;
 	my $value=$Apache::response::foilgroup{$name.'.value'};
 	if ( $response =~ /[^\s]/) {
-	    &Apache::lonxml::debug("submitted a $response for $value<br />\n");
+	    $responsehash{$name}=$responsename;
+	    &Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n");
 	    if ($value eq $responsename) {
 		$grade{$name}='1'; $right++;
 	    } else {
@@ -313,28 +339,45 @@ sub grade_response {
     my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];
     my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+    my $itemstr    =&Apache::lonnet::array2str(@items);
     my $gradestr   =&Apache::lonnet::hash2str(%grade);
-    my %previous =&Apache::response::check_for_previous($responsestr,
-							$part,$id);
+    my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
     &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored ");
-    my $ad;
-    if ($wrong==0 && $ignored==0) {
-	$ad='EXACT_ANS';
-    } elsif ($wrong==0 && $right==0) {
-	#nothing submitted
-    } else {
-	if ($ignored==0) {
-	    $ad='INCORRECT';
-	} else {
-	    $ad='MISSING_ANSWER';
-	}
-    }
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	$responsestr;
+    $Apache::lonhomework::results{"resource.$part.$id.submissionitems"}=
+	$itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
 	$gradestr;
-    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
-    &Apache::response::handle_previous(\%previous,$ad);
+    if (!$Apache::lonhomework::scantronmode) {
+	my $ad;
+	if ($wrong==0 && $ignored==0) {
+	    $ad='EXACT_ANS';
+	} elsif ($wrong==0 && $right==0) {
+	    #nothing submitted
+	} else {
+	    if ($ignored==0) {
+		$ad='INCORRECT';
+	    } else {
+		$ad='MISSING_ANSWER';
+	    }
+	}
+	$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+	&Apache::response::handle_previous(\%previous,$ad);
+    } else {
+	my $ad;
+	if ($wrong==0 && $right==0) {
+	    #nothing submitted
+	} else {
+	    $ad='ASSIGNED_SCORE';
+	    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+		$ad;
+	    $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+		$right/(scalar(@whichfoils));
+	    $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
+		scalar(@whichfoils);
+	}
+    }
 }
 
 sub itemdisplay {
@@ -358,7 +401,6 @@ sub displayfoils {
 				           \%Apache::response::foilgroup);
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-    my $status=$Apache::inputtags::status[-1];
     my %letter_name_map;
     if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
 	%letter_name_map=
@@ -369,7 +411,7 @@ sub displayfoils {
 	%name_letter_map=
 	    %{ $Apache::response::itemgroup{'name_letter_map'} };
     }
-    if ( &Apache::response::show_answer() ) {
+    if ( &Apache::response::show_answer() && ($target ne 'tex')) {
 	foreach my $name (@whichfoils) {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -382,7 +424,7 @@ sub displayfoils {
 	}
     } 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"};
@@ -422,14 +464,15 @@ sub displayfoils {
 		    $question.='<br />'.$text."\n";
 		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp);
+		    my @blank;
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
 		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
@@ -443,11 +486,27 @@ sub displayfoils {
     } elsif ($result=&itemdisplay('bottom')) {
 	$result=$question.$result;
     } elsif ($result=&itemdisplay('right')) {
-	$result='<table><tr><td>'.$question.'</td><td>'.$result.
-	    '</td></tr></table>';
+	if ($target ne 'tex') {
+	    $result='<table><tr><td>'.$question.'</td><td>'.$result.
+		'</td></tr></table>';
+	} else {
+	    my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+	    $tabsize=~/(\d+\.?\d*)/;
+	    $tabsize=$1/2.1;
+	    $tabsize.=' mm ';
+	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}\end{tabular}';
+	}
     } elsif ($result=&itemdisplay('left')) {
-	$result='<table><tr><td>'.$result.'</td><td>'.$question.
-	    '</td></tr></table>';
+	if ($target ne 'tex') {
+	    $result='<table><tr><td>'.$result.'</td><td>'.$question.
+		'</td></tr></table>';
+	} else {
+	    my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+	    $tabsize=~/(\d+\.?\d*)/;
+	    $tabsize=$1/2.1;
+	    $tabsize.=' mm ';
+	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}\end{tabular}';
+	}
     }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;
@@ -487,31 +546,12 @@ sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::matchresponse::conceptgroup=0;
     my $result='';
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
-	#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::match{"$part_id.concepts"} },
-		     $concept);
-		$Apache::hint::match{"$part_id.concept.$concept"}=
-		    $Apache::response::conceptgroup{'names'};
-	    }
-	}
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
+	&Apache::response::pick_foil_for_concept($target,
+						 ['value','text','location'],
+						 \%Apache::hint::match,
+						 $parstack,$safeeval);
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -526,7 +566,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");
@@ -558,17 +598,23 @@ 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::matchresponse::conceptgroup
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
@@ -590,7 +636,7 @@ sub end_foil {
 		    }
 		} else {
 		    if ($target eq 'tex') {
-			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+			$Apache::response::foilgroup{"$name.text"} = $text;
 		    } else {
 			$Apache::response::foilgroup{"$name.text"} = $text;
 		    }