--- loncom/homework/matchresponse.pm	2003/11/07 08:52:20	1.30
+++ loncom/homework/matchresponse.pm	2004/03/08 23:23:04	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.30 2003/11/07 08:52:20 albertel Exp $
+# $Id: matchresponse.pm,v 1.37 2004/03/08 23:23:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,8 @@ 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'));
@@ -46,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' ) {
@@ -80,6 +82,7 @@ sub end_matchresponse {
     pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::matchresponse',
 				('foilgroup','foil','conceptgroup'));
+    undef(%Apache::response::foilnames);
     return $result;
 }
 
@@ -306,7 +309,7 @@ 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=
@@ -314,13 +317,13 @@ sub grade_response {
     }
     my @items;
     foreach my $name (@whichfoils) {
-	my $response = &Apache::response::getresponse($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 {
@@ -338,26 +341,41 @@ sub grade_response {
     my $gradestr   =&Apache::lonnet::hash2str(%grade);
     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 {
@@ -404,7 +422,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"};
@@ -465,11 +483,19 @@ 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 {
+	    $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$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 {
+	    $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}';
+	}
     }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;
@@ -569,10 +595,14 @@ sub end_foil {
 	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));
+	    }
+	    my $location =&Apache::lonxml::get_param('location',$parstack,
+						     $safeeval);
 	    if ( $Apache::matchresponse::conceptgroup
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;