--- loncom/interface/lonstatistics.pm 2002/05/27 00:24:05 1.21
+++ loncom/interface/lonstatistics.pm 2002/05/30 13:36:18 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.21 2002/05/27 00:24:05 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.24 2002/05/30 13:36:18 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -523,7 +523,7 @@ sub StudentReport {
"\n".'
Tries | '.
"\n".'';
my ($temp)=keys(%result);
- unless ($temp=~/^error\:/) {
+ unless ($temp=~/^(con_lost|error|no_such_host)/i) {
foreach my $CurCol (@cols) {
if (!$CurCol){
my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
@@ -749,15 +749,18 @@ sub usection {
my ($udom,$unam,$courseid,$ActiveFlag)=@_;
$courseid=~s/\_/\//g;
$courseid=~s/^(\w)/\/$1/;
- foreach (split(/\&/,&Apache::lonnet::reply('dump:'.
- $udom.':'.$unam.':roles',
- &Apache::lonnet::homeserver($unam,$udom)))){
- my ($key,$value)=split(/\=/,$_);
- $key=&Apache::lonnet::unescape($key);
+
+ my %result=&Apache::lonnet::dump('roles',$udom,$unam);
+ my ($checkForResult)=keys(%result);
+ if ($checkForResult=~/^(con_lost|error|no_such_host)/i) {
+ return -1;
+ }
+ foreach my $key (keys (%result)) {
+ my $value=$result{$key};
if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
my $section=$1;
if ($key eq $courseid.'_st') { $section=''; }
- my ($dummy,$end,$start)=split(/\_/,&Apache::lonnet::unescape($value));
+ my ($dummy,$end,$start)=split(/\_/,$value);
if ( $ActiveFlag ne 'Any' ) {
my $now=time;
my $notactive=0;
@@ -804,7 +807,7 @@ sub ExtractStudentData {
my $SecLimit;
my $MapLimit;
my ($temp)=keys(%result);
- unless ($temp=~/^error\:/) {
+ unless ($temp=~/^(con_lost|error|no_such_host)/i) {
foreach my $CurCol(@cols) {
($PrOrd,$ResId)=split(/\:/,$CurCol);
if ( !$CurCol ) { next; }
@@ -1401,7 +1404,6 @@ sub ClassList {
&GetStatus();
$cid=$ENV{'request.course.id'};
- my $chome=$ENV{'course.'.$cid.'.home'};
my ($cdom,$cnum)=split(/\_/,$cid);
# ----------------------- Get first and last resource, see if there is anything
$firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
@@ -1418,26 +1420,27 @@ sub ClassList {
# foreach my $KeyPoint(sort keys(%students)) {
- my $classlst=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':classlist',$chome);
-
my $StudNo = 0;
my $now=time;
- unless ($classlst=~/^error\:/) {
- foreach my $KeyPoint(sort split(/\&/,$classlst)) {
- my ($name,$value)=split(/\=/,$KeyPoint);
- my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
+
+ my %classlist=&Apache::lonnet::dump('classlist',$cdom,$cnum);
+
+ my ($checkForError)=keys(%classlist);
+ if($checkForError=~/^(con_lost|error|no_such_host)/i) {
+ $r->print('Could not access course data
');
+ } else {
+ foreach my $name (keys (%classlist)) {
+ my $value=$classlist{$name};
+ my ($end,$start)=split(/\:/,$value);
my $active=1;
my $Status=$ENV{'form.status'};
$Status = ($Status) ? $Status : 'Active';
if ( ( ($end) && $now > $end ) &&
- ( ($Status eq 'Active') ) ) { $active=0; }
-
+ ( ($Status eq 'Active') ) ) { $active=0; }
if ( ($Status eq 'Expired') &&
- ($end == 0 || $now < $end) ) { $active=0; }
-
+ ($end == 0 || $now < $end) ) { $active=0; }
if ($active) {
my $thisindex=$#students+1;
- $name=&Apache::lonnet::unescape($name);
$students[$thisindex]=$name;
my ($sname,$sdom)=split(/\:/,$name);
my $ssec=&usection($sdom,$sname,$cid,$Status);
@@ -1450,12 +1453,10 @@ sub ClassList {
$StuBox{$sname}=$sdom;
}
$StudNo++;
- }
+ }
}
}
- else {
- $r->print('Could not access course data
');
- }
+
$r->print("Total number of students : ".($#students+1));
$r->rflush();
# --------------- Find all assessments and put them into some linear-like order