--- loncom/homework/grades.pm 2007/12/15 21:54:35 1.500
+++ loncom/homework/grades.pm 2008/07/14 10:28:19 1.528
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.500 2007/12/15 21:54:35 albertel Exp $
+# $Id: grades.pm,v 1.528 2008/07/14 10:28:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,8 +47,91 @@ use LONCAPA;
use POSIX qw(floor);
+
my %perm=();
+# These variables are used to recover from ssi errors
+
+my $ssi_retries = 5;
+my $ssi_error;
+my $ssi_error_resource;
+my $ssi_error_message;
+
+
+# Do an ssi with retries:
+# While I'd love to factor out this with the vesrion in lonprintout,
+# that would either require a data coupling between modules, which I refuse to perpetuate
+# (there's quite enough of that already), or would require the invention of another infrastructure
+# I'm not quite ready to invent (e.g. an ssi_with_retry object).
+#
+# At least the logic that drives this has been pulled out into loncommon.
+
+
+#
+# ssi_with_retries - Does the server side include of a resource.
+# if the ssi call returns an error we'll retry it up to
+# the number of times requested by the caller.
+# If we still have a proble, no text is appended to the
+# output and we set some global variables.
+# to indicate to the caller an SSI error occurred.
+# All of this is supposed to deal with the issues described
+# in LonCAPA BZ 5631 see:
+# http://bugs.lon-capa.org/show_bug.cgi?id=5631
+# by informing the user that this happened.
+#
+# Parameters:
+# resource - The resource to include. This is passed directly, without
+# interpretation to lonnet::ssi.
+# form - The form hash parameters that guide the interpretation of the resource
+#
+# retries - Number of retries allowed before giving up completely.
+# Returns:
+# On success, returns the rendered resource identified by the resource parameter.
+# Side Effects:
+# The following global variables can be set:
+# ssi_error - If an unrecoverable error occurred this becomes true.
+# It is up to the caller to initialize this to false
+# if desired.
+# ssi_error_resource - If an unrecoverable error occurred, this is the value
+# of the resource that could not be rendered by the ssi
+# call.
+# ssi_error_message - The error string fetched from the ssi response
+# in the event of an error.
+#
+sub ssi_with_retries {
+ my ($resource, $retries, %form) = @_;
+ my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
+ if ($response->is_error) {
+ $ssi_error = 1;
+ $ssi_error_resource = $resource;
+ $ssi_error_message = $response->code . " " . $response->message;
+ }
+
+ return $content;
+
+}
+#
+# Prodcuces an ssi retry failure error message to the user:
+#
+
+sub ssi_print_error {
+ my ($r) = @_;
+ my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+ $r->print('
+
+
+'.&mt('Unable to retrieve a resource from a server:').'
+'.&mt('Resource:').' '.$ssi_error_resource.'
+'.&mt('Error:').' '.$ssi_error_message.'
+
+
'.
+&mt('It is recommended that you try again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').' '.
+&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).
+'
');
+ return;
+}
+
#
# --- Retrieve the parts from the metadata file.---
sub getpartlist {
@@ -157,8 +240,8 @@ sub showResourceInfo {
my %resptype = ();
my $hdgrade='no';
my %partsseen;
- foreach my $partID (sort keys(%$responseType)) {
- foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
+ foreach my $partID (sort(keys(%$responseType))) {
+ foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
my $handgrade=$$handgrade{$partID.'_'.$resID};
my $responsetype = $responseType->{$partID}->{$resID};
$hdgrade = $handgrade if ($handgrade eq 'yes');
@@ -195,27 +278,28 @@ sub reset_caches {
}
sub get_analyze {
- my ($symb,$uname,$udom)=@_;
+ my ($symb,$uname,$udom,$no_increment)=@_;
my $key = "$symb\0$uname\0$udom";
return $analyze_cache{$key} if (exists($analyze_cache{$key}));
my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
$url=&Apache::lonnet::clutter($url);
- my $subresult=&Apache::lonnet::ssi($url,
- ('grade_target' => 'analyze'),
- ('grade_domain' => $udom),
- ('grade_symb' => $symb),
- ('grade_courseid' =>
- $env{'request.course.id'}),
- ('grade_username' => $uname));
+ my $subresult=&ssi_with_retries($url, $ssi_retries,
+ ('grade_target' => 'analyze',
+ 'grade_domain' => $udom,
+ 'grade_symb' => $symb,
+ 'grade_courseid' =>
+ $env{'request.course.id'},
+ 'grade_username' => $uname,
+ 'grade_noincrement' => $no_increment));
(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
my %analyze=&Apache::lonnet::str2hash($subresult);
return $analyze_cache{$key} = \%analyze;
}
sub get_order {
- my ($partid,$respid,$symb,$uname,$udom)=@_;
- my $analyze = &get_analyze($symb,$uname,$udom);
+ my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;
+ my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);
return $analyze->{"$partid.$respid.shown"};
}
@@ -947,7 +1031,7 @@ LISTJAVASCRIPT
' '.$section.($group ne '' ?'/'.$group:'').''."\n";
if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
- foreach (sort keys(%status)) {
+ foreach (sort(keys(%status))) {
next if ($_ =~ /^resource.*?submitted_by$/);
$gradeTable.='
'.&mt($status{$_}).'
'."\n";
}
@@ -1759,9 +1843,9 @@ sub download_all_link {
join("\n",&Apache::loncommon::get_env_multiple('form.vPart'));
my $identifier = &Apache::loncommon::get_cgi_id();
- &Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
- 'cgi.'.$identifier.'.symb' => $symb,
- 'cgi.'.$identifier.'.parts' => $parts,);
+ &Apache::lonnet::appenv({'cgi.'.$identifier.'.students' => $all_students,
+ 'cgi.'.$identifier.'.symb' => $symb,
+ 'cgi.'.$identifier.'.parts' => $parts,});
$r->print(''.
&mt('Download All Submitted Documents').'');
return
@@ -2142,8 +2226,8 @@ KEYWORDS
$seen{$partid}++;
next if ($$handgrade{$part_resp} ne 'yes'
&& $env{'form.lastSub'} eq 'hdgrade');
- push @partlist,$partid;
- push @gradePartRespid,$partid.'.'.$respid;
+ push(@partlist,$partid);
+ push(@gradePartRespid,$partid.'.'.$respid);
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}
$request->print('');
@@ -2470,7 +2554,7 @@ sub processHandGrade {
my (@parsedlist,@nextlist);
my ($nextflg) = 0;
- foreach (sort
+ foreach my $item (sort
{
if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
@@ -2478,12 +2562,12 @@ sub processHandGrade {
return $a cmp $b;
} (keys(%$fullname))) {
if ($nextflg == 1 && $button =~ /Next$/) {
- push @parsedlist,$_;
+ push(@parsedlist,$item);
}
- $nextflg = 1 if ($_ eq $laststu);
+ $nextflg = 1 if ($item eq $laststu);
if ($button eq 'Previous') {
- last if ($_ eq $firststu);
- push @parsedlist,$_;
+ last if ($item eq $firststu);
+ push(@parsedlist,$item);
}
}
$ctr = 0;
@@ -2506,11 +2590,11 @@ sub processHandGrade {
my $submitted = 0;
my $ungraded = 0;
my $incorrect = 0;
- foreach (keys(%status)) {
- $submitted = 1 if ($status{$_} ne 'nothing');
- $ungraded = 1 if ($status{$_} =~ /^ungraded/);
- $incorrect = 1 if ($status{$_} =~ /^incorrect/);
- my ($foo,$partid,$foo1) = split(/\./,$_);
+ foreach my $item (keys(%status)) {
+ $submitted = 1 if ($status{$item} ne 'nothing');
+ $ungraded = 1 if ($status{$item} =~ /^ungraded/);
+ $incorrect = 1 if ($status{$item} =~ /^incorrect/);
+ my ($foo,$partid,$foo1) = split(/\./,$item);
if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
$submitted = 0;
}
@@ -2521,7 +2605,7 @@ sub processHandGrade {
next if (!$ungraded && ($submitonly eq 'graded'));
next if (!$incorrect && $submitonly eq 'incorrect');
}
- push @nextlist,$student if ($ctr < $ntstu);
+ push(@nextlist,$student) if ($ctr < $ntstu);
last if ($ctr == $ntstu);
$ctr++;
}
@@ -2529,7 +2613,7 @@ sub processHandGrade {
$ctr = 0;
my $total = scalar(@nextlist)-1;
- foreach (sort @nextlist) {
+ foreach (sort(@nextlist)) {
my ($uname,$udom,$submitter) = split(/:/);
$env{'form.student'} = $uname;
$env{'form.userdom'} = $udom;
@@ -2575,7 +2659,7 @@ sub saveHandGrade {
}
} elsif ($dropMenu eq 'reset status'
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
- foreach my $key (keys (%record)) {
+ foreach my $key (keys(%record)) {
if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
}
$newrecord{'resource.'.$new_part.'.regrader'}=
@@ -2610,7 +2694,7 @@ sub saveHandGrade {
&handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
next;
} else {
- push @parts_graded, $new_part;
+ push(@parts_graded,$new_part);
}
if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
$newrecord{'resource.'.$new_part.'.awarded'} = $partial;
@@ -2637,7 +2721,7 @@ sub saveHandGrade {
$record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
$dropMenu eq 'reset status')
{
- push (@version_parts,$new_part);
+ push(@version_parts,$new_part);
}
}
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -2685,7 +2769,7 @@ sub check_and_remove_from_queue {
sub handback_files {
my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
- my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
+ my $portfolio_root = '/userfiles/portfolio';
my ($partlist,$handgrade,$responseType) = &response_type($symb);
my @part_response_id = &flatten_responseType($responseType);
@@ -2703,7 +2787,8 @@ sub handback_files {
my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
- my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
+ my $getpropath = 1;
+ my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath);
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
# fix file name
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
@@ -2809,7 +2894,7 @@ sub decrement_aggs {
if ($aggtries == $totaltries) {
$decrement{'users'} = 1;
}
- foreach my $type (keys (%decrement)) {
+ foreach my $type (keys(%decrement)) {
$$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
}
return;
@@ -2839,8 +2924,7 @@ sub version_portfiles {
my $version_parts = join('|',@$v_flag);
my @returned_keys;
my $parts = join('|', @$parts_graded);
- my $portfolio_root = &propath($domain,$stu_name).
- '/userfiles/portfolio';
+ my $portfolio_root = '/userfiles/portfolio';
foreach my $key (keys(%$record)) {
my $new_portfiles;
if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
@@ -2851,7 +2935,8 @@ sub version_portfiles {
my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);
- my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
+ my $getpropath = 1;
+ my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath);
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
if ($new_answer ne 'problem getting file') {
@@ -3210,7 +3295,7 @@ sub viewgrades {
$display =~ s|^Number of Attempts|Tries |; # makes the column narrower
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
my ($partid) = &split_part_type($part);
- push(@partids, $partid);
+ push(@partids,$partid);
my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
$result.='
'.
@@ -3364,7 +3449,7 @@ sub editgrades {
my $header;
while ($ctr < $env{'form.totalparts'}) {
my $partid = $env{'form.partid_'.$ctr};
- push @partid,$partid;
+ push(@partid,$partid);
$weight{$partid} = $env{'form.weight_'.$partid};
$ctr++;
}
@@ -3960,31 +4045,31 @@ sub csvuploadassign {
$grades{$store_key}=$entries{$fields{$dest}};
}
}
- if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
- $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
- my $result=&Apache::lonnet::cstore(\%grades,$symb,
+ if (! %grades) {
+ push(@skipped,&mt("[_1]: no data to save","$username:$domain"));
+ } else {
+ $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+ my $result=&Apache::lonnet::cstore(\%grades,$symb,
$env{'request.course.id'},
$domain,$username);
- if ($result eq 'ok') {
- $request->print('.');
- } else {
- $request->print("
-
- Failed to save student $username:$domain.
- Message when trying to save was ($result)
-
-
';
my %newrecord=();
@@ -4513,10 +4600,10 @@ sub updateGradeByPage {
}
my $display_part=&get_display_part($partid,$curRes->symb());
my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
- $displayPts[0].=' Part: '.$display_part.' = '.
+ $displayPts[0].=' '.&mt('Part').': '.$display_part.' = '.
(($oldstatus eq 'excused') ? 'excused' : $oldpts).
' ';
- $displayPts[1].=' Part: '.$display_part.' = '.
+ $displayPts[1].=' '.&mt('Part').': '.$display_part.' = '.
(($score eq 'excused') ? 'excused' : $newpts).
' ';
$question++;
@@ -4565,9 +4652,9 @@ sub updateGradeByPage {
$studentTable.=&Apache::loncommon::end_data_table();
$studentTable.=&show_grading_menu_form($env{'form.symb'});
- my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
- 'The scores were changed for '.
- $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+ my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
+ &mt('The scores were changed for [quant,_1,problem].',
+ $changeflag));
$request->print($grademsg.$studentTable);
return '';
@@ -4681,6 +4768,13 @@ my %bubble_lines_per_response; # no.
my %first_bubble_line; # First bubble line no. for each bubble.
+my %subdivided_bubble_lines; # no. bubble lines for optionresponse,
+ # matchresponse or rankresponse, where
+ # an individual response can have multiple
+ # lines
+
+my %responsetype_per_response; # responsetype for each response
+
# Save and restore the bubble lines array to the form env.
@@ -4689,6 +4783,10 @@ sub save_bubble_lines {
$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
$env{"form.scantron.first_bubble_line.$line"} =
$first_bubble_line{$line};
+ $env{"form.scantron.sub_bubblelines.$line"} =
+ $subdivided_bubble_lines{$line};
+ $env{"form.scantron.responsetype.$line"} =
+ $responsetype_per_response{$line};
}
}
@@ -4701,6 +4799,10 @@ sub restore_bubble_lines {
$bubble_lines_per_response{$line} = $value;
$first_bubble_line{$line} =
$env{"form.scantron.first_bubble_line.$line"};
+ $subdivided_bubble_lines{$line} =
+ $env{"form.scantron.sub_bubblelines.$line"};
+ $responsetype_per_response{$line} =
+ $env{"form.scantron.responsetype.$line"};
$line++;
}
@@ -4736,8 +4838,9 @@ sub get_response_bubbles {
sub scantron_filenames {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+ my $getpropath = 1;
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
- &propath($cdom,$cname));
+ $getpropath);
my @possiblenames;
foreach my $filename (sort(@files)) {
($filename)=split(/&/,$filename);
@@ -4780,19 +4883,76 @@ sub scantron_uploads {
=cut
sub scantron_scantab {
- my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
my $result=''."\n";
-
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
@@ -4866,6 +5026,8 @@ sub scantron_selectphase {
my $CODE_unique=&scantron_CODEunique();
my $result;
+ $ssi_error = 0;
+
# Chunk of form to prompt for a file to grade and how:
$result.= '
@@ -4986,8 +5148,37 @@ sub scantron_selectphase {
');
&Apache::lonpickcode::code_list($r,2);
+
+ $r->print('
');
$r->print($grading_menu_button);
- return
+ return;
}
=pod
@@ -5049,10 +5240,10 @@ sub scantron_selectphase {
sub get_scantron_config {
my ($which) = @_;
- my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+ my @lines = &get_scantronformat_file();
my %config;
#FIXME probably should move to XML it has already gotten a bit much now
- foreach my $line (<$fh>) {
+ foreach my $line (@lines) {
my ($name,$descrip)=split(/:/,$line);
if ($name ne $which ) { next; }
chomp($line);
@@ -5139,6 +5330,8 @@ sub username_to_idmap {
- 'answer'
'response' - new answer or 'none' if blank
'question' - the bubble line to change
+ 'questionnum' - the question identifier,
+ may include subquestion.
Returns:
$line - the modified scanline
@@ -5187,7 +5380,7 @@ sub scantron_fixup_scanline {
my $answer=${off}x$length;
if ($args->{'response'} eq 'none') {
&scan_data($scan_data,
- "$whichline.no_bubble.".$args->{'question'},'1');
+ "$whichline.no_bubble.".$args->{'questionnum'},'1');
} else {
if ($on eq 'letter') {
my @alphabet=('A'..'Z');
@@ -5199,7 +5392,7 @@ sub scantron_fixup_scanline {
substr($answer,$args->{'response'},1)=$on;
}
&scan_data($scan_data,
- "$whichline.no_bubble.".$args->{'question'},undef,'1');
+ "$whichline.no_bubble.".$args->{'questionnum'},undef,'1');
}
my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
substr($line,$where-1,$length)=$answer;
@@ -5371,166 +5564,218 @@ sub scantron_parse_scanline {
$questions =~ s/\r$//; # Get rid of trailing \r too (MAC or Win uploads).
while (length($questions)) {
my $answers_needed = $bubble_lines_per_response{$questnum};
- my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed)
- || 1;
-
- $questnum++;
- my $currentquest = substr($questions,0,$answer_length);
- $questions = substr($questions,$answer_length);
- if (length($currentquest) < $answer_length) { next; }
-
- # Qon letter implies for each slot in currentquest we have:
- # ? or * for doubles a letter in A-Z for a bubble and
- # about anything else (esp. a value of Qoff for missing
- # bubbles.
-
-
- if ($$scantron_config{'Qon'} eq 'letter') {
- if ($currentquest =~ /\?/
- || $currentquest =~ /\*/
- || (&occurence_count($currentquest, "[A-Z]") > 1)) {
- push(@{$record{'scantron.doubleerror'}},$questnum);
- for (my $ans = 0; $ans < $answers_needed; $ans++) {
- my $bubble = substr($currentquest, $ans, 1);
- if ($bubble =~ /[A-Z]/ ) {
- $record{"scantron.$ansnum.answer"} = $bubble;
- } else {
- $record{"scantron.$ansnum.answer"}='';
- }
- $ansnum++;
- }
-
- } elsif (!defined($currentquest)
- || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
- || (&occurence_count($currentquest, "[A-Z]") == 0)) {
- for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
- $record{"scantron.$ansnum.answer"}='';
- $ansnum++;
-
- }
- if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
- push(@{$record{"scantron.missingerror"}},$questnum);
- # $ansnum += $answers_needed;
- }
- } else {
- for (my $ans = 0; $ans < $answers_needed; $ans++) {
- my $bubble = substr($currentquest, $ans, 1);
- $record{"scantron.$ansnum.answer"} = $bubble;
- $ansnum++;
- }
- }
-
- # Qon 'number' implies each slot gives a digit that indexes the
- # the bubbles filled or Qoff or a non number for unbubbled lines.
- # and *? for double bubbles on a line.
- # these answers are also stored as letters.
-
- } elsif ($$scantron_config{'Qon'} eq 'number') {
- if ($currentquest =~ /\?/
- || $currentquest =~ /\*/
- || (&occurence_count($currentquest, '\d') > 1)) {
- push(@{$record{'scantron.doubleerror'}},$questnum);
- for (my $ans = 0; $ans < $answers_needed; $ans++) {
- my $bubble = substr($currentquest, $ans, 1);
- if ($bubble =~ /\d/) {
- $record{"scantron.$ansnum.answer"} = $alphabet[$bubble];
- } else {
- $record{"scantron.$ansnum.answer"}=' ';
- }
- $ansnum++;
- }
-
- } elsif (!defined($currentquest)
- || (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest))
- || (&occurence_count($currentquest, '\d') == 0)) {
- for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
- $record{"scantron.$ansnum.answer"}='';
- $ansnum++;
-
- }
- if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
- push(@{$record{"scantron.missingerror"}},$questnum);
- $ansnum += $answers_needed;
- }
-
- } else {
- $currentquest = &digits_to_letters($currentquest);
- for (my $ans =0; $ans < $answers_needed; $ans++) {
- $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
- $ansnum++;
- }
- }
- } else {
+ my $answer_length = ($$scantron_config{'Qlength'} * $answers_needed)
+ || 1;
+ $questnum++;
+ my $quest_id = $questnum;
+ my $currentquest = substr($questions,0,$answer_length);
+ $questions = substr($questions,$answer_length);
+ if (length($currentquest) < $answer_length) { next; }
+
+ if ($subdivided_bubble_lines{$questnum-1} =~ /,/) {
+ my $subquestnum = 1;
+ my $subquestions = $currentquest;
+ my @subanswers_needed =
+ split(/,/,$subdivided_bubble_lines{$questnum-1});
+ foreach my $subans (@subanswers_needed) {
+ my $subans_length =
+ ($$scantron_config{'Qlength'} * $subans) || 1;
+ my $currsubquest = substr($subquestions,0,$subans_length);
+ $subquestions = substr($subquestions,$subans_length);
+ $quest_id = "$questnum.$subquestnum";
+ if (($$scantron_config{'Qon'} eq 'letter') ||
+ ($$scantron_config{'Qon'} eq 'number')) {
+ $ansnum = &scantron_validator_lettnum($ansnum,
+ $questnum,$quest_id,$subans,$currsubquest,$whichline,
+ \@alphabet,\%record,$scantron_config,$scan_data);
+ } else {
+ $ansnum = &scantron_validator_positional($ansnum,
+ $questnum,$quest_id,$subans,$currsubquest,$whichline, \@alphabet,\%record,$scantron_config,$scan_data);
+ }
+ $subquestnum ++;
+ }
+ } else {
+ if (($$scantron_config{'Qon'} eq 'letter') ||
+ ($$scantron_config{'Qon'} eq 'number')) {
+ $ansnum = &scantron_validator_lettnum($ansnum,$questnum,
+ $quest_id,$answers_needed,$currentquest,$whichline,
+ \@alphabet,\%record,$scantron_config,$scan_data);
+ } else {
+ $ansnum = &scantron_validator_positional($ansnum,$questnum,
+ $quest_id,$answers_needed,$currentquest,$whichline,
+ \@alphabet,\%record,$scantron_config,$scan_data);
+ }
+ }
+ }
+ $record{'scantron.maxquest'}=$questnum;
+ return \%record;
+}
- # Otherwise there's a positional notation;
- # each bubble line requires Qlength items, and there are filled in
- # bubbles for each case where there 'Qon' characters.
- #
+sub scantron_validator_lettnum {
+ my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,
+ $alphabet,$record,$scantron_config,$scan_data) = @_;
+
+ # Qon 'letter' implies for each slot in currquest we have:
+ # ? or * for doubles, a letter in A-Z for a bubble, and
+ # about anything else (esp. a value of Qoff) for missing
+ # bubbles.
+ #
+ # Qon 'number' implies each slot gives a digit that indexes the
+ # bubbles filled, or Qoff, or a non-number for unbubbled lines,
+ # and * or ? for double bubbles on a single line.
+ #
- my @array=split($$scantron_config{'Qon'},$currentquest,-1);
+ my $matchon;
+ if ($$scantron_config{'Qon'} eq 'letter') {
+ $matchon = '[A-Z]';
+ } elsif ($$scantron_config{'Qon'} eq 'number') {
+ $matchon = '\d';
+ }
+ my $occurrences = 0;
+ if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
+ my @singlelines = split('',$currquest);
+ foreach my $entry (@singlelines) {
+ $occurrences = &occurence_count($entry,$matchon);
+ if ($occurrences > 1) {
+ last;
+ }
+ }
+ } else {
+ $occurrences = &occurence_count($currquest,$matchon);
+ }
+ if (($currquest =~ /\?/ || $currquest =~ /\*/) || ($occurrences > 1)) {
+ push(@{$record->{'scantron.doubleerror'}},$quest_id);
+ for (my $ans=0; $ans<$answers_needed; $ans++) {
+ my $bubble = substr($currquest,$ans,1);
+ if ($bubble =~ /$matchon/ ) {
+ if ($$scantron_config{'Qon'} eq 'number') {
+ if ($bubble == 0) {
+ $bubble = 10;
+ }
+ $record->{"scantron.$ansnum.answer"} =
+ $alphabet->[$bubble-1];
+ } else {
+ $record->{"scantron.$ansnum.answer"} = $bubble;
+ }
+ } else {
+ $record->{"scantron.$ansnum.answer"}='';
+ }
+ $ansnum++;
+ }
+ } elsif (!defined($currquest)
+ || (&occurence_count($currquest, $$scantron_config{'Qoff'}) == length($currquest))
+ || (&occurence_count($currquest,$matchon) == 0)) {
+ for (my $ans=0; $ans<$answers_needed; $ans++ ) {
+ $record->{"scantron.$ansnum.answer"}='';
+ $ansnum++;
+ }
+ if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) {
+ push(@{$record->{'scantron.missingerror'}},$quest_id);
+ }
+ } else {
+ if ($$scantron_config{'Qon'} eq 'number') {
+ $currquest = &digits_to_letters($currquest);
+ }
+ for (my $ans=0; $ans<$answers_needed; $ans++) {
+ my $bubble = substr($currquest,$ans,1);
+ $record->{"scantron.$ansnum.answer"} = $bubble;
+ $ansnum++;
+ }
+ }
+ return $ansnum;
+}
- # If the split only giveas us one element.. the full length of the
- # answser string, no bubbles are filled in:
+sub scantron_validator_positional {
+ my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,
+ $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_;
- if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
- for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
- $record{"scantron.$ansnum.answer"}='';
- $ansnum++;
+ # Otherwise there's a positional notation;
+ # each bubble line requires Qlength items, and there are filled in
+ # bubbles for each case where there 'Qon' characters.
+ #
- }
- if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
- push(@{$record{"scantron.missingerror"}},$questnum);
- }
-
+ my @array=split($$scantron_config{'Qon'},$currquest,-1);
+ # If the split only gives us one element.. the full length of the
+ # answer string, no bubbles are filled in:
- } elsif (scalar(@array) eq 2) {
+ if ($answers_needed eq '') {
+ return;
+ }
- my $location = length($array[0]);
- my $line_num = int($location / $$scantron_config{'Qlength'});
- my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];
-
+ if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
+ for (my $ans=0; $ans<$answers_needed; $ans++ ) {
+ $record->{"scantron.$ansnum.answer"}='';
+ $ansnum++;
+ }
+ if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) {
+ push(@{$record->{"scantron.missingerror"}},$quest_id);
+ }
+ } elsif (scalar(@array) == 2) {
+ my $location = length($array[0]);
+ my $line_num = int($location / $$scantron_config{'Qlength'});
+ my $bubble = $alphabet->[$location % $$scantron_config{'Qlength'}];
+ for (my $ans=0; $ans<$answers_needed; $ans++) {
+ if ($ans eq $line_num) {
+ $record->{"scantron.$ansnum.answer"} = $bubble;
+ } else {
+ $record->{"scantron.$ansnum.answer"} = ' ';
+ }
+ $ansnum++;
+ }
+ } else {
+ # If there's more than one instance of a bubble character
+ # That's a double bubble; with positional notation we can
+ # record all the bubbles filled in as well as the
+ # fact this response consists of multiple bubbles.
+ #
+ if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+ ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
+ my $doubleerror = 0;
+ while (($currquest >= $$scantron_config{'Qlength'}) &&
+ (!$doubleerror)) {
+ my $currline = substr($currquest,0,$$scantron_config{'Qlength'});
+ $currquest = substr($currquest,$$scantron_config{'Qlength'});
+ my @currarray = split($$scantron_config{'Qon'},$currline,-1);
+ if (length(@currarray) > 2) {
+ $doubleerror = 1;
+ }
+ }
+ if ($doubleerror) {
+ push(@{$record->{'scantron.doubleerror'}},$quest_id);
+ }
+ } else {
+ push(@{$record->{'scantron.doubleerror'}},$quest_id);
+ }
+ my $item = $ansnum;
+ for (my $ans=0; $ans<$answers_needed; $ans++) {
+ $record->{"scantron.$item.answer"} = '';
+ $item ++;
+ }
- for (my $ans = 0; $ans < $answers_needed; $ans++) {
- if ($ans eq $line_num) {
- $record{"scantron.$ansnum.answer"} = $bubble;
- } else {
- $record{"scantron.$ansnum.answer"} = ' ';
- }
- $ansnum++;
- }
- }
- # If there's more than one instance of a bubble character
- # That's a double bubble; with positional notation we can
- # record all the bubbles filled in as well as the
- # fact this response consists of multiple bubbles.
- #
- else {
- push(@{$record{'scantron.doubleerror'}},$questnum);
-
- my $first_answer = $ansnum;
- for (my $ans =0; $ans < $answers_needed; $ans++) {
- my $item = $first_answer+$ans;
- $record{"scantron.$item.answer"} = '';
- }
-
- my @ans=@array;
- my $i=0;
- my $increment = 0;
- while ($#ans) {
- $i+=length($ans[0]) + $increment;
- my $line = int($i/$$scantron_config{'Qlength'} + $first_answer);
- my $bubble = $i%$$scantron_config{'Qlength'};
- $record{"scantron.$line.answer"}.=$alphabet[$bubble];
- shift(@ans);
- $increment = 1;
- }
- $ansnum += $answers_needed;
- }
- }
+ my @ans=@array;
+ my $i=0;
+ my $increment = 0;
+ while ($#ans) {
+ $i+=length($ans[0]) + $increment;
+ my $line = int($i/$$scantron_config{'Qlength'} + $ansnum);
+ my $bubble = $i%$$scantron_config{'Qlength'};
+ $record->{"scantron.$line.answer"}.=$alphabet->[$bubble];
+ shift(@ans);
+ $increment = 1;
+ }
+ $ansnum += $answers_needed;
}
- $record{'scantron.maxquest'}=$questnum;
- return \%record;
+ return $ansnum;
}
=pod
@@ -5670,7 +5915,8 @@ sub scantron_process_corrections {
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
$which,'answer',
{ 'question'=>$question,
- 'response'=>$env{"form.scantron_correct_Q_$question"}});
+ 'response'=>$env{"form.scantron_correct_Q_$question"},
+ 'questionnum'=>$env{"form.scantron_questionnum_Q_$question"}});
if ($err) { last; }
}
}
@@ -5889,6 +6135,10 @@ SCANTRONFORM
''."\n";
$chunk .=
''."\n";
+ $chunk .=
+ ''."\n";
+ $chunk .=
+ ''."\n";
$result .= $chunk;
$line++;
}
@@ -5933,7 +6183,7 @@ sub scantron_validate_file {
if ($env{'form.scantron_corrections'}) {
&scantron_process_corrections($r);
}
- $r->print('
'.&mt('Gathering necessary info.').'
');$r->rflush();
+ $r->print('
'.&mt('Gathering necessary information.').'
');$r->rflush();
#get the student pick code ready
$r->print(&Apache::loncommon::studentbrowser_javascript());
my $max_bubble=&scantron_get_maxbubble();
@@ -5953,7 +6203,7 @@ sub scantron_validate_file {
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
- $r->print('
');
+ $r->print(&mt('Validating '.$validate_phases[$currentphase]).' ');
$r->rflush();
my $which="scantron_validate_".$validate_phases[$currentphase];
{
@@ -5963,8 +6213,7 @@ sub scantron_validate_file {
}
if (!$stop) {
my $warning=&scantron_warning_screen('Start Grading');
- $r->print('
-'.&mt('Validation process complete.').'
+ $r->print(&mt('Validation process complete.').'
'.$warning.'
@@ -5981,7 +6230,11 @@ sub scantron_validate_file {
$r->print("
".&mt("Or click the 'Grading Menu' button to start over.")."
");
} else {
- $r->print('');
+ if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
+ $r->print('');
+ } else {
+ $r->print('');
+ }
$r->print(' '.&mt('using corrected info').' ');
$r->print("");
$r->print(" ".&mt("this scanline saving it for later."));
@@ -6463,7 +6716,6 @@ sub scantron_validate_ID {
sub scantron_get_correction {
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
-
#FIXME in the case of a duplicated ID the previous line, probably need
#to show both the current line and the previous one and allow skipping
#the previous one or the current one
@@ -6485,6 +6737,10 @@ sub scantron_get_correction {
$r->print(''."\n");
$r->print(''."\n");
+ # Array populated for doublebubble or
+ my @lines_to_correct; # missingbubble errors to build javascript
+ # to validate radio button checking
+
if ($error =~ /ID$/) {
if ($error eq 'incorrectID') {
$r->print("
".&mt("The encoded ID is not in the classlist").
@@ -6580,7 +6836,7 @@ ENDSCRIPT
""));
$r->print("\n
".&mt("There have been multiple bubbles scanned for a some question(s)")."
\n");
+ $r->print("
".&mt("There have been multiple bubbles scanned for some question(s)")."
\n");
# The form field scantron_questions is acutally a list of line numbers.
# represented by this form so:
@@ -6592,15 +6848,18 @@ ENDSCRIPT
$r->print($message);
$r->print("
".&mt("Please indicate which bubble should be used for grading")."
".&mt("There have been no bubbles scanned for some question(s)")."
\n");
$r->print($message);
$r->print("
".&mt("Please indicate which bubble should be used for grading.")."
");
- $r->print(&mt("Some questions have no scanned bubbles")."\n");
+ $r->print(&mt("Some questions have no scanned bubbles.")."\n");
- # The form field scantron_questinos is actually a list of line numbers not
+ # The form field scantron_questions is actually a list of line numbers not
# a list of question numbers. Therefore:
#
@@ -6609,14 +6868,50 @@ ENDSCRIPT
$r->print('');
foreach my $question (@{$arg}) {
- &prompt_for_corrections($r, $question, $scan_config, $scan_record);
+ my @linenums = &prompt_for_corrections($r,$question,$scan_config,
+ $scan_record, $error);
+ push(@lines_to_correct,@linenums);
}
+ $r->print(&verify_bubbles_checked(@lines_to_correct));
} else {
$r->print("\n
");
}
$r->print("\n
");
}
+sub verify_bubbles_checked {
+ my (@ansnums) = @_;
+ my $ansnumstr = join('","',@ansnums);
+ my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
+ my $output = (<
+function verify_bubble_radio(form) {
+ var ansnumArray = new Array ("$ansnumstr");
+ var need_bubble_count = 0;
+ for (var i=0; i 1) {
+ var bubble_picked = 0;
+ for (var j=0; j
+ENDSCRIPT
+ return $output;
+}
+
=pod
=item questions_to_line_list
@@ -6635,11 +6930,26 @@ sub questions_to_line_list {
my ($questions) = @_;
my @lines;
- foreach my $question (@{$questions}) {
- my $first = $first_bubble_line{$question-1} + 1;
- my $count = $bubble_lines_per_response{$question-1};
- my $last = $first+$count-1;
- push(@lines, ($first..$last));
+ foreach my $item (@{$questions}) {
+ my $question = $item;
+ my ($first,$count,$last);
+ if ($item =~ /^(\d+)\.(\d+)$/) {
+ $question = $1;
+ my $subquestion = $2;
+ $first = $first_bubble_line{$question-1} + 1;
+ my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+ my $subcount = 1;
+ while ($subcount<$subquestion) {
+ $first += $subans[$subcount-1];
+ $subcount ++;
+ }
+ $count = $subans[$subquestion-1];
+ } else {
+ $first = $first_bubble_line{$question-1} + 1;
+ $count = $bubble_lines_per_response{$question-1};
+ }
+ $last = $first+$count-1;
+ push(@lines, ($first..$last));
}
return join(',', @lines);
}
@@ -6657,33 +6967,74 @@ for multi and missing bubble cases).
$question - The question number to prompt for.
$scan_config - The scantron file configuration hash.
$scan_record - Reference to the hash that has the the parsed scanlines.
+ $error - Type of error
Implicit inputs:
%bubble_lines_per_response - Starting line numbers for each question.
Numbered from 0 (but question numbers are from
1.
%first_bubble_line - Starting bubble line for each question.
+ %subdivided_bubble_lines - optionresponse, matchresponse and rankresponse
+ type problems render as separate sub-questions,
+ in exam mode. This hash contains a
+ comma-separated list of the lines per
+ sub-question.
+ %responsetype_per_response - essayresponse, formularesponse,
+ stringresponse, imageresponse, reactionresponse,
+ and organicresponse type problem parts can have
+ multiple lines per response if the weight
+ assigned exceeds 10. In this case, only
+ one bubble per line is permitted, but more
+ than one line might contain bubbles, e.g.
+ bubbling of: line 1 - J, line 2 - J,
+ line 3 - B would assign 22 points.
=cut
sub prompt_for_corrections {
- my ($r, $question, $scan_config, $scan_record) = @_;
-
- my $lines = $bubble_lines_per_response{$question-1};
- my $current_line = $first_bubble_line{$question-1} + 1 ;
-
+ my ($r, $question, $scan_config, $scan_record, $error) = @_;
+ my ($current_line,$lines);
+ my @linenums;
+ my $questionnum = $question;
+ if ($question =~ /^(\d+)\.(\d+)$/) {
+ $question = $1;
+ $current_line = $first_bubble_line{$question-1} + 1 ;
+ my $subquestion = $2;
+ my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+ my $subcount = 1;
+ while ($subcount<$subquestion) {
+ $current_line += $subans[$subcount-1];
+ $subcount ++;
+ }
+ $lines = $subans[$subquestion-1];
+ } else {
+ $current_line = $first_bubble_line{$question-1} + 1 ;
+ $lines = $bubble_lines_per_response{$question-1};
+ }
if ($lines > 1) {
- $r->print(&mt("The group of bubble lines below responds to a single question. Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")." ");
+ $r->print(&mt('The group of bubble lines below responds to a single question.').' ');
+ if (($responsetype_per_response{$question-1} eq 'essayresponse') ||
+ ($responsetype_per_response{$question-1} eq 'formularesponse') ||
+ ($responsetype_per_response{$question-1} eq 'stringresponse') ||
+ ($responsetype_per_response{$question-1} eq 'imageresponse') ||
+ ($responsetype_per_response{$question-1} eq 'reactionresponse') ||
+ ($responsetype_per_response{$question-1} eq 'organicresponse')) {
+ $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their scantron sheets.",$lines).'
'.&mt('A non-zero score can be assigned to the student during scantron grading by selecting a bubble in at least one line.').' '.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').' '.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'
');
+ } else {
+ $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")." ");
+ }
}
for (my $i =0; $i < $lines; $i++) {
- my $selected = $$scan_record{"scantron.$current_line.answer"};
- &scantron_bubble_selector($r, $scan_config, $current_line,
- split('', $selected));
+ my $selected = $$scan_record{"scantron.$current_line.answer"};
+ &scantron_bubble_selector($r,$scan_config,$current_line,
+ $questionnum,$error,split('', $selected));
+ push(@linenums,$current_line);
$current_line++;
}
if ($lines > 1) {
$r->print(" ");
}
+ return @linenums;
}
=pod
@@ -6697,34 +7048,46 @@ sub prompt_for_corrections {
$r - Apache request object
$scan_config - hash from &get_scantron_config()
$line - Number of the line being displayed.
+ $questionnum - Question number (may include subquestion)
+ $error - Type of error.
@selected - Array of bubbles picked on this line.
=cut
sub scantron_bubble_selector {
- my ($r,$scan_config,$line,@selected)=@_;
+ my ($r,$scan_config,$line,$questionnum,$error,@selected)=@_;
my $max=$$scan_config{'Qlength'};
my $scmode=$$scan_config{'Qon'};
if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
my @alphabet=('A'..'Z');
- $r->print("