--- loncom/homework/grades.pm	2019/02/05 16:13:05	1.596.2.12.2.41.2.4
+++ loncom/homework/grades.pm	2019/02/16 17:53:05	1.596.2.12.2.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.41.2.4 2019/02/05 16:13:05 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12.2.45 2019/02/16 17:53:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,7 @@ use Apache::Constants qw(:common :http);
 use Apache::lonlocal;
 use Apache::lonenc;
 use Apache::bridgetask();
+use Apache::lontexconvert();
 use String::Similarity;
 use LONCAPA;
 
@@ -472,6 +473,7 @@ sub cleanRecord {
 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
+        $answer = &Apache::lontexconvert::msgtexconverted($answer);
 	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
     } elsif ( $response eq 'organic') {
         my $result=&mt('Smile representation: [_1]',
@@ -2051,6 +2053,7 @@ sub submission {
     $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
     my ($symb) = &get_symb($request); 
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
+    my ($essayurl,%coursedesc_by_cid);
 
     if (!&canview($usec)) {
         $request->print(
@@ -2188,11 +2191,24 @@ sub submission {
 #
 # Load the other essays for similarity check
 #
-            my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
-	    my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
-	    $apath=&escape($apath);
-	    $apath=~s/\W/\_/gs;
-            &init_old_essays($symb,$apath,$adom,$aname);
+            (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
+            if ($essayurl eq 'lib/templates/simpleproblem.problem') {
+                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                if ($cdom ne '' && $cnum ne '') {
+                    my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb);
+                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) {
+                        my $apath = $1.'_'.$id;
+                        $apath=~s/\W/\_/gs;
+                        &init_old_essays($symb,$apath,$cdom,$cnum);
+                    }
+                }
+            } else {
+	        my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
+	        $apath=&escape($apath);
+	        $apath=~s/\W/\_/gs;
+                &init_old_essays($symb,$apath,$adom,$aname);
+            }
         }
     }
 
@@ -2333,27 +2349,51 @@ sub submission {
 			    &most_similar($uname,$udom,$symb,$subval);
 			if ($osim) {
 			    $osim=int($osim*100.0);
-			    my %old_course_desc = 
-				&Apache::lonnet::coursedescription($ocrsid,
-								   {'one_time' => 1});
-
                             if ($hide eq 'anon') {
                                 $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
                                          &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
                             } else {
-			        $similar="<hr /><h3><span class=\"LC_warning\">".
-				    &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
-				        $osim,
-				        &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
-				        $old_course_desc{'description'},
-				        $old_course_desc{'num'},
-				        $old_course_desc{'domain'}).
-				    '</span></h3><blockquote><i>'.
-				    &keywords_highlight($oessay).
-				    '</i></blockquote><hr />';
-                            }
-			}
-		    }
+			        $similar='<hr />';
+                                if ($essayurl eq 'lib/templates/simpleproblem.problem') {
+                                    $similar .= '<h3><span class="LC_warning">'.
+                                                &mt('Essay is [_1]% similar to an essay by [_2]',
+                                                    $osim,
+                                                    &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
+                                                '</span></h3>';
+                                } elsif ($ocrsid ne '') {
+                                    if (ref($coursedesc_by_cid{$ocrsid}) eq 'HASH') {
+                                        %old_course_desc = %{$coursedesc_by_cid{$ocrsid}};
+                                    } else {
+                                        my $args;
+                                        if ($ocrsid ne $env{'request.course.id'}) {
+                                            $args = {'one_time' => 1};
+                                        }
+                                        %old_course_desc =
+                                            &Apache::lonnet::coursedescription($ocrsid,$args);
+                                        $coursedesc_by_cid{$ocrsid} = \%old_course_desc;
+                                    }
+                                    $similar .=
+				        &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
+				            $osim,
+				            &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
+				            $old_course_desc{'description'},
+				            $old_course_desc{'num'},
+				            $old_course_desc{'domain'}).
+				            '</span></h3>';
+                                } else {
+                                    $similar .=
+                                        '<h3><span class="LC_warning">'.
+                                        &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course',
+                                            $osim,
+                                            &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
+                                        '</span></h3>';
+                                }
+                                $similar .= '<blockquote><i>'.
+                                            &keywords_highlight($oessay).
+                                            '</i></blockquote><hr />';
+		            }
+                        }
+                    }
 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom,
                                          undef,$type,$trial,$rndseed);
                     if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($env{'form.lastSub'} eq 'hdgrade' &&
@@ -4214,7 +4254,7 @@ sub editgrades {
 	my ($uname,$udom)=split(/:/,$user);
 	my %newrecord;
 	my $updateflag = 0;
-	my $usec=$classlist->{"$uname:$udom"}[5];
+        my $usec=$classlist->{"$uname:$udom"}[5];
         my $canmodify = &canmodify($usec);
         my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
                    &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
@@ -4607,8 +4647,8 @@ sub csvuploadmap {
 	$datatoken=&Apache::loncommon::upfile_store($request);
     } else {
         $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-        if ($datatoken ne '') {
-            &Apache::loncommon::load_tmp_file($request,$datatoken);
+        if ($datatoken ne '') { 
+	    &Apache::loncommon::load_tmp_file($request,$datatoken);
         }
     }
     my @records=&Apache::loncommon::upfile_record_sep();
@@ -5716,7 +5756,7 @@ sub scantron_uploads {
 sub scantron_scantab {
     my $result='<select name="scantron_format">'."\n";
     $result.='<option></option>'."\n";
-    my @lines = &Apache::lonnet::get_scantronformat_file();
+    my @lines = &get_scantronformat_file();
     if (@lines > 0) {
         foreach my $line (@lines) {
             next if (($line =~ /^\#/) || ($line eq ''));
@@ -5728,6 +5768,62 @@ sub scantron_scantab {
     return $result;
 }
 
+=pod
+
+=item get_scantronformat_file
+
+  Returns an array containing lines from the scantron format file for
+  the domain of the course.
+
+  If a url for a custom.tab file is listed in domain's configuration.db, 
+  lines are from this file.
+
+  Otherwise, if a default.tab has been published in RES space by the 
+  domainconfig user, lines are from this file.
+
+  Otherwise, fall back to getting lines from the legacy file on the
+  local server:  /home/httpd/lonTabs/default_scantronformat.tab    
+
+=cut
+
+sub get_scantronformat_file {
+    my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom);
+    my $gottab = 0;
+    my @lines;
+    if (ref($domconfig{'scantron'}) eq 'HASH') {
+        if ($domconfig{'scantron'}{'scantronformat'} ne '') {
+            my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'});
+            if ($formatfile ne '-1') {
+                @lines = split("\n",$formatfile,-1);
+                $gottab = 1;
+            }
+        }
+    }
+    if (!$gottab) {
+        my $confname = $cdom.'-domainconfig';
+        my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab';
+        my $formatfile =  &Apache::lonnet::getfile($default);
+        if ($formatfile ne '-1') {
+            @lines = split("\n",$formatfile,-1);
+            $gottab = 1;
+        }
+    }
+    if (!$gottab) {
+        my @domains = &Apache::lonnet::current_machine_domains();
+        if (grep(/^\Q$cdom\E$/,@domains)) {
+            my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+            @lines = <$fh>;
+            close($fh);
+        } else {
+            my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab');
+            @lines = <$fh>;
+            close($fh);
+        }
+    }
+    return @lines;
+}
+
 =pod 
 
 =item scantron_CODElist
@@ -5814,56 +5910,48 @@ sub scantron_selectphase {
         # Chunk of form to prompt for a scantron file upload.
 
         $r->print('
-    <br />');
-    my $default_form_data=&defaultFormData($symb);
+    <br />
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th>
+              &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td>
+');
+    my $default_form_data=&defaultFormData(&get_symb($r,1));
     my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
     my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
     &js_escape(\$alertmsg);
-    my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
-    $r->print(&Apache::lonhtmlcommon::scripttag('
+    $r->print('
+              <script type="text/javascript" language="javascript">
     function checkUpload(formname) {
         if (formname.upfile.value == "") {
             alert("'.$alertmsg.'");
             return false;
         }
         formname.submit();
-    }'."\n".$formatjs));
-    $r->print('
+    }
+              </script>
+
               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
                 '.$default_form_data.'
                 <input name="courseid" type="hidden" value="'.$cnum.'" />
                 <input name="domainid" type="hidden" value="'.$cdom.'" />
                 <input name="command" value="scantronupload_save" type="hidden" />
-              '.&Apache::loncommon::start_data_table('LC_scantron_action').'
-              '.&Apache::loncommon::start_data_table_header_row().'
-                <th>
-                &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
-                </th>
-              '.&Apache::loncommon::end_data_table_header_row().'
-              '.&Apache::loncommon::start_data_table_row().'
-            <td>
-                '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n");
-    if ($formatoptions) {
-        $r->print('</td>
-                 '.&Apache::loncommon::end_data_table_row().'
-                 '.&Apache::loncommon::start_data_table_row().'
-                 <td>'.$formattitle.('&nbsp;'x2).$formatoptions.'
-                 </td>
-                 '.&Apache::loncommon::end_data_table_row().'
-                 '.&Apache::loncommon::start_data_table_row().'
-                 <td>'
-        );
-    } else {
-        $r->print(' <br />');
-    }
-    $r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
-              </td>
-             '.&Apache::loncommon::end_data_table_row().'
-             '.&Apache::loncommon::end_data_table().'
-             </form>'
-    );
+                '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
+                <br />
+                <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
+              </form>
+');
 
+        $r->print('
+            </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::end_data_table().'
+');
     }
 
     # Chunk of form to prompt for a file to grade and how:
@@ -5975,6 +6063,98 @@ sub scantron_selectphase {
     return;
 }
 
+=pod
+
+=item get_scantron_config
+
+   Parse and return the scantron configuration line selected as a
+   hash of configuration file fields.
+
+ Arguments:
+    which - the name of the configuration to parse from the file.
+
+
+ Returns:
+            If the named configuration is not in the file, an empty
+            hash is returned.
+    a hash with the fields
+      name         - internal name for the this configuration setup
+      description  - text to display to operator that describes this config
+      CODElocation - if 0 or the string 'none'
+                          - no CODE exists for this config
+                     if -1 || the string 'letter'
+                          - a CODE exists for this config and is
+                            a string of letters
+                     Unsupported value (but planned for future support)
+                          if a positive integer
+                               - The CODE exists as the first n items from
+                                 the question section of the form
+                          if the string 'number'
+                               - The CODE exists for this config and is
+                                 a string of numbers
+      CODEstart   - (only matter if a CODE exists) column in the line where
+                     the CODE starts
+      CODElength  - length of the CODE
+      IDstart     - column where the student/employee ID starts
+      IDlength    - length of the student/employee ID info
+      Qstart      - column where the information from the bubbled
+                    'questions' start
+      Qlength     - number of columns comprising a single bubble line from
+                    the sheet. (usually either 1 or 10)
+      Qon         - either a single character representing the character used
+                    to signal a bubble was chosen in the positional setup, or
+                    the string 'letter' if the letter of the chosen bubble is
+                    in the final, or 'number' if a number representing the
+                    chosen bubble is in the file (1->A 0->J)
+      Qoff        - the character used to represent that a bubble was
+                    left blank
+      PaperID     - if the scanning process generates a unique number for each
+                    sheet scanned the column that this ID number starts in
+      PaperIDlength - number of columns that comprise the unique ID number
+                      for the sheet of paper
+      FirstName   - column that the first name starts in
+      FirstNameLength - number of columns that the first name spans
+ 
+      LastName    - column that the last name starts in
+      LastNameLength - number of columns that the last name spans
+      BubblesPerRow - number of bubbles available in each row used to
+                      bubble an answer. (If not specified, 10 assumed).
+
+=cut
+
+sub get_scantron_config {
+    my ($which) = @_;
+    my @lines = &get_scantronformat_file();
+    my %config;
+    #FIXME probably should move to XML it has already gotten a bit much now
+    foreach my $line (@lines) {
+	my ($name,$descrip)=split(/:/,$line);
+	if ($name ne $which ) { next; }
+	chomp($line);
+	my @config=split(/:/,$line);
+	$config{'name'}=$config[0];
+	$config{'description'}=$config[1];
+	$config{'CODElocation'}=$config[2];
+	$config{'CODEstart'}=$config[3];
+	$config{'CODElength'}=$config[4];
+	$config{'IDstart'}=$config[5];
+	$config{'IDlength'}=$config[6];
+	$config{'Qstart'}=$config[7];
+ 	$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];
+        $config{'BubblesPerRow'}=$config[17];
+	last;
+    }
+    return %config;
+}
+
 =pod 
 
 =item username_to_idmap
@@ -6020,7 +6200,7 @@ sub username_to_idmap {
    Process a requested correction to a scanline.
 
   Arguments:
-    $scantron_config   - hash from &Apache::lonnet::get_scantron_config()
+    $scantron_config   - hash from &get_scantron_config()
     $scan_data         - hash of correction information 
                           (see &scantron_getfile())
     $line              - existing scanline
@@ -6703,7 +6883,7 @@ sub scantron_filter {
 
 sub scantron_process_corrections {
     my ($r) = @_;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my $which=$env{'form.scantron_line'};
@@ -6872,7 +7052,7 @@ sub check_for_error {
 sub scantron_warning_screen {
     my ($button_text)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $CODElist;
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
@@ -7031,7 +7211,7 @@ sub scantron_validate_file {
     #get the student pick code ready
     $r->print(&Apache::loncommon::studentbrowser_javascript());
     my $nav_error;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
     if ($nav_error) {
         $r->print(&navmap_errormsg());
@@ -7490,7 +7670,7 @@ sub scantron_validate_ID {
     my %idmap=&username_to_idmap($classlist);
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $nav_error;
@@ -7954,7 +8134,7 @@ sub prompt_for_corrections {
 
  Arguments:
     $r           - Apache request object
-    $scan_config - hash from &Apache::lonnet::get_scantron_config()
+    $scan_config - hash from &get_scantron_config()
     $line        - Number of the line being displayed.
     $questionnum - Question number (may include subquestion)
     $error       - Type of error.
@@ -8118,7 +8298,7 @@ sub get_codes {
 
 sub scantron_validate_CODE {
     my ($r,$currentphase) = @_;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
@@ -8192,7 +8372,7 @@ sub scantron_validate_doublebubble {
         &Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -8374,7 +8554,7 @@ sub scantron_validate_missingbubbles {
         &Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -8503,7 +8683,7 @@ sub hand_bubble_option {
         }
     }
     if ($needs_hand_bubbles) {
-        my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+        my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
         my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
         return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.
                &mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').
@@ -8523,7 +8703,7 @@ sub scantron_process_students {
     }
     my $default_form_data=&defaultFormData($symb);
 
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
@@ -8593,7 +8773,7 @@ SCANTRONFORM
 	return '';		# Dunno why the other returns return '' rather than just returning.
     }
 
-    my %lettdig = &Apache::lonnet::letter_to_digits();
+    my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
     my %orderedforcode;
 
@@ -8924,7 +9104,6 @@ sub grade_student_bubbles {
 sub scantron_upload_scantron_data {
     my ($r)=@_;
     my $dom = $env{'request.role.domain'};
-    my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom);
     my $domdesc = &Apache::lonnet::domain($dom,'description');
     $r->print(&Apache::loncommon::coursebrowser_javascript($dom));
     my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
@@ -8938,7 +9117,8 @@ sub scantron_upload_scantron_data {
     &js_escape(\$nofile_alert);
     my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
     &js_escape(\$nocourseid_alert);
-    $r->print(&Apache::lonhtmlcommon::scripttag('
+    $r->print('
+<script type="text/javascript" language="javascript">
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
 	    alert("'.$nofile_alert.'");
@@ -8965,9 +9145,8 @@ sub scantron_upload_scantron_data {
         return;
     }
 
-    '.$formatjs.'
-'));
-    $r->print('
+</script>
+
 <h3>'.&mt('Send bubblesheet data to a course').'</h3>
 
 <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
@@ -8981,12 +9160,7 @@ sub scantron_upload_scantron_data {
   &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('Domain')).
   '<input name="domainid" type="hidden" />'.$domdesc.
-  &Apache::lonhtmlcommon::row_closure());
-    if ($formatoptions) {
-        $r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions.
-                  &Apache::lonhtmlcommon::row_closure());
-    }
-    $r->print(
+  &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('File to upload')).
   '<input type="file" name="upfile" size="50" />'.
   &Apache::lonhtmlcommon::row_closure(1).
@@ -8999,84 +9173,6 @@ sub scantron_upload_scantron_data {
     return '';
 }
 
-sub scantron_upload_dataformat {
-    my ($dom) = @_;
-    my ($formatoptions,$formattitle,$formatjs);
-    $formatjs = <<'END';
-function toggleScantab(form) {
-   return;
-}
-END
-    my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom);
-    if (ref($domconfig{'scantron'}) eq 'HASH') {
-        if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-            if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) {
-                if (($domconfig{'scantron'}{'config'}{'dat'}) &&
-                    (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) {
-                    if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                        if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                            my ($onclick,$formatextra,$singleline);
-                            my @lines = &Apache::lonnet::get_scantronformat_file();
-                            my $count = 0;
-                            foreach my $line (@lines) {
-                                next if ($line =~ /^#/);
-                                $singleline = $line;
-                                $count ++;
-                            }
-                            if ($count > 1) {
-                                $formatextra = '<div style="display:none" id="bubbletype">'.
-                                               '<span class="LC_nobreak">'.
-                                               &mt('Bubblesheet type:').'&nbsp;'.
-                                               &scantron_scantab().'</span></div>';
-                                $onclick = ' onclick="toggleScantab(this.form);"';
-                                $formatjs = <<"END";
-function toggleScantab(form) {
-    var divid = 'bubbletype';
-    if (document.getElementById(divid)) {
-        var radioname = 'fileformat';
-        var num = form.elements[radioname].length;
-        if (num) {
-            for (var i=0; i<num; i++) {
-                if (form.elements[radioname][i].checked) {
-                    var chosen = form.elements[radioname][i].value;
-                    if (chosen == 'dat') {
-                        document.getElementById(divid).style.display = 'none';
-                    } else if (chosen == 'csv') {
-                        document.getElementById(divid).style.display = 'block';
-                    }
-                }
-            }
-        }
-    }
-    return;
-}
-
-END
-                            } elsif ($count == 1) {
-                                my $formatname = (split(/:/,$singleline,2))[0];
-                                $formatextra = '<input type="hidden" name="scantron_format" value="'.$formatname.'" />';
-                            }
-                            $formattitle = &mt('File format');
-                            $formatoptions = '<label><input name="fileformat" type="radio" value="dat" checked="checked"'.$onclick.' />'.
-                                             &mt('Plain Text (no delimiters)').
-                                             '</label>'.('&nbsp;'x2).
-                                             '<label><input name="fileformat" type="radio" value="csv"'.$onclick.' />'.
-                                             &mt('Comma separated values').'</label>'.$formatextra;
-                        }
-                    }
-                }
-            } elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) {
-                if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                    if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                        $formattitle = &mt('Bubblesheet type');
-                        $formatoptions = &scantron_scantab();
-                    }
-                }
-            }
-        }
-    }
-    return ($formatoptions,$formattitle,$formatjs);
-}
 
 sub scantron_upload_scantron_data_save {
     my($r)=@_;
@@ -9106,38 +9202,8 @@ sub scantron_upload_scantron_data_save {
                 &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',
                         '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1));
     } else {
-        my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'});
-        my $parser;
-        if (ref($domconfig{'scantron'}) eq 'HASH') {
-            if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-                my $is_csv;
-                my @possibles = keys(%{$domconfig{'scantron'}{'config'}});
-                if (@possibles > 1) {
-                    if ($env{'form.fileformat'} eq 'csv') {
-                        if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                            if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                                if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
-                                    $is_csv = 1;
-                                }
-                            }
-                        }
-                    }
-                } elsif (@possibles == 1) {
-                    if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                        if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                            if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
-                                $is_csv = 1;
-                            }
-                        }
-                    }
-                }
-                if ($is_csv) {
-                   $parser = $domconfig{'scantron'}{'config'}{'csv'};
-                }
-            }
-        }
-        my $result =
-            &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',
+        my $result = 
+            &Apache::lonnet::userfileupload('upfile','','scantron','','','',
                                             $env{'form.courseid'},$env{'form.domainid'});
 	if ($result =~ m{^/uploaded/}) {
             $r->print(
@@ -9182,7 +9248,7 @@ sub validate_uploaded_scantron_file {
             $idmap{$lckey} = $idmap{$key};
         }
         my %unique_formats;
-        my @formatlines = &Apache::lonnet::get_scantronformat_file();
+        my @formatlines = &get_scantronformat_file();
         foreach my $line (@formatlines) {
             chomp($line);
             my @config = split(/:/,$line);
@@ -9328,14 +9394,14 @@ sub checkscantron_results {
     if (!$symb) {return '';}
     my $grading_menu_button=&show_grading_menu_form($symb);
     my $cid = $env{'request.course.id'};
-    my %lettdig = &Apache::lonnet::letter_to_digits();
+    my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
     my $cnum = $env{'course.'.$cid.'.num'};
     my $cdom = $env{'course.'.$cid.'.domain'};
     my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});
     my %record;
     my %scantron_config =
-        &Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+        &Apache::grades::get_scantron_config($env{'form.scantron_format'});
     my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
     my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
@@ -9659,6 +9725,23 @@ sub verify_scantron_grading {
     return ($counter,$record);
 }
 
+sub letter_to_digits {
+    my %lettdig = (
+                    A => 1,
+                    B => 2,
+                    C => 3,
+                    D => 4,
+                    E => 5,
+                    F => 6,
+                    G => 7,
+                    H => 8,
+                    I => 9,
+                    J => 0,
+                  );
+    return %lettdig;
+}
+
+
 #-------- end of section for handling grading scantron forms -------
 #
 #-------------------------------------------------------------------
@@ -10606,20 +10689,12 @@ sub navmap_errormsg {
 }
 
 sub startpage {
-    my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js,$onload) = @_;
-    my %args;
-    if ($onload) {
-         my %loaditems = (
-                        'onload' => $onload,
-                      );
-         $args{'add_entries'} = \%loaditems;
-    }
+    my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_;
     if ($nomenu) {
-        $args{'only_body'} = 1;
-        $r->print(&Apache::loncommon::start_page("Student's Version",$js,\%args));
+        $r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'}));
     } else {
-        $args{'bread_crumbs'} = $crumbs;
-        $r->print(&Apache::loncommon::start_page('Grading',$js,\%args));
+        $r->print(&Apache::loncommon::start_page('Grading',$js,
+                                                 {'bread_crumbs' => $crumbs}));
     }
     unless ($nodisplayflag) {
        $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
@@ -10701,16 +10776,8 @@ sub handler {
         }
         &Apache::loncommon::content_type($request,'text/html');
         $request->send_http_header;
-        if (($command eq 'scantron_selectphase' && $perm{'mgr'}) || 
-            (($command eq 'scantronupload') &&
-             (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
-              &Apache::lonnet::allowed('usc',$env{'request.course.id'})))) {
-            &startpage($request,$symb,[{href=>'/adm/grades', text=>"Grading"}],1,1,
-                       undef,undef,undef,undef,'toggleScantab(document.rules);');
-        } else {
-            unless ((($command eq 'submission' || $command eq 'versionsub')) && ($perm{'vgr'})) {
-                $request->print($start_page); 
-            }
+        unless ((($command eq 'submission' || $command eq 'versionsub')) && ($perm{'vgr'})) {
+            $request->print($start_page); 
         }
 	if ($command eq 'submission' && $perm{'vgr'}) {
             my ($stuvcurrent,$stuvdisp,$versionform,$js);
@@ -10889,7 +10956,7 @@ ssi_with_retries()
     $r           - Apache request object
     $i           - number of the current scanline
     $scan_record - hash ref as returned from &scantron_parse_scanline()
-    $scan_config - hash ref as returned from &Apache::lonnet::get_scantron_config()
+    $scan_config - hash ref as returned from &get_scantron_config()
     $line        - full contents of the current scanline
     $error       - error condition, valid values are
                    'incorrectCODE', 'duplicateCODE',