@@ -3685,9 +3685,11 @@ sub scantron_fixup_scanline {
$args->{'username'}.':'.$args->{'domain'});
}
} elsif ($field eq 'CODE') {
- if ($args->{'CODE'} eq 'use_unfound') {
- &scan_data($scan_data,"$whichline.useCODE",'1');
- } else {
+ if ($args->{'CODE_ignore_dup'}) {
+ &scan_data($scan_data,"$whichline.CODE_ignore_dup",'1');
+ }
+ &scan_data($scan_data,"$whichline.useCODE",'1');
+ if ($args->{'CODE'} ne 'use_unfound') {
if (length($args->{'CODE'}) > $$scantron_config{'CODElength'}) {
return ($line,1,'New CODE value too large');
}
@@ -3696,9 +3698,6 @@ sub scantron_fixup_scanline {
}
substr($line,$$scantron_config{'CODEstart'}-1,
$$scantron_config{'CODElength'})=$args->{'CODE'};
-# if ($args->{'CODE'}=~/^\s*$/) {
-# &scan_data($scan_data,"$whichline.CODE",$args->{'CODE'});
-# }
}
} elsif ($field eq 'answer') {
my $length=$scantron_config->{'Qlength'};
@@ -3730,7 +3729,7 @@ sub scan_data {
}
sub scantron_parse_scanline {
- my ($line,$whichline,$scantron_config,$scan_data,$justCODE)=@_;
+ my ($line,$whichline,$scantron_config,$scan_data,$justHeader)=@_;
my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1);
my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
@@ -3742,11 +3741,13 @@ sub scantron_parse_scanline {
if (&scan_data($scan_data,"$whichline.useCODE")) {
$record{'scantron.useCODE'}=1;
}
+ if (&scan_data($scan_data,"$whichline.CODE_ignore_dup")) {
+ $record{'scantron.CODE_ignore_dup'}=1;
+ }
} else {
#FIXME interpret first N questions
}
}
- if ($justCODE) { return \%record; }
$record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
$$scantron_config{'IDlength'});
$record{'scantron.PaperID'}=
@@ -3758,6 +3759,8 @@ sub scantron_parse_scanline {
$record{'scantron.LastName'}=
substr($data,$$scantron_config{'LastName'}-1,
$$scantron_config{'LastNamelength'});
+ if ($justHeader) { return \%record; }
+
my @alphabet=('A'..'Z');
my $questnum=0;
while ($questions) {
@@ -3841,16 +3844,23 @@ sub scantron_process_corrections {
} elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)CODE$/) {
my $resolution=$ENV{'form.scantron_CODE_resolution'};
my $newCODE;
+ my %args;
if ($resolution eq 'use_unfound') {
$newCODE='use_unfound';
} elsif ($resolution eq 'use_found') {
$newCODE=$ENV{'form.scantron_CODE_selectedvalue'};
} elsif ($resolution eq 'use_typed') {
$newCODE=$ENV{'form.scantron_CODE_newvalue'};
+ } elsif ($resolution =~ /^use_closest_(\d+)/) {
+ $newCODE=$ENV{"form.scantron_CODE_closest_$1"};
+ }
+ if ($ENV{'form.scantron_corrections'} eq 'duplicateCODE') {
+ $args{'CODE_ignore_dup'}=1;
}
+ $args{'CODE'}=$newCODE;
($line,$err,$errmsg)=
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
- 'CODE',{'CODE'=>$newCODE});
+ 'CODE',\%args);
} elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
($line,$err,$errmsg)=
@@ -3875,7 +3885,13 @@ sub scantron_validate_file {
my ($symb,$url)=&get_symb_and_url($r);
if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);
-
+ if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {
+ my $result=&scantron_remove('corrected');
+ if ($result ne 'ok' && $result ne 'not_found' ) {
+ $r->print("An error occured ($result) when trying to Remove the existing corrections.");
+ }
+ $ENV{'form.scantron_options_ignore'}='done';
+ }
if ($ENV{'form.scantron_corrections'}) {
&scantron_process_corrections($r);
}
@@ -3891,8 +3907,8 @@ sub scantron_validate_file {
Validating ".$validate_phases[$currentphase]."
");
@@ -3939,6 +3951,32 @@ SCANTRONFORM
return '';
}
+sub scantron_remove {
+ my ($which)=@_;
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $file='scantron_';
+ if ($which eq 'corrected') {
+ $file.='corrected_';
+ } else {
+ return 'refused';
+ }
+ $file.=$ENV{'form.scantron_selectfile'};
+ my $result=&Apache::lonnet::removeuserfile($cname,$cdom,$file);
+ my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);
+ my @todelete;
+ my $filename=$ENV{'form.scantron_selectfile'};
+ foreach my $key (@keys) {
+ if ($key=~/^\Q$filename\E_/) {
+ push(@todelete,$key);
+ }
+ }
+ if (@todelete) {
+ &Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+ }
+ return $result;
+}
+
sub scantron_getfile {
#FIXME really would prefer a scantron directory but tokenwrapper
# doesn't allow access to subdirs of userfiles
@@ -4044,11 +4082,11 @@ sub scantron_validate_ID {
if ($found{'ids'}{$found}) {
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
$line,'duplicateID',$found);
- return(1);
+ return(1,$currentphase);
} elsif ($found{'usernames'}{$username}) {
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
$line,'duplicateID',$username);
- return(1);
+ return(1,$currentphase);
}
#FIXME store away line we previously saw the ID on to use above
$found{'ids'}{$found}++;
@@ -4060,18 +4098,18 @@ sub scantron_validate_ID {
&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,
$line,'duplicateID',$username);
- return(1);
+ return(1,$currentphase);
} elsif (!defined($username)) {
&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,
$line,'incorrectID');
- return(1);
+ return(1,$currentphase);
}
$found{'usernames'}{$username}++;
} else {
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
$line,'incorrectID');
- return(1);
+ return(1,$currentphase);
}
}
}
@@ -4122,7 +4160,7 @@ sub scantron_get_correction {
if ($error eq 'incorrectCODE') {
$r->print("The encoded CODE is not in the list of possible CODEs
\n");
} elsif ($error eq 'duplicateCODE') {
- $r->print("The encoded CODE has also been used by a previous paper $arg, and CODEs were supposed to be unique
\n");
+ $r->print("The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique
\n");
}
$r->print("The CODE on the form is ".
$$scan_record{'scantron.CODE'}."
");
$r->print("How should I handle this? ".$$scan_record{'scantron.CODE'}." ".$testcode." ".$$scan_record{'scantron.CODE'}."
function change_radio(field) {
@@ -4157,7 +4208,6 @@ ENDSCRIPT
$r->print("There have been multiple bubbles scanned for a some question(s)
\n");
$r->print('
');
}
+sub num_matches {
+ my ($orig,$code) = @_;
+ my @code=split(//,$code);
+ my @orig=split(//,$orig);
+ my $same=0;
+ for (my $i=0;$i