version 1.671, 2012/01/03 00:28:17
|
version 1.675, 2012/10/02 18:03:07
|
Line 54 use POSIX qw(floor);
|
Line 54 use POSIX qw(floor);
|
|
|
|
|
my %perm=(); |
my %perm=(); |
|
my %old_essays=(); |
|
|
# These variables are used to recover from ssi errors |
# These variables are used to recover from ssi errors |
|
|
Line 202 sub get_display_part {
|
Line 203 sub get_display_part {
|
sub reset_caches { |
sub reset_caches { |
&reset_analyze_cache(); |
&reset_analyze_cache(); |
&reset_perm(); |
&reset_perm(); |
|
&reset_old_essays(); |
} |
} |
|
|
{ |
{ |
Line 681 sub compute_points {
|
Line 683 sub compute_points {
|
# |
# |
|
|
sub most_similar { |
sub most_similar { |
my ($uname,$udom,$uessay,$old_essays)=@_; |
my ($uname,$udom,$symb,$uessay)=@_; |
|
|
|
unless ($symb) { return ''; } |
|
|
|
unless (ref($old_essays{$symb}) eq 'HASH') { return ''; } |
|
|
# ignore spaces and punctuation |
# ignore spaces and punctuation |
|
|
Line 698 sub most_similar {
|
Line 704 sub most_similar {
|
my $scrsid=''; |
my $scrsid=''; |
my $sessay=''; |
my $sessay=''; |
# go through all essays ... |
# go through all essays ... |
foreach my $tkey (keys(%$old_essays)) { |
foreach my $tkey (keys(%{$old_essays{$symb}})) { |
my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey)); |
my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey)); |
# ... except the same student |
# ... except the same student |
next if (($tname eq $uname) && ($tdom eq $udom)); |
next if (($tname eq $uname) && ($tdom eq $udom)); |
my $tessay=$old_essays->{$tkey}; |
my $tessay=$old_essays{$symb}{$tkey}; |
$tessay=~s/\W+/ /gs; |
$tessay=~s/\W+/ /gs; |
# String similarity gives up if not even limit |
# String similarity gives up if not even limit |
my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit); |
my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit); |
Line 712 sub most_similar {
|
Line 718 sub most_similar {
|
$sname=$tname; |
$sname=$tname; |
$sdom=$tdom; |
$sdom=$tdom; |
$scrsid=$tcrsid; |
$scrsid=$tcrsid; |
$sessay=$old_essays->{$tkey}; |
$sessay=$old_essays{$symb}{$tkey}; |
} |
} |
} |
} |
if ($limit>0.6) { |
if ($limit>0.6) { |
Line 1949 sub submission {
|
Line 1955 sub submission {
|
'" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.$request->dir_config('lonIconsURL'). |
'/check.gif" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
|
|
my %old_essays; |
|
# header info |
# header info |
if ($counter == 0) { |
if ($counter == 0) { |
&sub_page_js($request); |
&sub_page_js($request); |
Line 2057 KEYWORDS
|
Line 2062 KEYWORDS
|
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
$apath=&escape($apath); |
$apath=&escape($apath); |
$apath=~s/\W/\_/gs; |
$apath=~s/\W/\_/gs; |
%old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname); |
&init_old_essays($symb,$apath,$adom,$aname); |
} |
} |
} |
} |
|
|
Line 2196 KEYWORDS
|
Line 2201 KEYWORDS
|
} |
} |
if($env{'form.checkPlag'}){ |
if($env{'form.checkPlag'}){ |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
&most_similar($uname,$udom,$subval,\%old_essays); |
&most_similar($uname,$udom,$symb,$subval); |
if ($osim) { |
if ($osim) { |
$osim=int($osim*100.0); |
$osim=int($osim*100.0); |
my %old_course_desc = |
my %old_course_desc = |
Line 6999 sub scantron_validate_sequence {
|
Line 7004 sub scantron_validate_sequence {
|
my @resources= |
my @resources= |
$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0); |
$navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0); |
if (@resources) { |
if (@resources) { |
$r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>"); |
$r->print( |
|
'<p class="LC_warning">' |
|
.&mt('Some resources in the sequence currently are not set to' |
|
.' exam mode. Grading these resources currently may not' |
|
.' work correctly.') |
|
.'</p>' |
|
); |
return (1,$currentphase); |
return (1,$currentphase); |
} |
} |
} |
} |
Line 7713 sub scantron_get_maxbubble {
|
Line 7724 sub scantron_get_maxbubble {
|
my $response_number = 0; |
my $response_number = 0; |
my $bubble_line = 0; |
my $bubble_line = 0; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom,undef,$bubbles_per_row); |
my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname, |
|
$udom,undef,$bubbles_per_row); |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) { |
foreach my $part_id (@{$parts}) { |
foreach my $part_id (@{$parts}) { |
my $lines; |
my $lines; |
Line 7918 sub scantron_process_students {
|
Line 7930 sub scantron_process_students {
|
} |
} |
my ($analysis,$parts) = |
my ($analysis,$parts) = |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row); |
$env{'user.name'},$env{'user.domain'}, |
|
1,$bubbles_per_row); |
$grader_partids_by_symb{$ressymb} = $parts; |
$grader_partids_by_symb{$ressymb} = $parts; |
if (ref($analysis) eq 'HASH') { |
if (ref($analysis) eq 'HASH') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
Line 8008 SCANTRONFORM
|
Line 8021 SCANTRONFORM
|
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
my ($analysis,$parts) = |
my ($analysis,$parts) = |
&scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom,undef,$bubbles_per_row); |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
$uname,$udom,undef,$bubbles_per_row); |
$partids_by_symb{$ressymb} = $parts; |
$partids_by_symb{$ressymb} = $parts; |
} else { |
} else { |
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
$partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb}; |
Line 8137 sub graders_resources_pass {
|
Line 8151 sub graders_resources_pass {
|
my $ressymb = $resource->symb(); |
my $ressymb = $resource->symb(); |
my ($analysis,$parts) = |
my ($analysis,$parts) = |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
$env{'user.name'},$env{'user.domain'},1,$bubbles_per_row); |
$env{'user.name'},$env{'user.domain'}, |
|
1,$bubbles_per_row); |
$grader_partids_by_symb->{$ressymb} = $parts; |
$grader_partids_by_symb->{$ressymb} = $parts; |
if (ref($analysis) eq 'HASH') { |
if (ref($analysis) eq 'HASH') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') { |
Line 8458 sub checkscantron_results {
|
Line 8473 sub checkscantron_results {
|
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb); |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, \%grader_randomlists_by_symb); |
&graders_resources_pass(\@resources,\%grader_partids_by_symb, |
|
\%grader_randomlists_by_symb,$bubbles_per_row); |
|
|
my ($uname,$udom); |
my ($uname,$udom); |
my (%scandata,%lastname,%bylast); |
my (%scandata,%lastname,%bylast); |
Line 8520 sub checkscantron_results {
|
Line 8536 sub checkscantron_results {
|
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
if ((exists($grader_randomlists_by_symb{$ressymb})) || |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) { |
(my $analysis,$parts) = |
(my $analysis,$parts) = |
&scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain,undef,$bubbles_per_row); |
&scantron_partids_tograde($resource,$env{'request.course.id'}, |
|
$username,$domain,undef, |
|
$bubbles_per_row); |
} else { |
} else { |
$parts = $grader_partids_by_symb{$ressymb}; |
$parts = $grader_partids_by_symb{$ressymb}; |
} |
} |
Line 9003 sub init_perm {
|
Line 9021 sub init_perm {
|
} |
} |
} |
} |
|
|
|
sub init_old_essays { |
|
my ($symb,$apath,$adom,$aname) = @_; |
|
if ($symb ne '') { |
|
my %essays = &Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname); |
|
if (keys(%essays) > 0) { |
|
$old_essays{$symb} = \%essays; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
sub reset_old_essays { |
|
undef(%old_essays); |
|
} |
|
|
sub gather_clicker_ids { |
sub gather_clicker_ids { |
my %clicker_ids; |
my %clicker_ids; |
|
|