--- loncom/homework/grades.pm 2006/02/28 02:47:30 1.323
+++ loncom/homework/grades.pm 2006/03/11 00:08:48 1.332
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.323 2006/02/28 02:47:30 banghart Exp $
+# $Id: grades.pm,v 1.332 2006/03/11 00:08:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,7 +49,8 @@ my %perm=();
#
# --- Retrieve the parts from the metadata file.---
sub getpartlist {
- my ($url,$symb) = @_;
+ my ($symb) = @_;
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $partorder = &Apache::lonnet::metadata($url, 'partorder');
my @parts;
if ($partorder) {
@@ -79,7 +80,7 @@ sub getpartlist {
}
# --- Get the symbolic name of a problem and the url
-sub get_symb_and_url {
+sub get_symb {
my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
@@ -89,7 +90,7 @@ sub get_symb_and_url {
return ();
}
}
- return ($symb,$url);
+ return ($symb);
}
#--- Format fullname, username:domain if different for display
@@ -107,8 +108,8 @@ sub nameUserString {
#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {
- my ($url,$symb) = shift;
- $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
+ my ($symb) = shift;
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $allkeys = &Apache::lonnet::metadata($url,'keys');
my %vPart;
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
@@ -136,15 +137,11 @@ sub response_type {
push @partlist,$partid;
}
}
- return \@partlist,\%handgrade,\%responseType;
+ return (\@partlist,\%handgrade,\%responseType);
}
sub get_display_part {
- my ($partID,$url,$symb)=@_;
- if (!defined($symb) || $symb eq '') {
- $symb=$env{'form.symb'};
- if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }
- }
+ my ($partID,$symb)=@_;
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {
$display.= " (id $partID)";
@@ -157,13 +154,13 @@ sub get_display_part {
#--- Show resource title
#--- and parts and response type
sub showResourceInfo {
- my ($url,$probTitle,$checkboxes) = @_;
+ my ($symb,$probTitle,$checkboxes) = @_;
my $col=3;
if ($checkboxes) { $col=4; }
my $result ='
'.
'
'.&mt('Current Resource').': '.
$probTitle.'
'."\n";
- my ($partlist,$handgrade,$responseType) = &response_type($url);
+ my ($partlist,$handgrade,$responseType) = &response_type($symb);
my %resptype = ();
my $hdgrade='no';
my %partsseen;
@@ -181,7 +178,7 @@ sub showResourceInfo {
}
$partsseen{$partID}=1;
}
- my $display_part=&get_display_part($partID,$url);
+ my $display_part=&get_display_part($partID,$symb);
$result.='
Part: '.$display_part.' '.
$resID.'
'.
'
Type: '.$responsetype.'
';
@@ -430,7 +427,7 @@ sub canview {
#--- Retrieve the grade status of a student for all the parts
sub student_gradeStatus {
- my ($url,$symb,$udom,$uname,$partlist) = @_;
+ my ($symb,$udom,$uname,$partlist) = @_;
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my %partstatus = ();
foreach (@$partlist) {
@@ -447,7 +444,7 @@ sub student_gradeStatus {
# Use by verifyscript and viewgrades
# Shows a student's view of problem and submission
sub jscriptNform {
- my ($url,$symb) = @_;
+ my ($symb) = @_;
my $jscript=''."\n";
$jscript.= '
'."\n";
}
- return $string.&show_grading_menu_form($symb,$url);
+ return $string.&show_grading_menu_form($symb);
}
#--- This is called by a number of programs.
@@ -624,7 +616,7 @@ sub verifyreceipt {
sub listStudents {
my ($request) = shift;
- my ($symb,$url) = &get_symb_and_url($request);
+ my ($symb) = &get_symb($request);
my $cdom = $env{"course.$env{'request.course.id'}.domain"};
my $cnum = $env{"course.$env{'request.course.id'}.num"};
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
@@ -637,7 +629,7 @@ sub listStudents {
my $result='
'.$viewgrade.
' Submissions for a Student or a Group of Students
';
- my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
+ my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
$request->print(<
@@ -703,7 +695,6 @@ LISTJAVASCRIPT
' '."\n".
''."\n".
''."\n".
- ''."\n".
''."\n".
''."\n";
@@ -736,7 +727,7 @@ LISTJAVASCRIPT
&& $submitonly ne 'queued'
&& $submitonly ne 'all') {
foreach (sort(@$partlist)) {
- my $display_part=&get_display_part((split(/_/))[0],$url,$symb);
+ my $display_part=&get_display_part((split(/_/))[0],$symb);
$gradeTable.='