--- loncom/homework/grades.pm 2007/06/15 22:16:13 1.409
+++ loncom/homework/grades.pm 2007/06/16 14:09:52 1.412
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.409 2007/06/15 22:16:13 albertel Exp $
+# $Id: grades.pm,v 1.412 2007/06/16 14:09:52 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -6289,18 +6289,18 @@ sub process_clicker_file {
$result.=&mt('Score based on attendance only');
} else {
my $number=0;
- $result.='
'.&mt('Correctness determined by the following IDs').'
';
+ $result.=''.&mt('Correctness determined by the following IDs').'';
foreach my $id (sort(keys(%correct_ids))) {
- $result.=''.$id.' - ';
+ $result.='
'.$id.' - ';
if ($correct_ids{$id} eq 'specified') {
$result.=&mt('specified');
} else {
my ($uname,$udom)=split(/\:/,$correct_ids{$id});
$result.=&Apache::loncommon::plainname($uname,$udom);
}
- $result.='
';
$number++;
}
+ $result.="
\n";
if ($number==0) {
$result.=''.&mt('No IDs found to determine correct answer').'';
return $result.&show_grading_menu_form($symb);
@@ -6313,6 +6313,24 @@ sub process_clicker_file {
''.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'');
return $result.&show_grading_menu_form($symb);
}
+
+# Were able to get all the info needed, now analyze the file
+
+ $result.=&Apache::loncommon::studentbrowser_javascript();
+ my $heading=&mt('Scanning clicker file');
+ $result.=(<
'."\n";
return $result.&show_grading_menu_form($symb);
}
@@ -6332,14 +6387,8 @@ sub iclicker_eval {
my $number=0;
my $errormsg='';
foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
- chomp($line);
- foreach my $quoted ($line=~/\,\s*\"([^\"]*)\"\s*\,/g) {
- my $replace=$quoted;
- $replace=~s/\,//g;
- &Apache::lonnet::logthis($quoted.' - '.$replace.'
');
- $line=~s/\,\s*\"\Q$quoted\E\"\s*\,/,$replace,/gs;
- }
- my @entries=split(/\,/,$line);
+ my %components=&Apache::loncommon::record_sep($line);
+ my @entries=map {$components{$_}} (sort(keys(%components)));
if ($entries[0] eq 'Question') {
for (my $i=3;$i<$#entries;$i+=6) {
$$questiontitles[$number]=$entries[$i];