[BACK]Return to grades.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.130.2.1.2.3 and 1.130.2.1.2.11

version 1.130.2.1.2.3, 2003/09/25 08:30:57 version 1.130.2.1.2.11, 2003/10/16 03:51:52
Line 3145  sub getSequenceDropDown { Line 3145  sub getSequenceDropDown {
     return $result;      return $result;
 }  }
   
   #FIXME, I am in loncreatecourse, use that one instead
   sub propath {
       my ($udom,$uname)=@_;
       $udom=~s/\W//g;
       $uname=~s/\W//g;
       my $subdir=$uname.'__';
       $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
       my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
       return $proname;
   } 
   
 sub scantron_uploads {  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 ''};      if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
     my $result= '<select name="scantron_selectfile">';      my $result= '<select name="scantron_selectfile">';
     opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});      my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my @files=sort(readdir(DIR));      my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
       my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
          &propath($cdom,$cname));
     foreach my $filename (@files) {      foreach my $filename (@files) {
  if ($filename eq '.' or $filename eq '..') { next; }   ($filename)=split(/&/,$filename);
    if ($filename!~/^scantron_orig_/) { next ; }
    $filename=~s/^scantron_orig_//;
  $result.="<option>$filename</option>\n";   $result.="<option>$filename</option>\n";
     }      }
     closedir(DIR);  
     $result.="</select>";      $result.="</select>";
     return $result;      return $result;
 }  }
Line 3214  sub scantron_selectphase { Line 3226  sub scantron_selectphase {
               Format of data file: $format_selector                Format of data file: $format_selector
     </td>      </td>
           </tr>            </tr>
             <tr bgcolor="#ffffe6">
               <td>
   <!-- FIXME this is lazy, a single parse of the set should let me know what this is -->
                 Last line to expect an answer on: 
                   <input type="text" name="scantron_maxbubble" />
       </td>
             </tr>
         </table>          </table>
       </td>        </td>
     </tr>      </tr>
Line 3269  sub username_to_idmap { Line 3288  sub username_to_idmap {
 }  }
   
 sub scantron_fixup_scanline {  sub scantron_fixup_scanline {
     my ($scantron_config,$line,$field,$newvalue) = @_;      my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
     if ($field eq 'ID') {      if ($field eq 'ID') {
  if ($newvalue > $$scantron_config{'IDlength'}) {   if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
     return ($line,1,'New value to large');      return ($line,1,'New value to large');
  }   }
  if ($newvalue < $$scantron_config{'IDlength'}) {   if (length($args->{'newid'}) < $$scantron_config{'IDlength'}) {
     $newvalue=sprintf('%-'.$$scantron_config{'IDlength'}.'s',      $args->{'newid'}=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
       $newvalue);       $args->{'newid'});
  }   }
  substr($line,$$scantron_config{'IDstart'}-1,   substr($line,$$scantron_config{'IDstart'}-1,
        $$scantron_config{'IDlength'})=$newvalue;         $$scantron_config{'IDlength'})=$args->{'newid'};
    if ($args->{'newid'}=~/^\s*$/) {
       &scan_data($scan_data,"$whichline.user",
          $args->{'username'}.':'.$args->{'domain'});
    }
       } elsif ($field eq 'answer') {
    my $length=$scantron_config->{'Qlength'};
    my $off=$scantron_config->{'Qoff'};
    my $on=$scantron_config->{'Qon'};
    my $answer=${off}x$length;
    if ($args->{'response'} eq 'none') {
       &scan_data($scan_data,
          "$whichline.no_bubble.".$args->{'question'},'1');
    } else {
       substr($answer,$args->{'response'},1)=$on;
       &scan_data($scan_data,
          "$whichline.no_bubble.".$args->{'question'},undef,'1');
    }
    my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
    substr($line,$where-1,$length)=$answer;
     }      }
     return $line;      return $line;
 }  }
   
   sub scan_data {
       my ($scan_data,$key,$value,$delete)=@_;
       my $filename=$ENV{'form.scantron_selectfile'};
       if (defined($value)) {
    $scan_data->{$filename.'_'.$key} = $value;
       }
       if ($delete) { delete($scan_data->{$filename.'_'.$key}); }
       return $scan_data->{$filename.'_'.$key};
   }
   
 sub scantron_parse_scanline {  sub scantron_parse_scanline {
     my ($line,$scantron_config)=@_;      my ($line,$whichline,$scantron_config,$scan_data)=@_;
     my %record;      my %record;
     my $questions=substr($line,$$scantron_config{'Qstart'}-1);      my $questions=substr($line,$$scantron_config{'Qstart'}-1);
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);      my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
Line 3299  sub scantron_parse_scanline { Line 3347  sub scantron_parse_scanline {
     }      }
     $record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,      $record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
   $$scantron_config{'IDlength'});    $$scantron_config{'IDlength'});
     $record{'scantron.paperID'}=      $record{'scantron.PaperID'}=
  substr($data,$$scantron_config{'PaperID'}-1,   substr($data,$$scantron_config{'PaperID'}-1,
        $$scantron_config{'PaperIDlength'});         $$scantron_config{'PaperIDlength'});
     $record{'scantron.FirstName'}=      $record{'scantron.FirstName'}=
Line 3315  sub scantron_parse_scanline { Line 3363  sub scantron_parse_scanline {
  my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});   my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
  substr($questions,0,$$scantron_config{'Qlength'})='';   substr($questions,0,$$scantron_config{'Qlength'})='';
  if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }   if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
  my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);   my @array=split($$scantron_config{'Qon'},$currentquest,-1);
  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 />');  
  }  
  if (length($array[0]) eq $$scantron_config{'Qlength'}) {   if (length($array[0]) eq $$scantron_config{'Qlength'}) {
     $record{"scantron.$questnum.answer"}='';      $record{"scantron.$questnum.answer"}='';
       if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
    push(@{$record{"scantron.missingerror"}},$questnum);
       }
  } else {   } else {
     $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];      $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
  }   }
    if (scalar(@array) gt 2) {
       push(@{$record{'scantron.doubleerror'}},$questnum);
       my @ans=@array;
       my $i=length($ans[0]);shift(@ans);
       while ($#ans) {
    $i+=length($ans[0])+1;
    $record{"scantron.$questnum.answer"}.=$alphabet[$i];
    shift(@ans);
       }
    }
     }      }
     $record{'scantron.maxquest'}=$questnum;      $record{'scantron.maxquest'}=$questnum;
     return \%record;      return \%record;
Line 3334  sub scantron_parse_scanline { Line 3389  sub scantron_parse_scanline {
   
 sub scantron_add_delay {  sub scantron_add_delay {
     my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;      my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
     Apache->request->print('add_delay_error '.$_[2] );  
     push(@$delayqueue,      push(@$delayqueue,
  {'line' => $scanline, 'emsg' => $errormessage,   {'line' => $scanline, 'emsg' => $errormessage,
   'ecode' => $errorcode }    'ecode' => $errorcode }
Line 3342  sub scantron_add_delay { Line 3396  sub scantron_add_delay {
 }  }
   
 sub scantron_find_student {  sub scantron_find_student {
     my ($scantron_record,$idmap)=@_;      my ($scantron_record,$scan_data,$idmap,$line)=@_;
     my $scanID=$$scantron_record{'scantron.ID'};      my $scanID=$$scantron_record{'scantron.ID'};
       if ($scanID =~ /^\s*$/) {
    return &scan_data($scan_data,"$line.user");
       }
     foreach my $id (keys(%$idmap)) {      foreach my $id (keys(%$idmap)) {
  #Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');  
  if (lc($id) eq lc($scanID)) {   if (lc($id) eq lc($scanID)) {
     #Apache->request->print('success');  
     return $$idmap{$id};      return $$idmap{$id};
  }   }
     }      }
Line 3362  sub scantron_filter { Line 3417  sub scantron_filter {
     return 0;      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_corrections {  sub scantron_process_corrections {
     my ($r) = @_;      my ($r) = @_;
     if ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {      my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
  my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});      my ($scanlines,$scan_data)=&scantron_getfile();
  my $scanlines=&scantron_getfile();      my $classlist=&Apache::loncoursedata::get_classlist();
  my $classlist=&Apache::loncoursedata::get_classlist();      my $which=$ENV{'form.scantron_line'};
  my $which=$ENV{'form.scantron_line'};      my $line=&scantron_get_line($scanlines,$which);
  my $line=&scantron_get_line($scanlines,$which);      my ($skip,$err,$errmsg);
       if ($ENV{'form.scantron_skip_record'}) {
    $skip=1;
       } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
  my $newstudent=$ENV{'form.scantron_username'}.':'.   my $newstudent=$ENV{'form.scantron_username'}.':'.
     $ENV{'form.scantron_domain'};      $ENV{'form.scantron_domain'};
  my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];   my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
  ($line,my $err,my $errmsg)=   ($line,$err,$errmsg)=
     &scantron_fixup_scanline(\%scantron_config,$line,'ID',$newid);      &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
  if ($err) {       'ID',{'newid'=>$newid,
     $r->print("Unable to accept last correction, an error occurred :$errmsg:");      'username'=>$ENV{'form.scantron_username'},
  } else {      'domain'=>$ENV{'form.scantron_domain'}});
     &scantron_put_line($scanlines,$which,$line);      } elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
     &scantron_putfile($scanlines);   foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
       ($line,$err,$errmsg)=
    &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
    $which,'answer',
    { 'question'=>$question,
          'response'=>$ENV{"form.scantron_correct_Q_$question"}});
       if ($err) { last; }
  }   }
     }      }
       if ($err) {
    $r->print("Unable to accept last correction, an error occurred :$errmsg:");
       } else {
    &scantron_put_line($scanlines,$which,$line,$skip);
    &scantron_putfile($scanlines,$scan_data);
       }
 }  }
   
   
 sub scantron_validate_file {  sub scantron_validate_file {
     my ($r) = @_;      my ($r) = @_;
     my ($symb,$url)=&get_symb_and_url($r);      my ($symb,$url)=&get_symb_and_url($r);
Line 3405  sub scantron_validate_file { Line 3468  sub scantron_validate_file {
     $r->print(&Apache::loncommon::studentbrowser_javascript());      $r->print(&Apache::loncommon::studentbrowser_javascript());
     my $result= <<SCANTRONFORM;      my $result= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">  <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="selectpage" value="$ENV{'form.selectpage'}" />
   <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />    <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />
   <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />    <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />
     <input type="hidden" name="scantron_maxbubble" value="$ENV{'form.scantron_maxbubble'}" />
   $default_form_data    $default_form_data
 SCANTRONFORM  SCANTRONFORM
     $r->print($result);      $r->print($result);
Line 3428  SCANTRONFORM Line 3491  SCANTRONFORM
     }      }
     my $stop=0;      my $stop=0;
     while (!$stop && $currentphase < scalar(@validate_phases)) {      while (!$stop && $currentphase < scalar(@validate_phases)) {
    $r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
    $r->rflush();
  my $which="scantron_validate_".$validate_phases[$currentphase];   my $which="scantron_validate_".$validate_phases[$currentphase];
  {   {
     no strict 'refs';      no strict 'refs';
     ($stop,$currentphase)=&$which($r,$currentphase);      ($stop,$currentphase)=&$which($r,$currentphase);
  }   }
     }      }
     $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");      if (!$stop) {
    $r->print("Validation process complete.<br />");
    $r->print('<input type="submit" name="submit" value="Start Grading" />');
    $r->print('<input type="hidden" name="command" value="scantron_process" />');
       } else {
    $r->print('<input type="hidden" name="command" value="scantron_validate" />');
    $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
       }
       if ($stop) {
    $r->print('<input type="submit" name="submit" value="Continue ->" />');
    $r->print(' using corrected info <br />');
    $r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
    $r->print(" this scanline saving it for later.");
       }
       $r->print(" </form><br />".&show_grading_menu_form($symb,$url).
         "</body></html>");
     return '';      return '';
 }  }
   
 sub scantron_getfile {  sub scantron_getfile {
     #my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");  
     #FIXME really would prefer a scantron directory but tokenwrapper      #FIXME really would prefer a scantron directory but tokenwrapper
     # doesn't allow access to subdirs of userfiles      # doesn't allow access to subdirs of userfiles
       my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
       my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $lines;      my $lines;
     $lines=&Apache::lonnet::getfile('/uploaded/'.      $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.  
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.  
        'scantron_orig_'.$ENV{'form.scantron_selectfile'});         'scantron_orig_'.$ENV{'form.scantron_selectfile'});
     if ($lines eq '-1') {      if ($lines eq '-1') {
        #FIXME need to actually replicate file to course space   #FIXME need to actually replicate file to course space
    #FIXME when replicating strip CRLF to LF or CR to LF
     }      }
     my %scanlines;      my %scanlines;
     $scanlines{'orig'}=[split("\n",$lines)];      $scanlines{'orig'}=[(split("\n",$lines,-1))];
     my $temp=$scanlines{'orig'};      my $temp=$scanlines{'orig'};
     $scanlines{'count'}=$#$temp;      $scanlines{'count'}=$#$temp;
   
     $lines=&Apache::lonnet::getfile('/uploaded/'.      $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.  
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.  
        'scantron_corrected_'.$ENV{'form.scantron_selectfile'});         'scantron_corrected_'.$ENV{'form.scantron_selectfile'});
     if ($lines eq '-1') {      if ($lines eq '-1') {
  $scanlines{'corrected'}=[];   $scanlines{'corrected'}=[];
     } else {      } else {
  $scanlines{'corrected'}=[split("\n",$lines)];   $scanlines{'corrected'}=[(split("\n",$lines,-1))];
     }      }
     $lines=&Apache::lonnet::getfile('/uploaded/'.      $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.  
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.  
        'scantron_skipped_'.$ENV{'form.scantron_selectfile'});         'scantron_skipped_'.$ENV{'form.scantron_selectfile'});
     if ($lines eq '-1') {      if ($lines eq '-1') {
  $scanlines{'skipped'}=[];   $scanlines{'skipped'}=[];
     } else {      } else {
  $scanlines{'skipped'}=[split("\n",$lines)];   $scanlines{'skipped'}=[(split("\n",$lines,-1))];
     }      }
     return \%scanlines;      my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname);
       if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); }
       my %scan_data = @tmp;
       return (\%scanlines,\%scan_data);
 }  }
   
 sub lonnet_putfile {  sub lonnet_putfile {
Line 3487  sub lonnet_putfile { Line 3566  sub lonnet_putfile {
 }  }
   
 sub scantron_putfile {  sub scantron_putfile {
     my ($scanlines) = @_;      my ($scanlines,$scan_data) = @_;
     #FIXME really would prefer a scantron directory but tokenwrapper      #FIXME really would prefer a scantron directory but tokenwrapper
     # doesn't allow access to subdirs of userfiles      # doesn't allow access to subdirs of userfiles
     my $prefix='/uploaded/'.      my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.      my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
  $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.  
  'scantron_';  
     my $prefix='scantron_';      my $prefix='scantron_';
 # no need to update orig, shouldn't change  # no need to update orig, shouldn't change
 #   &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.  #   &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
Line 3504  sub scantron_putfile { Line 3581  sub scantron_putfile {
     &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),      &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
     $prefix.'skipped_'.      $prefix.'skipped_'.
     $ENV{'form.scantron_selectfile'});      $ENV{'form.scantron_selectfile'});
       &Apache::lonnet::put('scantrondata',$scan_data,$cdom,$cname);
 }  }
   
 sub scantron_get_line {  sub scantron_get_line {
Line 3515  sub scantron_get_line { Line 3593  sub scantron_get_line {
   
 sub scantron_put_line {  sub scantron_put_line {
     my ($scanlines,$i,$newline,$skip)=@_;      my ($scanlines,$i,$newline,$skip)=@_;
     if ($skip) { $scanlines->{'skipped'}[$i]=$newline;return; }      if ($skip) {
    $scanlines->{'skipped'}[$i]=$newline;
    return;
       }
     $scanlines->{'corrected'}[$i]=$newline;      $scanlines->{'corrected'}[$i]=$newline;
 }  }
   
Line 3528  sub scantron_validate_ID { Line 3609  sub scantron_validate_ID {
   
     #get scantron line setup      #get scantron line setup
     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});      my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
     my $scanlines=&scantron_getfile();      my ($scanlines,$scan_data)=&scantron_getfile();
   
     my %found=('ids'=>{},'usernames'=>{});      my %found=('ids'=>{},'usernames'=>{});
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
  my $line=&scantron_get_line($scanlines,$i);   my $line=&scantron_get_line($scanlines,$i);
  if (!$line) { next; }   if ($line=~/^[\s\cz]*$/) { next; }
  my $scan_record=&scantron_parse_scanline($line,\%scantron_config);   my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
    $scan_data);
  my $id=$$scan_record{'scantron.ID'};   my $id=$$scan_record{'scantron.ID'};
  $r->print("<p>Checking ID ".$$scan_record{'scantron.ID'}."</p>\n");  
  my $found;   my $found;
  foreach my $checkid (keys(%idmap)) {   foreach my $checkid (keys(%idmap)) {
     if (lc($checkid) eq lc($id)) {      if (lc($checkid) eq lc($id)) { $found=$checkid;last; }
  if ($checkid ne $id) {  
     $r->print("<p>Using $checkid for bubbled $id</p>\n");  
  }  
  $found=$checkid;last;  
     }  
  }   }
  if ($found) {   if ($found) {
       my $username=$idmap{$found};
     if ($found{'ids'}{$found}) {      if ($found{'ids'}{$found}) {
  #FIXME store away line we prviously saw the ID on   &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
  &scantron_get_ID_correction($r,$i,$scan_record,   $line,'duplicateID',$found);
     'duplicateID',$found);   return(1);
       } elsif ($found{'usernames'}{$username}) {
    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
    $line,'duplicateID',$username);
  return(1);   return(1);
     } else {  
  $found{'ids'}{$found}++;  
     }      }
       #FIXME store away line we prviously saw the ID on to use above
       $found{'ids'}{$found}++;
       $found{'usernames'}{$username}++;
  } else {   } else {
     &scantron_get_ID_correction($r,$i,$scan_record,'incorrectID');      if ($id =~ /^\s*$/) {
     return(1);   my $username=&scan_data($scan_data,"$i.user");
    if (defined($username) && $found{'usernames'}{$username}) {
       &scantron_get_correction($r,$i,$scan_record,
        \%scantron_config,
        $line,'duplicateID',$username);
       return(1);
    } elsif (!defined($username)) {
       &scantron_get_correction($r,$i,$scan_record,
        \%scantron_config,
        $line,'incorrectID');
       return(1);
    }
    $found{'usernames'}{$username}++;
       } else {
    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
    $line,'incorrectID');
    return(1);
       }
  }   }
     }      }
   
     return (0,$currentphase+1);      return (0,$currentphase+1);
 }  }
   
 sub scantron_get_ID_correction {  sub scantron_get_correction {
     my ($r,$i,$scan_record,$error,$arg)=@_;      my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
 #FIXME allow th poosibility of skipping a line, or in the case of a duplicated ID the previous line, probaly need to show both the current line and the previous one.  
     $r->print("<p>need to correct ID</p>\n");  #FIXME in the case of a duplicated ID the previous line, probaly need
   #to show both the current line and the previous one and allow skipping
   #the previous one or the current one
   
       $r->print("<p>An error was detected ($error) ");
       if ( defined($$scan_record{'scantron.PaperID'}) ) {
    $r->print(" for PaperID <tt>".
     $$scan_record{'scantron.PaperID'}."</tt> \n");
       } else {
    $r->print(" in scanline $i <pre>".
     $line."</pre> \n");
       }
     $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");      $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
     $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");      $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
     if ($error eq 'unknownID') {      if ($error =~ /ID$/) {
  $r->print("<p> Unknown ID </p>\n");   if ($error eq 'unknownID') {
     } elsif ($error eq 'duplicateID') {      $r->print("The encoded ID is not in the classlist</p>\n");
  $r->print("<p> Duplicated ID </p>\n");   } elsif ($error eq 'duplicateID') {
     }      $r->print("The encoded ID has also been used by a previous paper $arg</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'}.",".   $r->print("<p>The ID on the form is  <tt>".
       $$scan_record{'scantron.FirstName'}."</p>");    $$scan_record{'scantron.ID'}."</tt><br />\n");
     $r->print("Corrected User -- ");   $r->print("The name on the paper is ".
     $r->print("\nusername:<input type='text' name='scantron_username' value='' />");    $$scan_record{'scantron.LastName'}.",".
     $r->print("\ndomain:".    $$scan_record{'scantron.FirstName'}."</p>");
       &Apache::loncommon::select_dom_form(undef,'scantron_domain'));   $r->print("<p>How should I handle this? <br /> \n");
     #FIXME it would be nice if this sent back the user ID and   $r->print("\n<ul><li> ");
     #could do partial userID matches   #FIXME it would be nice if this sent back the user ID and
     $r->print(&Apache::loncommon::selectstudent_link('scantronupload',   #could do partial userID matches
    $r->print(&Apache::loncommon::selectstudent_link('scantronupload',
        'scantron_username','scantron_domain'));         'scantron_username','scantron_domain'));
     &scantron_end_validate_form($r);   $r->print(": <input type='text' name='scantron_username' value='' />");
    $r->print("\n@".
    &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
   
    $r->print('</li>');
       } elsif ($error eq 'doublebubble') {
   #FIXME Need to print out who this is along with the paper info
    $r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
    $r->print('<input type="hidden" name="scantron_questions" value="'.
     join(',',@{$arg}).'" />');
    $r->print("<p>Please indicate which bubble should be used for grading</p>");
    foreach my $question (@{$arg}) {
       my $selected=$$scan_record{"scantron.$question.answer"};
       &scantron_bubble_selector($r,$scan_config,$question,split('',$selected));
    }
       } elsif ($error eq 'missingbubble') {
    $r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
    $r->print("<p>Please indicate which bubble should be used for grading</p>");
    $r->print("Some questions have no scanned bubbles\n");
    $r->print('<input type="hidden" name="scantron_questions" value="'.
     join(',',@{$arg}).'" />');
    foreach my $question (@{$arg}) {
       my $selected=$$scan_record{"scantron.$question.answer"};
       &scantron_bubble_selector($r,$scan_config,$question);
    }
       } else {
    $r->print("\n<ul>");
       }
       $r->print("\n</li></ul>");
   
 }  }
   
 sub scantron_end_validate_form {  sub scantron_bubble_selector {
     my ($r) = @_;      my ($r,$scan_config,$quest,@selected)=@_;
     $r->print('<input type="submit" name="submit" /></form></body></html>');      my $max=$$scan_config{'Qlength'};
       my @alphabet=('A'..'Z');
       $r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");
       for (my $i=0;$i<$max+1;$i++) {
    $r->print('<td align="center">');
    if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
    else { $r->print('&nbsp;'); }
    $r->print('</td>');
       }
       $r->print('<td></td></tr><tr>');
       for (my $i=0;$i<$max;$i++) {
    $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
     '" value="'.$i.'" />'.$alphabet[$i]."</td>");
       }
       $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
         '" value="none" /> No bubble </td>');
       $r->print('</tr></table>');
   }
   
   sub scantron_validate_CODE {
       my ($r,$currentphase) = @_;
       #FIXME doesn't do anything yet
       return (0,$currentphase+1);
   }
   
   sub scantron_validate_doublebubble {
       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,$scan_data)=&scantron_getfile();
       for (my $i=0;$i<=$scanlines->{'count'};$i++) {
    my $line=&scantron_get_line($scanlines,$i);
    if ($line=~/^[\s\cz]*$/) { next; }
    my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
    $scan_data);
    if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
    'doublebubble',
    $$scan_record{'scantron.doubleerror'});
       return (1,$currentphase);
       }
       return (0,$currentphase+1);
   }
   
   sub scantron_validate_missingbubbles {
       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,$scan_data)=&scantron_getfile();
       my $max_bubble=$ENV{'form.scantron_maxbubble'};
       if (!$max_bubble) { $max_bubble=2**31; }
       for (my $i=0;$i<=$scanlines->{'count'};$i++) {
    my $line=&scantron_get_line($scanlines,$i);
    if ($line=~/^[\s\cz]*$/) { next; }
    my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
    $scan_data);
    if (!defined($$scan_record{'scantron.missingerror'})) { next; }
    my @to_correct;
    foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
       if ($missing > $max_bubble) { next; }
       push(@to_correct,$missing);
    }
    if (@to_correct) {
       &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
        $line,'missingbubble',\@to_correct);
       return (1,$currentphase);
    }
   
       }
       return (0,$currentphase+1);
 }  }
   
 sub scantron_process_students {  sub scantron_process_students {
Line 3602  sub scantron_process_students { Line 3818  sub scantron_process_students {
     my $default_form_data=&defaultFormData($symb,$url);      my $default_form_data=&defaultFormData($symb,$url);
   
     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});      my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
     my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");      my ($scanlines,$scan_data)=&scantron_getfile();
     my @scanlines=<$scanlines>;  
     my $classlist=&Apache::loncoursedata::get_classlist();      my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($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($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1);
Line 3620  SCANTRONFORM Line 3835  SCANTRONFORM
     my @delayqueue;      my @delayqueue;
     my %completedstudents;      my %completedstudents;
           
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
            'Scantron Status','Scantron Progress',scalar(@scanlines));      'Scantron Progress',$scanlines->{'count'});
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
   'Processing first student');    'Processing first student');
     my $start=&Time::HiRes::time();      my $start=&Time::HiRes::time();
     foreach my $line (@scanlines) {      my $i=-1;
  $r->print('<pre>line is'.$line.'</pre>');      my ($uname,$udom);
       while ($i<$scanlines->{'count'}) {
  chomp($line);   ($uname,$udom)=('','');
  my $scan_record=&scantron_parse_scanline($line,\%scantron_config);   $i++;
  my ($uname,$udom);   my $line=&scantron_get_line($scanlines,$i);
  unless ($uname=&scantron_find_student($scan_record,\%idmap)) {  # $r->print('<pre>line is'.$line.'</pre>');
    if ($line=~/^[\s\cz]*$/) { next; }
    my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
    $scan_data);
    unless ($uname=&scantron_find_student($scan_record,$scan_data,
         \%idmap,$i)) {
     &scantron_add_delay(\@delayqueue,$line,      &scantron_add_delay(\@delayqueue,$line,
  'Unable to find a student that matches',1);   'Unable to find a student that matches',1);
     next;      next;
Line 3641  SCANTRONFORM Line 3861  SCANTRONFORM
  'Student '.$uname.' has multiple sheets',2);   'Student '.$uname.' has multiple sheets',2);
     next;      next;
  }   }
  $r->print('<pre>doing studnet'.$uname.'</pre>');  # $r->print('<pre>doing studnet'.$uname.'</pre>');
  ($uname,$udom)=split(/:/,$uname);   ($uname,$udom)=split(/:/,$uname);
  &Apache::lonnet::delenv('form.counter');   &Apache::lonnet::delenv('form.counter');
  &Apache::lonnet::appenv(%$scan_record);   &Apache::lonnet::appenv(%$scan_record);
Line 3681  SCANTRONFORM Line 3901  SCANTRONFORM
     } continue {      } continue {
  &Apache::lonnet::delenv('form.counter');   &Apache::lonnet::delenv('form.counter');
  &Apache::lonnet::delenv('scantron\.');   &Apache::lonnet::delenv('scantron\.');
  &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,   &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,$uname);
  'last student');  
  #last;   #last;
  #FIXME   #FIXME
  #get iterator for $sequence   #get iterator for $sequence
Line 3693  SCANTRONFORM Line 3912  SCANTRONFORM
     }      }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     my $lasttime = &Time::HiRes::time()-$start;      my $lasttime = &Time::HiRes::time()-$start;
     $r->print("<p>took $lasttime</p>");      #$r->print("<p>took $lasttime</p>");
   
     #$Apache::lonxml::debug=0;      #$Apache::lonxml::debug=0;
     foreach my $delay (@delayqueue) {      foreach my $delay (@delayqueue) {
Line 3710  SCANTRONFORM Line 3929  SCANTRONFORM
     #     to ignore delayed students, possibly saving the delay queue for later      #     to ignore delayed students, possibly saving the delay queue for later
           
     $navmap->untieHashes();      $navmap->untieHashes();
       $r->print("<p>Done</p>");
       $r->print(&show_grading_menu_form($symb,$url));
       return '';
   }
   
   sub scantron_upload_scantron_data {
       my ($r)=@_;
       $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
       my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
     'domainid');
       my $domsel=&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},
      'domainid');
       $r->print(<<UPLOAD);
   <script type="text/javascript" language="javascript">
       function checkUpload(formname) {
    if (formname.upfile.value == "") {
       alert("Please use the browse button to select a file from your local directory.");
       return false;
    }
    formname.submit();
       }
   </script>
   
   <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
   Course: <input name='courseid' type='text' />
   Domain: $domsel $select_link
   <br />
   <input name='command' value='scantronupload_save' type='hidden' />
   File to upload:<input type="file" name="upfile" size="50" />
   <br />
   <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
   </form>
   UPLOAD
       return '';
   }
   
   sub scantron_upload_scantron_data_save {
       my($r)=@_;
       $r->print("Doing upload to ".$ENV{'form.courseid'});
       my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
    $ENV{'form.domainid'});
       my $fname=$ENV{'form.upfile.filename'};
       #FIXME
       #copied from lonnet::userfileupload()
       #make that function able to target a specified course
       # Replace Windows backslashes by forward slashes
       $fname=~s/\\/\//g;
       # Get rid of everything but the actual filename
       $fname=~s/^.*\/([^\/]+)$/$1/;
       # Replace spaces by underscores
       $fname=~s/\s+/\_/g;
       # Replace all other weird characters by nothing
       $fname=~s/[^\w\.\-]//g;
       # See if there is anything left
       unless ($fname) { return 'error: no uploaded file'; }
       $fname='scantron_orig_'.$fname;
       &Apache::lonnet::logthis("fname is $fname");
       $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
       $ENV{'form.domainid'},
       $home,'upfile',$fname));
       return '';
 }  }
   
   
 #-------- end of section for handling grading scantron forms -------  #-------- end of section for handling grading scantron forms -------
 #  #
 #-------------------------------------------------------------------  #-------------------------------------------------------------------
Line 3897  sub handler { Line 4179  sub handler {
  $url = $ENV{'form.url'};   $url = $ENV{'form.url'};
     }      }
     &send_header($request);      &send_header($request);
     if ($url eq '' && $symb eq '') {      if ($url eq '' && $symb eq '' && $command eq '') {
  if ($ENV{'user.adv'}) {   if ($ENV{'user.adv'}) {
     if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&      if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
  ($ENV{'form.codethree'})) {   ($ENV{'form.codethree'})) {
Line 3938  sub handler { Line 4220  sub handler {
  delete($perm{'mgr'});   delete($perm{'mgr'});
     }      }
  }   }
   
  if ($command eq 'submission' && $perm{'vgr'}) {   if ($command eq 'submission' && $perm{'vgr'}) {
     ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));      ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
  } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {   } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
Line 3982  sub handler { Line 4263  sub handler {
     $request->print(&scantron_validate_file($request));      $request->print(&scantron_validate_file($request));
  } elsif ($command eq 'scantron_process' && $perm{'mgr'}) {   } elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
     $request->print(&scantron_process_students($request));      $request->print(&scantron_process_students($request));
    } elsif ($command eq 'scantronupload' && 
    &Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})) {
       $request->print(&scantron_upload_scantron_data($request));
   
    } elsif ($command eq 'scantronupload_save' &&
    &Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})) {
       $request->print(&scantron_upload_scantron_data_save($request));
  } elsif ($command) {   } elsif ($command) {
     $request->print("Access Denied");      $request->print("$command ".join(':',%perm)."Access Denied");
  }   }
     }      }
     &send_footer($request);      &send_footer($request);
Line 3999  sub send_header { Line 4287  sub send_header {
 #remotewindow.close();  #remotewindow.close();
 #</script>");   #</script>"); 
     $request->print(&Apache::loncommon::bodytag('Grading'));      $request->print(&Apache::loncommon::bodytag('Grading'));
       $request->rflush();
 }  }
   
 sub send_footer {  sub send_footer {
Removed from v.1.130.2.1.2.3  
changed lines
  Added in v.1.130.2.1.2.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>