[LON-CAPA-cvs] cvs: loncom /homework grades.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 15 May 2002 23:47:49 -0000
albertel Wed May 15 19:47:49 2002 EDT
Modified files:
/loncom/homework grades.pm
Log:
- lonnet::reply -> lonnet::dump transition
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.23 loncom/homework/grades.pm:1.24
--- loncom/homework/grades.pm:1.23 Wed May 8 14:59:37 2002
+++ loncom/homework/grades.pm Wed May 15 19:47:49 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.23 2002/05/08 18:59:37 www Exp $
+# $Id: grades.pm,v 1.24 2002/05/15 23:47:49 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,7 +62,6 @@
sub verifyreceipt {
my $request=shift;
my $courseid=$ENV{'request.course.id'};
- my $chome=$ENV{"course.$courseid.home"};
my $cdom=$ENV{"course.$courseid.domain"};
my $cnum=$ENV{"course.$courseid.num"};
my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
@@ -75,7 +74,7 @@
if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {
$request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');
my $matches=0;
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ my (%classlist) = &getclasslist($cdom,$cnum,'0');
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
my ($uname,$udom)=split(/\:/,$student);
if ($receipt eq
@@ -91,7 +90,6 @@
sub listStudents {
my ($request) = shift;
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
@@ -116,7 +114,7 @@
<table border="1">
<tr><th>Username</th><th>Domain</th><th>Name</th><th> </th></tr>
ENDTABLEST
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ my (%classlist) = &getclasslist($cdom,$cnum,'0');
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
my ($sname,$sdom) = split(/:/,$student);
@@ -161,9 +159,8 @@
if ( $Apache::grades::viewgrades eq 'F' ) {
#get classlist
my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
- #print "Found $cdom:$cnum:$chome<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ #print "Found $cdom:$cnum<br />";
+ my (%classlist) = &getclasslist($cdom,$cnum,'0');
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
my ($posname,$posdomain) = split(/:/,$student);
if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
@@ -175,20 +172,18 @@
}
sub getclasslist {
- my ($coursedomain,$coursenum,$coursehome,$hideexpired) = @_;
- my $classlist=&Apache::lonnet::reply("dump:$coursedomain:$coursenum:classlist",$coursehome);
- my %classlist=();
+ my ($coursedomain,$coursenum,$hideexpired) = @_;
+ my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum);
my $now = time;
- foreach my $record (split /&/, $classlist) {
- my ($name,$value)=split(/=/,&Apache::lonnet::unescape($record));
- my ($end,$start)=split(/:/,$value);
+ foreach my $student (keys(%classlist)) {
+ my ($end,$start)=split(/:/,$classlist{$student});
# still a student?
if (($hideexpired) && ($end) && ($end < $now)) {
#print "Skipping:$name:$end:$now<br />\n";
next;
}
#print "record=$record<br>";
- push( @{ $classlist{'allids'} }, $name);
+ push( @{ $classlist{'allids'} }, $student);
}
return (%classlist);
}
@@ -337,9 +332,8 @@
#get classlist
my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
- #print "Found $cdom:$cnum:$chome<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ #print "Found $cdom:$cnum<br />";
+ my (%classlist) = &getclasslist($cdom,$cnum,'0');
my $headerclr = '"#ccffff"';
my $cellclr = '"#ffffcc"';
@@ -381,9 +375,8 @@
my $url=$ENV{'form.url'};
#get classlist
my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
- #print "Found $cdom:$cnum:$chome<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+ #print "Found $cdom:$cnum<br />";
+ my (%classlist) = &getclasslist($cdom,$cnum,'0');
#get list of parts for this problem
my (@parts) = &getpartlist($url);