--- loncom/homework/grades.pm	2007/09/05 00:22:20	1.428.2.2
+++ loncom/homework/grades.pm	2007/08/18 00:57:25	1.429
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.428.2.2 2007/09/05 00:22:20 albertel Exp $
+# $Id: grades.pm,v 1.429 2007/08/18 00:57:25 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,7 @@ use LONCAPA;
 
 use POSIX qw(floor);
 
-my %perm;
+my %perm=();
 
 # ----- These first few routines are general use routines.----
 #
@@ -194,54 +194,22 @@ sub showResourceInfo {
     return $result,$responseType,$hdgrade,$partlist,$handgrade;
 }
 
-sub reset_caches {
-    &reset_analyze_cache();
-    &reset_perm();
-}
-
-{
-    my %analyze_cache;
-
-    sub reset_analyze_cache {
-	undef(%analyze_cache);
-    }
 
-    sub get_analyze {
-	my ($symb,$uname,$udom)=@_;
-	my $key = "$symb\0$uname\0$udom";
-	return $analyze_cache{$key} if (exists($analyze_cache{$key}));
-
-	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
-	$url=&Apache::lonnet::clutter($url);
-	my $subresult=&Apache::lonnet::ssi($url,
-					   ('grade_target' => 'analyze'),
-					   ('grade_domain' => $udom),
-					   ('grade_symb' => $symb),
-					   ('grade_courseid' => 
-					    $env{'request.course.id'}),
-					   ('grade_username' => $uname));
-	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
-	my %analyze=&Apache::lonnet::str2hash($subresult);
-	return $analyze_cache{$key} = \%analyze;
-    }
-
-    sub get_order {
-	my ($partid,$respid,$symb,$uname,$udom)=@_;
-	my $analyze = &get_analyze($symb,$uname,$udom);
-	return $analyze->{"$partid.$respid.shown"};
-    }
-
-    sub get_radiobutton_correct_foil {
-	my ($partid,$respid,$symb,$uname,$udom)=@_;
-	my $analyze = &get_analyze($symb,$uname,$udom);
-	foreach my $foil (@{&get_order($partid,$respid,$symb,$uname,$udom)}) {
-	    if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
-		return $foil;
-	    }
-	}
-    }
+sub get_order {
+    my ($partid,$respid,$symb,$uname,$udom)=@_;
+    my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+    $url=&Apache::lonnet::clutter($url);
+    my $subresult=&Apache::lonnet::ssi($url,
+				       ('grade_target' => 'analyze'),
+				       ('grade_domain' => $udom),
+				       ('grade_symb' => $symb),
+				       ('grade_courseid' => 
+					        $env{'request.course.id'}),
+				       ('grade_username' => $uname));
+    (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
+    my %analyze=&Apache::lonnet::str2hash($subresult);
+    return ($analyze{"$partid.$respid.shown"});
 }
-
 #--- Clean response type for display
 #--- Currently filters option/rank/radiobutton/match/essay/Task
 #        response types only.
@@ -290,11 +258,11 @@ sub cleanRecord {
     } elsif ($response eq 'radiobutton') {
 	my %answer=&Apache::lonnet::str2hash($answer);
 	my ($toprow,$bottomrow);
-	my $correct = 
-	    &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom);
-	foreach my $foil (@$order) {
+	my $correct=($order->[0])+1;
+	for (my $i=1;$i<=$#$order;$i++) {
+	    my $foil=$order->[$i];
 	    if (exists($answer{$foil})) {
-		if ($foil eq $correct) {
+		if ($i == $correct) {
 		    $toprow.='<td><b>true</b></td>';
 		} else {
 		    $toprow.='<td><i>true</i></td>';
@@ -6964,7 +6932,7 @@ GRADINGMENUJS
 
     $result.='<table width="100%" border="0">';
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
-	'&nbsp;'.&mt('Select Section').': <select name="section">'."\n";
+	'&nbsp;'.&mt('Select Section').': <select name="section" multiple="multiple" size="3">'."\n";
     if (ref($sections)) {
 	foreach (sort (@$sections)) {
 	    $result.='<option value="'.$_.'" '.
@@ -7072,10 +7040,9 @@ sub gather_clicker_ids {
     # Set up a couple variables.
     my $username_idx = &Apache::loncoursedata::CL_SNAME();
     my $domain_idx   = &Apache::loncoursedata::CL_SDOM();
-    my $status_idx   = &Apache::loncoursedata::CL_STATUS();
 
     foreach my $student (keys(%$classlist)) {
-        if ($classlist->{$student}->[$status_idx] ne 'Active') { next; }
+
         my $username = $classlist->{$student}->[$username_idx];
         my $domain   = $classlist->{$student}->[$domain_idx];
         my $clickers =
@@ -7336,21 +7303,8 @@ ENDHEADER
           $result.="\n".'<input type="hidden" name="correct:'.$correct_count.':'.$correct_ids{$id}.'" value="'.$responses{$id}.'" />';
           $correct_count++;
        } elsif ($clicker_ids{$id}) {
-          if ($clicker_ids{$id}=~/\,/) {
-# More than one user with the same clicker!
-             $result.="\n<hr />".&mt('Clicker registered more than once').": <tt>".$id."</tt><br />";
-             $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
-                           "<select name='multi".$id."'>";
-             foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {
-                 $result.="<option value='".$reguser."'>".&Apache::loncommon::plainname(split(/\:/,$reguser)).' ('.$reguser.')</option>';
-             }
-             $result.='</select>';
-             $unknown_count++;
-          } else {
-# Good: found one and only one user with the right clicker
-             $result.="\n".'<input type="hidden" name="student:'.$clicker_ids{$id}.'" value="'.$responses{$id}.'" />';
-             $student_count++;
-          }
+          $result.="\n".'<input type="hidden" name="student:'.$clicker_ids{$id}.'" value="'.$responses{$id}.'" />';
+          $student_count++;
        } else {
           $result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
           $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
@@ -7501,8 +7455,6 @@ ENDHEADER
           my $id=$1;
           if (($env{'form.uname'.$id}) && ($env{'form.udom'.$id})) {
              $user=$env{'form.uname'.$id}.':'.$env{'form.udom'.$id};
-          } elsif ($env{'form.multi'.$id}) {
-             $user=$env{'form.multi'.$id};
           }
        }
        if ($user) { 
@@ -7548,7 +7500,7 @@ ENDHEADER
 sub handler {
     my $request=$_[0];
 
-    &reset_caches();
+    &reset_perm();
     if ($env{'browser.mathml'}) {
 	&Apache::loncommon::content_type($request,'text/xml');
     } else {
@@ -7661,7 +7613,6 @@ sub handler {
 	}
     }
     $request->print(&Apache::loncommon::end_page());
-    &reset_caches();
     return '';
 }