--- loncom/homework/grades.pm	2003/08/21 18:21:39	1.135
+++ loncom/homework/grades.pm	2003/09/19 21:54:07	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.135 2003/08/21 18:21:39 bowersj2 Exp $
+# $Id: grades.pm,v 1.140 2003/09/19 21:54:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -218,7 +218,8 @@ sub commonJSfunctions {
 		}
 	    }
 	} else {
-	    if (selectOne.selected) return selectOne.value;
+            // only one value it must be the selected one
+	    return selectOne.value;
 	}
     }
 </script>
@@ -2334,18 +2335,17 @@ sub editgrades {
 		$newrecord{'resource.'.$_.'.awarded'} = 0;
 		$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 		$updateflag = 1;
+	    } elsif (!($old_part eq $partial && $old_score eq $score)) {
+		$updateflag = 1;
+		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
+		$newrecord{'resource.'.$_.'.solved'}   = $score;
+		$rec_update++;
 	    }
 
 	    $line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
 		'<td align="center">'.$awarded.
 		($score eq 'excused' ? $score : '').'&nbsp;</td>';
 
-	    if (!($old_part eq $partial && $old_score eq $score)) {
-		$updateflag = 1;
-		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
-		$newrecord{'resource.'.$_.'.solved'}   = $score;
-		$rec_update++;
-	    }
 
 	    my $partid=$_;
 	    foreach my $stores (@parts) {
@@ -2733,7 +2733,9 @@ LISTJAVASCRIPT
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
     $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
     my ($titles,$symbx) = &getSymbMap($request);
-    my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/); 
+    my ($curpage) =&Apache::lonnet::decode_symb($symb); 
+#    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
+#    my $type=($curpage =~ /\.(page|sequence)/);
     my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -2851,7 +2853,7 @@ sub displayPage {
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
+    my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
     my $iterator = $navmap->getIterator($map->map_start(),
@@ -3013,7 +3015,7 @@ sub updateGradeByPage {
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
+    my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
     my $iterator = $navmap->getIterator($map->map_start(),
@@ -3135,7 +3137,7 @@ sub getSequenceDropDown {
     my ($request,$symb)=@_;
     my $result='<select name="selectpage">'."\n";
     my ($titles,$symbx) = &getSymbMap($request);
-    my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/); 
+    my ($curpage)=&Apache::lonnet::decode_symb($symb); 
     my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -3299,14 +3301,23 @@ sub scantron_parse_scanline {
 }
 
 sub scantron_add_delay {
+    my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
+    Apache->request->print('add_delay_error '.$_[2] );
+    push(@$delayqueue,
+	 {'line' => $scanline, 'emsg' => $errormessage,
+	  'ecode' => $errorcode }
+	 );
 }
 
 sub scantron_find_student {
     my ($scantron_record,$idmap)=@_;
     my $scanID=$$scantron_record{'scantron.ID'};
     foreach my $id (keys(%$idmap)) {
-	Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
-	if (lc($id) eq lc($scanID)) { Apache->request->print('success');return $$idmap{$id}; }
+	#Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
+	if (lc($id) eq lc($scanID)) {
+	    #Apache->request->print('success');
+	    return $$idmap{$id};
+	}
     }
     return undef;
 }
@@ -3319,9 +3330,16 @@ sub scantron_filter {
     return 0;
 }
 
+#FIXME I think I am doing this in the wrong order, I think it would be
+#better to make a several passes analyzing all of the lines in the
+#file for common errors wrong/invalid PID/username duplicated
+#PID/username, missing bubbles, double bubbles, missing/invalid CODE
+#and then get the instructor to fix all of these errors, then grade
+#the corrected one, I'll still need to catch error conditions, but
+#maybe most will taken care even before we start
 sub scantron_process_students {
     my ($r) = @_;
-    my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
+    my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($ENV{'form.selectpage'});
     my ($symb,$url)=&get_symb_and_url($r);
     if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb,$url);
@@ -3334,7 +3352,7 @@ sub scantron_process_students {
     my $navmap=Apache::lonnavmaps::navmap->new();
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    $r->print("geto ".scalar(@resources)."<br />");
+#    $r->print("geto ".scalar(@resources)."<br />");
     my $result= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
   <input type="hidden" name="command" value="scantron_configphase" />
@@ -3343,29 +3361,36 @@ SCANTRONFORM
     $r->print($result);
 
     my @delayqueue;
-    my $totalcorrect;
-    my $totalincorrect;
-
+    my %completedstudents;
+    
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,
 	           'Scantron Status','Scantron Progress',scalar(@scanlines));
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+					  'Processing first student');
+    my $start=&Time::HiRes::time();
     foreach my $line (@scanlines) {
-	my $studentcorrect;
-	my $studentincorrect;
+	$r->print('<pre>line is'.$line.'</pre>');
 
 	chomp($line);
 	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
 	my ($uname,$udom);
-	if ($uname=&scantron_find_student($scan_record,\%idmap)) {
+	unless ($uname=&scantron_find_student($scan_record,\%idmap)) {
+	    &scantron_add_delay(\@delayqueue,$line,
+				'Unable to find a student that matches',1);
+	    next;
+	}
+	if (exists $completedstudents{$uname}) {
 	    &scantron_add_delay(\@delayqueue,$line,
-				'Unable to find a student that matches');
+				'Student '.$uname.' has multiple sheets',2);
+	    next;
 	}
 	$r->print('<pre>doing studnet'.$uname.'</pre>');
 	($uname,$udom)=split(/:/,$uname);
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonnet::appenv(%$scan_record);
 #    &Apache::lonhomework::showhash(%ENV);
-    $Apache::lonxml::debug=1;
-	&Apache::lonxml::debug("line is $line");
+#    $Apache::lonxml::debug=1;
+#	&Apache::lonxml::debug("line is $line");
 	
 	    my $i=0;
 	foreach my $resource (@resources) {
@@ -3377,31 +3402,31 @@ SCANTRONFORM
 				  'grade_domain'  =>$udom,
 				  'grade_courseid'=>$ENV{'request.course.id'},
 				  'grade_symb'    =>$resource->symb()));
-	    my %score=&Apache::lonnet::restore($resource->symb(),
-					       $ENV{'request.course.id'},
-					       $udom,$uname);
-	    foreach my $part ($resource->{PARTS}) {
-		if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
-		    $studentcorrect++;
-		    $totalcorrect++;
-		} else {
-		    $studentincorrect++;
-		    $totalincorrect++;
-		}
-	    }
-	    $r->print('<pre>'.
-		      $resource->symb().'-'.
-		      $resource->src().'-'.'</pre>result is'.$result);
-	    &Apache::lonhomework::showhash(%score);
+#	    my %score=&Apache::lonnet::restore($resource->symb(),
+#					       $ENV{'request.course.id'},
+#					       $udom,$uname);
+#	    foreach my $part ($resource->{PARTS}) {
+#		if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
+#		    $studentcorrect++;
+#		    $totalcorrect++;
+#		} else {
+#		    $studentincorrect++;
+#		    $totalincorrect++;
+#		}
+#	    }
+#	    $r->print('<pre>'.
+#		      $resource->symb().'-'.
+#		      $resource->src().'-'.'</pre>result is'.$result);
+#	    &Apache::lonhomework::showhash(%score);
 	#    if ($i eq 3) {last;}
 	}
+	$completedstudents{$uname}={'line'=>$line};
+    } continue {
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonnet::delenv('scantron\.');
 	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-             'last student Who got a '.$studentcorrect.' correct and '.
-	     $studentincorrect.' incorrect. The class has gotten '.
-             $totalcorrect.' correct and '.$totalincorrect.' incorrect');
-	last;
+						 'last student');
+	#last;
 	#FIXME
 	#get iterator for $sequence
 	#foreach question 'submit' the students answer to the server
@@ -3409,7 +3434,11 @@ SCANTRONFORM
 	#   generate data to pass back that includes grade recevied
 	#}
     }
-    $Apache::lonxml::debug=0;
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    my $lasttime = &Time::HiRes::time()-$start;
+    $r->print("<p>took $lasttime</p>");
+
+    #$Apache::lonxml::debug=0;
     foreach my $delay (@delayqueue) {
 	#FIXME
 	#print out each delayed student with interface to select how
@@ -3607,7 +3636,7 @@ sub handler {
     my $command=$ENV{'form.command'};
     if (!$url) {
 	my ($temp1,$temp2);
-	($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+	($temp1,$temp2,$ENV{'form.url'})=&Apache::lonnet::decode_symb($symb);
 	$url = $ENV{'form.url'};
     }
     &send_header($request);
@@ -3620,7 +3649,7 @@ sub handler {
 		my ($tsymb,$tuname,$tudom,$tcrsid)=
 		    &Apache::lonnet::checkin($token);
 		if ($tsymb) {
-		    my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
 		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
 			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
 					  ('grade_username' => $tuname,