--- loncom/homework/grades.pm	2003/09/25 02:46:19	1.130.2.1.2.2
+++ loncom/homework/grades.pm	2003/08/21 18:21:39	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.130.2.1.2.2 2003/09/25 02:46:19 albertel Exp $
+# $Id: grades.pm,v 1.135 2003/08/21 18:21:39 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -517,8 +517,8 @@ LISTJAVASCRIPT
     my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
     $ENV{'form.Status'} = $saveStatus;
 
-    $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
-	'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+    $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only'."\n".
+	'<input type="radio" name="lastSub" value="last" /> last submission & parts info'."\n".
 	'<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
 	'<input type="radio" name="lastSub" value="all" /> all details'."\n".
 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
@@ -544,7 +544,7 @@ LISTJAVASCRIPT
     $gradeTable.='<input type="button" '."\n".
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
 	'value="Next->" />'."\n";
-
+    $gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';
     my (undef, undef, $fullname) = &getclasslist($getsec,'1');  
     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">';
@@ -1461,13 +1461,20 @@ KEYWORDS
 				my ($ressub,$subval) = split(/:/,$_,2);
                             # Similarity check
 				my $similar='';
-				my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
-				if ($osim) {
-				    $osim=int($osim*100.0);
-				    $similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
-					'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
-					'</font></h3><blockquote><i>'.
-					&keywords_highlight($oessay).'</i></blockquote><hr />';
+				my $oname;
+				my $odom;
+				my $ocrsid;
+				my $oessay;
+				my $osim;
+				if($ENV{'form.checkPlag'}){
+				    ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
+				    if ($osim) {
+					$osim=int($osim*100.0);
+					$similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
+					    '% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
+					    '</font></h3><blockquote><i>'.
+					    &keywords_highlight($oessay).'</i></blockquote><hr />';
+				    }
 				}
 				$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
 				    $partid.'</b> <font color="#999999">( ID '.$respid.
@@ -1480,7 +1487,7 @@ KEYWORDS
 				     'this file may contain virusses</font><br />':'').
 				     '<b>Submitted Answer: </b>'.
 				     &cleanRecord($subval,$responsetype,$symb).
-				      '<br /><br />'.$similar."\n"
+				     '<br /><br />'.$similar."\n"
 				     if ($ENV{'form.lastSub'} eq 'lastonly' || 
 					 ($ENV{'form.lastSub'} eq 'hdgrade' && 
 					  $$handgrade{$part} =~ /:yes$/));
@@ -2798,9 +2805,7 @@ LISTJAVASCRIPT
 
 sub getSymbMap {
     my ($request) = @_;
-    my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
-						  $ENV{'request.course.fn'}.'_parms.db');
-#    $navmap->init();
+    my $navmap = Apache::lonnavmaps::navmap->new();
 
     my %symbx = ();
     my @titles = ();
@@ -2845,8 +2850,7 @@ sub displayPage {
     &sub_page_js($request);
     $request->print($result);
 
-    my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
-						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
+    my $navmap = Apache::lonnavmaps::navmap->new();
     my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
@@ -3008,8 +3012,7 @@ sub updateGradeByPage {
 
     $request->print($result);
 
-    my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
-						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
+    my $navmap = Apache::lonnavmaps::navmap->new();
     my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
@@ -3146,8 +3149,6 @@ sub getSequenceDropDown {
 }
 
 sub scantron_uploads {
-    #FIXME need to support scantron files put in another location,
-    # maybe the course directory? a scantron dir in the course directory?
     if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
     my $result=	'<select name="scantron_selectfile">';
     opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});
@@ -3184,11 +3185,9 @@ sub scantron_selectphase {
     my $file_selector=&scantron_uploads();
     my $format_selector=&scantron_scantab();
     my $result;
-    #FIXME allow instructor to be able to download the scantron file
-    # and to upload it,
     $result.= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
-  <input type="hidden" name="command" value="scantron_validate" />
+  <input type="hidden" name="command" value="scantron_process" />
   $default_form_data
   <table width="100%" border="0">
     <tr>
@@ -3218,7 +3217,7 @@ sub scantron_selectphase {
       </td>
     </tr>
   </table>
-  <input type="submit" value="Validate Scantron Records" />
+  <input type="submit" value="Submit" />
 </form>
 $grading_menu_button
 SCANTRONFORM
@@ -3230,7 +3229,6 @@ sub get_scantron_config {
     my ($which) = @_;
     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
     my %config;
-    #FIXME probably should move to XML it has already gotten a bit much now
     foreach my $line (<$fh>) {
 	my ($name,$descrip)=split(/:/,$line);
 	if ($name ne $which ) { next; }
@@ -3247,12 +3245,6 @@ sub get_scantron_config {
 	$config{'Qlength'}=$config[8];
 	$config{'Qoff'}=$config[9];
 	$config{'Qon'}=$config[10];
-	$config{'PaperID'}=$config[11];
-	$config{'PaperIDlength'}=$config[12];
-	$config{'FirstName'}=$config[13];
-	$config{'FirstNamelength'}=$config[14];
-	$config{'LastName'}=$config[15];
-	$config{'LastNamelength'}=$config[16];
 	last;
     }
     return %config;
@@ -3283,15 +3275,6 @@ sub scantron_parse_scanline {
     }
     $record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
 				  $$scantron_config{'IDlength'});
-    $record{'scantron.paperID'}=
-	substr($data,$$scantron_config{'PaperID'}-1,
-	       $$scantron_config{'PaperIDlength'});
-    $record{'scantron.FirstName'}=
-	substr($data,$$scantron_config{'FirstName'}-1,
-	       $$scantron_config{'FirstNamelength'});
-    $record{'scantron.LastName'}=
-	substr($data,$$scantron_config{'LastName'}-1,
-	       $$scantron_config{'LastNamelength'});
     my @alphabet=('A'..'Z');
     my $questnum=0;
     while ($questions) {
@@ -3302,7 +3285,6 @@ sub scantron_parse_scanline {
 	my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);
 	if (scalar(@array) gt 2) {
 	    #FIXME do something intelligent with double bubbles
-	    #actually not a concern right now, should be taking care of later
 	    Apache->request->print("<br ><b>Wha!!!</b> <pre>".scalar(@array).
 				   '-'.$currentquest.'-'.$questnum.'</pre><br />');
 	}
@@ -3317,23 +3299,14 @@ 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;
 }
@@ -3346,137 +3319,6 @@ 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_validate_file {
-    my ($r) = @_;
-    my ($symb,$url)=&get_symb_and_url($r);
-    if (!$symb) {return '';}
-    my $default_form_data=&defaultFormData($symb,$url);
-
-    if ($ENV{'form.scantron_corrections'}) {
-	&scantron_process_corrections($r);
-    }
-    #get the student pick code ready
-    $r->print(&Apache::loncommon::studentbrowser_javascript());
-    my $result= <<SCANTRONFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
-  <input type="hidden" name="command" value="scantron_validate" />
-  <input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />
-  <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />
-  <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />
-  $default_form_data
-SCANTRONFORM
-    $r->print($result);
-    
-    my @validate_phases=( 'ID',
-			  'CODE',
-			  'doublebubble',
-			  'missingbubbles');
-    if (!$ENV{'form.validatepass'}) {
-	$ENV{'form.valiadatepass'} = 0;
-    }
-    my $currentphase=$ENV{'form.valiadatepass'};
-
-    if ($ENV{'form.scantron_selectfile'}=~m-^/-) {
-	#first pass copy file to classdir
-	
-    }
-    my $stop=0;
-    while (!$stop && $currentphase < scalar(@validate_phases)) {
-	my $which="scantron_validate_".$validate_phases[$currentphase];
-	{
-	    no strict 'refs';
-	    ($stop,$currentphase)=&$which($r,$currentphase);
-	}
-    }
-    $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
-}
-
-sub scantron_validate_ID {
-    my ($r,$currentphase) = @_;
-    
-    #get student info
-    my $classlist=&Apache::loncoursedata::get_classlist();
-    my %idmap=&username_to_idmap($classlist);
-
-    #get scantron line setup
-    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
-    #my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
-    #FIXME really would prefer a scantron directory but tokenwrapper
-    # doesn't allow access to subdirs of userfiles
-    my $scanlines=&Apache::lonnet::getfile('/uploaded/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.
-		       'scantron_'.$ENV{'form.scantron_selectfile'});
-    
-    my @scanlines=split("\n",$scanlines);
-
-    my %found=('ids'=>{},'usernames'=>{});
-    foreach my $line (@scanlines) {
-	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
-	my $id=$$scan_record{'scantron.ID'};
-	$r->print("<p>Checking ID ".$$scan_record{'scantron.ID'}."</p>\n");
-	my $found;
-	foreach my $checkid (keys(%idmap)) {
-	    if (lc($checkid) eq lc($id)) {
-		if ($checkid ne $id) {
-		    $r->print("<p>Using $checkid for bubbled $id</p>\n");
-		}
-		$found=$checkid;last;
-	    }
-	}
-	if ($found) {
-	    if ($found{'ids'}{$found}) {
-		&scantron_get_ID_correction($r,$line,$scan_record,'duplicate',$found);
-		return(1);
-	    } else {
-		$found{'ids'}{$found}++;
-	    }
-	} else {
-	    &scantron_get_ID_correction($r,$line,$scan_record,'incorrect');
-	    return(1);
-	}
-    }
-
-    return (0,$currentphase+1);
-}
-
-sub scantron_get_ID_correction {
-    my ($r,$line,$scan_record,$error,$arg)=@_;
-    $r->print("<p>need to correct ID</p>\n");
-    $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
-    $r->print('<input type="hidden" name="scantron_line" value="'.&HTML::Entities::encode($line).'" />'."\n");
-    if ($error eq 'unknown') {
-	$r->print("<p> Unknown ID </p>\n");
-    } elsif ($error eq 'duplicate') {
-	$r->print("<p> Duplicated ID </p>\n");
-    }
-    $r->print("<p>Original ID is ".$$scan_record{'scantron.ID'}."</p>\n");
-    $r->print("<p>Name on paper is ".$$scan_record{'scantron.LastName'}.",".
-	      $$scan_record{'scantron.FirstName'}."</p>");
-    $r->print("Corrected User -- ");
-    $r->print("\nusername:<input type='text' name='scantron_username' value='' />");
-    $r->print("\ndomain:".
-	      &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
-    #FIXME it would be nice if this sent back the user ID and
-    #could do partial userID matches
-    $r->print(&Apache::loncommon::selectstudent_link('scantronupload',
-				       'scantron_username','scantron_domain'));
-    &scantron_end_validate_form($r);
-}
-
-sub scantron_end_validate_form {
-    my ($r) = @_;
-    $r->print('<input type="submit" name="submit" /></form></body></html>');
-}
-
 sub scantron_process_students {
     my ($r) = @_;
     my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
@@ -3489,10 +3331,10 @@ sub scantron_process_students {
     my @scanlines=<$scanlines>;
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
-    my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1);
+    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" />
@@ -3501,36 +3343,29 @@ SCANTRONFORM
     $r->print($result);
 
     my @delayqueue;
-    my %completedstudents;
-    
+    my $totalcorrect;
+    my $totalincorrect;
+
     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) {
-	$r->print('<pre>line is'.$line.'</pre>');
+	my $studentcorrect;
+	my $studentincorrect;
 
 	chomp($line);
 	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
 	my ($uname,$udom);
-	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}) {
+	if ($uname=&scantron_find_student($scan_record,\%idmap)) {
 	    &scantron_add_delay(\@delayqueue,$line,
-				'Student '.$uname.' has multiple sheets',2);
-	    next;
+				'Unable to find a student that matches');
 	}
 	$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) {
@@ -3542,31 +3377,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');
-	#last;
+             'last student Who got a '.$studentcorrect.' correct and '.
+	     $studentincorrect.' incorrect. The class has gotten '.
+             $totalcorrect.' correct and '.$totalincorrect.' incorrect');
+	last;
 	#FIXME
 	#get iterator for $sequence
 	#foreach question 'submit' the students answer to the server
@@ -3574,11 +3409,7 @@ SCANTRONFORM
 	#   generate data to pass back that includes grade recevied
 	#}
     }
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    my $lasttime = &Time::HiRes::time()-$start;
-    $r->print("<p>took $lasttime</p>");
-
-    #$Apache::lonxml::debug=0;
+    $Apache::lonxml::debug=0;
     foreach my $delay (@delayqueue) {
 	#FIXME
 	#print out each delayed student with interface to select how
@@ -3861,8 +3692,6 @@ sub handler {
 	    }
 	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
 	    $request->print(&scantron_selectphase($request));
-	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
-	    $request->print(&scantron_validate_file($request));
 	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
 	    $request->print(&scantron_process_students($request));
 	} elsif ($command) {