--- loncom/homework/matchresponse.pm	2005/02/12 01:13:56	1.51
+++ loncom/homework/matchresponse.pm	2008/08/08 16:37:13	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.51 2005/02/12 01:13:56 albertel Exp $
+# $Id: matchresponse.pm,v 1.70 2008/08/08 16:37:13 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,7 @@ use HTML::Entities();
 use Math::Random();
 use Apache::optionresponse();
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -69,7 +70,10 @@ sub start_matchresponse {
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'analyze') {
 	my $part_id="$Apache::inputtags::part.$id";
+        $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse';
 	push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
+	      1);
     }
     return $result;
 }
@@ -148,7 +152,8 @@ sub end_itemgroup {
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);
     if ($target eq 'web') {
-	my $table='<table>';
+	
+	my $table='<br /><table>'; # extra space to match what latex does.
 	my $i=0;
 	if ($direction eq 'horizontal') { $table .='<tr>';}
 	foreach my $name (@names) {
@@ -161,11 +166,12 @@ sub end_itemgroup {
 	if ($direction eq 'horizontal') { $table .='</tr>';}
 	$table.='</table>';
 	$Apache::matchresponse::itemtable{'display'}=$table;
+	$Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {
 	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;
+	    # $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
 	    $table.='\item['.$alphabet[$i].'] '.
 		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
@@ -173,6 +179,7 @@ sub end_itemgroup {
 	$table.=' \end{description}  \strut ';
 	if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
 	$Apache::matchresponse::itemtable{'display'}=$table;
+	$Apache::lonxml::post_evaluate=0;
     }
     return $result;
 }
@@ -215,7 +222,7 @@ sub end_item {
 	my $location=&Apache::lonxml::get_param('location',$parstack,
 						$safeeval);
 	&Apache::lonxml::debug("Got a name of :$name:");
-	if (!$name) { $name=$Apache::lonxml::curdepth; }
+	if ($name eq "") { $name=$Apache::lonxml::curdepth; }
 	&Apache::lonxml::debug("Using a name of :$name:");
 	push @{ $Apache::response::itemgroup{'names'} }, $name;
 	$Apache::response::itemgroup{"$name.text"} = $text;
@@ -255,12 +262,16 @@ sub start_foilgroup {
 sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    my $part        = $Apache::inputtags::part;
+    my $response_id = $Apache::inputtags::response[-1];
+
     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');
 	if ($target eq 'web' || $target eq 'tex') {
 	    $result=&displayfoils($target,$max,$randomize);
+	    $Apache::lonxml::post_evaluate=0;
 	} elsif ($target eq 'answer' ) {
 	    $result=&displayanswers($max,$randomize);
 	} elsif ( $target eq 'grade') {
@@ -271,7 +282,12 @@ sub end_foilgroup {
 						 ['text','value','location']);
 	    #FIXME need to store options in some way
 	}
-	&Apache::lonxml::increment_counter(&getfoilcounts($max));
+	&Apache::lonxml::increment_counter(&getfoilcounts($max), 
+					   "$part.$response_id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
+
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -295,18 +311,30 @@ sub displayanswers {
 						   $randomize,
 					  &Apache::response::showallfoils(),
 					 \%Apache::response::foilgroup);
-    my $result=&Apache::response::answer_header('matchresponse');
     my %name_letter_map;
     if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
 	%name_letter_map=
 	    %{ $Apache::response::itemgroup{'name_letter_map'} };
     }
-    foreach my $name (@whichfoils) {
-	my $value_name=$Apache::response::foilgroup{$name.'.value'};
-	my $letter=$name_letter_map{$value_name};
-	$result.=&Apache::response::answer_part('matchresponse',$letter);
+    my $result;
+    if ($Apache::lonhomework::type eq 'exam') {
+	my $i=0;
+	foreach my $name (@whichfoils) {
+	    $result.=&Apache::response::answer_header('matchresponse',$i++);
+	    my $value_name=$Apache::response::foilgroup{$name.'.value'};
+	    my $letter=$name_letter_map{$value_name};
+	    $result.=&Apache::response::answer_part('matchresponse',$letter);
+	    $result.=&Apache::response::answer_footer('matchresponse');
+	}
+    } else {
+	$result=&Apache::response::answer_header('matchresponse');
+	foreach my $name (@whichfoils) {
+	    my $value_name=$Apache::response::foilgroup{$name.'.value'};
+	    my $letter=$name_letter_map{$value_name};
+	    $result.=&Apache::response::answer_part('matchresponse',$letter);
+	}
+	$result.=&Apache::response::answer_footer('matchresponse');
     }
-    $result.=&Apache::response::answer_footer('matchresponse');
     return $result;
 }
 
@@ -398,6 +426,24 @@ sub grade_response {
     }
 }
 
+sub format_prior_answer {
+    my ($mode,$answer,$other_data) = @_;
+    my %answer      =&Apache::lonnet::str2hash($answer);
+    my $foil_order  =$other_data->[0];
+    my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
+    my @items       =&Apache::lonnet::str2array($other_data->[2]);
+    my $output;
+    
+    foreach my $name (@{ $foil_order }) {
+	my $item=shift(@items);
+	$output .= '<tr><td>'.$item.'</td></tr>';
+    }
+    return if (!defined($output));
+
+    $output = '<table class="LC_prior_match">'.$output.'</table>';
+    return $output;
+}
+
 sub itemdisplay {
     my ($location)=@_;
     if ($location eq 'top' &&
@@ -409,8 +455,11 @@ sub itemdisplay {
     }
     return undef;
 }
+
 sub displayfoils {
     my ($target,$max,$randomize)=@_;
+    my ($tabsize, $lefttabsize, $righttabsize);
+
     my $result;
     my $question;
     my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
@@ -437,7 +486,7 @@ sub displayfoils {
 	    if ($target eq 'tex') {
 		$question.=' \\\\ '.$letter.':'.$text;
 	    } else {
-		$question.='<br />'.$letter.':'.$text;
+		$question.='<br /><b>'.$letter.':</b> '.$text;
 	    }
 	}
     } else {
@@ -470,11 +519,31 @@ sub displayfoils {
 		}
 	    }
 	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
-	        $optionlist='<select name="HWVAL_'.
+	        $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+		  $part.'\');" name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
+	    #
+            #  Factor out the tex computations of the left/right 1/2 minipage
+	    #  widths for left or right positioning.  This allows us
+	    #  to, if necessary constrain the bubble widths:
+	    #
+	    if ($target eq 'tex'   &&
+		(&itemdisplay('left') || &itemdisplay('right'))) {
+		$tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
+		($lefttabsize,$righttabsize)=(0,0);
+		if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+		    $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+		    $lefttabsize=$tabsize*$1/100;	
+		    $righttabsize=0.95*($tabsize-$lefttabsize);
+		} else {
+		    $tabsize=~/(\d+\.?\d*)/;
+		    $lefttabsize=$1/2.1;
+		    $righttabsize=0.95*($1-$lefttabsize);
+		}
+	    }
 	    if ($target ne 'tex') {
 		if ($Apache::lonhomework::type ne 'exam') {
 		    $question.="<br />\n".$optionlist.$text;
@@ -486,11 +555,22 @@ sub displayfoils {
 		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
 		}
 	    } else {		
+		# Note that if left or right positioned, we must
+		# confine the bubbles to righttabsize:
+		#
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
+		    $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
+			.'\item \hskip -3mm \textbf{'.$internal_counter.'}';
+		    if (&itemdisplay('left') || &itemdisplay('right')) {
+			$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
+		    }
+		    else {
+			$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
+		    }
+		    $question .= '\end{list} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
 		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
@@ -510,17 +590,6 @@ sub displayfoils {
 	    $result='<table><tr><td valign="top">'.$question.
 		'</td><td valign="top">'.$result.'</td></tr></table>';
 	} else {
-	    my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
-	    my ($lefttabsize,$righttabsize)=(0,0);
-	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
-		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
-		$lefttabsize=$tabsize*$1/100;	
-		$righttabsize=0.95*($tabsize-$lefttabsize);
-	    } else {
-		$tabsize=~/(\d+\.?\d*)/;
-		$lefttabsize=$1/2.1;
-		$righttabsize=0.95*($1-$lefttabsize);
-	    }
 	    $lefttabsize.=' mm ';
 	    $righttabsize.=' mm ';
 	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
@@ -532,22 +601,17 @@ sub displayfoils {
 	    $result='<table><tr><td valign="top">'.$result.
 		'</td><td valign="top">'.$question.'</td></tr></table>';
 	} else {
-	    my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
-	    my ($lefttabsize,$righttabsize)=(0,0);
-	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
-		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
-		$lefttabsize=$tabsize*$1/100;	
-		$righttabsize=0.95*($tabsize-$lefttabsize);
-	    } else {
-		$tabsize=~/(\d+\.?\d*)/;
-		$lefttabsize=$1/2.1;
-		$righttabsize=0.95*($1-$lefttabsize);
-	    }
 	    $lefttabsize.=' mm ';
 	    $righttabsize.=' mm ';
 	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
 	}
     }
+    if ($target eq 'web') {
+	&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
+						  [\@whichfoils,
+						   'submissiongrading',
+						   'submissionitems']);
+    }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;
 }
@@ -655,12 +719,12 @@ sub end_foil {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
 	    if (!$name) {
-		&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+		&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
 		$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::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
 	    }
 	    $Apache::response::foilnames{$name}++;
 	    my $location =&Apache::lonxml::get_param('location',$parstack,