--- loncom/homework/matchresponse.pm	2003/02/20 08:57:51	1.2
+++ loncom/homework/matchresponse.pm	2003/02/20 09:30:42	1.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.2 2003/02/20 08:57:51 albertel Exp $
+# $Id: matchresponse.pm,v 1.3 2003/02/20 09:30:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,7 +102,8 @@ sub end_itemgroup {
     my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
     if ($randomize ne 'no' ) {
-	@names=&Math::Random::random_permutation(@names);
+	@names=&whichorder($#names+1,$randomize,0,
+			   \%Apache::response::itemgroup)
     }
     my %letter_name_map;
     my %name_letter_map;
@@ -135,12 +136,20 @@ sub start_item {
     if ($target eq 'web' ) {
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {
+	my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
+						 $safeeval,'-2');
 	$result=&Apache::edit::tag_start($target,$token,"Item");
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
-	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+	if ($randomize ne 'no') {
+	    $result.=&Apache::edit::select_arg('Location:','location',
+					       ['random','top','bottom'],
+					       $token);
+	}
+	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'name');
+						     $safeeval,'name',
+						     'location');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
     return $result;
@@ -156,11 +165,14 @@ sub end_item {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'edit') {
 	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:");
 	push @{ $Apache::response::itemgroup{'names'} }, $name;
 	$Apache::response::itemgroup{"$name.text"} = $text;
+	$Apache::response::itemgroup{"$name.location"} = $location;
     }
     if ($target eq 'edit') {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -217,7 +229,9 @@ sub displayanswers {
     my ($max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };
-    my @whichfoils = &whichfoils($max,$randomize);
+    my @whichfoils = &whichorder(&getfoilcounts($max),$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'} })) {
@@ -236,7 +250,9 @@ sub displayanswers {
 
 sub grade_response {
     my ($max,$randomize)=@_;
-    my (@whichfoils)=&whichfoils($max,$randomize);
+    my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
+				 &Apache::response::showallfoils(),
+				 \%Apache::response::foilgroup);
     if (!defined($ENV{'form.submitted'})) { return; }
     my %responsehash;
     my %grade;
@@ -293,7 +309,9 @@ sub grade_response {
 sub displayfoils {
     my ($target,$max,$randomize)=@_;
     my $result;
-    my (@whichfoils)=&whichfoils($max,$randomize);
+    my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
+				 &Apache::response::showallfoils(),
+				 \%Apache::response::foilgroup);
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];
@@ -355,37 +373,35 @@ sub getfoilcounts {
     return $count;
 }
 
-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'} };
+sub whichorder {
+    my ($max,$randomize,$showall,$hash)=@_;
+    #&Apache::lonxml::debug("man $max randomize $randomize");
+    if (!defined(@{ $$hash{'names'} })) { return; }
+    my @names = @{ $$hash{'names'} };
     my @whichopt =();
     my (%top,@toplist,%bottom,@bottomlist);
-    if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
+    if (!($showall || ($randomize eq 'no'))) {
 	my $current=0;
 	foreach my $name (@names) {
 	    $current++;
-	    if ($Apache::response::foilgroup{"$name.location"} eq 'top') {
+	    if ($$hash{"$name.location"} eq 'top') {
 		$top{$name}=$current;
-	    } elsif ($Apache::response::foilgroup{"$name.location"} eq
-		     'bottom') {
+	    } elsif ($$hash{"$name.location"} eq 'bottom') {
 		$bottom{$name}=$current;
 	    }
 	}
     }
     while ((($#whichopt+1) < $max) && ($#names > -1)) {
-#	&Apache::lonxml::debug("Have $#whichopt max is $max");
+	#&Apache::lonxml::debug("Have $#whichopt max is $max");
 	my $aopt;
-	if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
+	if ($showall || ($randomize eq 'no')) {
 	    $aopt=0;
 	} else {
 	    $aopt=int(&Math::Random::random_uniform() * ($#names+1));
 	}
-#	&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
+	#&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
 	$aopt=splice(@names,$aopt,1);
-#	&Apache::lonxml::debug("Picked $aopt");
+	#&Apache::lonxml::debug("Picked $aopt");
 	if ($top{$aopt}) {
 	    $toplist[$top{$aopt}]=$aopt;
 	} elsif ($bottom{$aopt}) {