--- loncom/interface/lonstatistics.pm 2002/03/06 23:56:13 1.8
+++ loncom/interface/lonstatistics.pm 2002/03/07 00:28:55 1.10
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.8 2002/03/06 23:56:13 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.10 2002/03/07 00:28:55 minaeibi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -313,8 +313,6 @@ sub PreStatTable {
"_$ENV{'user.domain'}_$cid\_statistics.db";
my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
"_$ENV{'user.domain'}_$cid\_graph.db";
- my $CachDisFac = "/home/httpd/perl/tmp/$ENV{'user.name'}".
- "_$ENV{'user.domain'}_$cid\_DiscFactor.db";
my $OpSel11='';
my $OpSel12='';
my $OpSel13='';
@@ -371,7 +369,6 @@ sub PreStatTable {
if ((-e "$CacheDB")&&($ENV{'form.sort'} ne 'Recalculate Statistics')) {
if (tie(%CachData,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
- tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_READER,0640);
tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
&Cache_Statistics();
}
@@ -381,7 +378,6 @@ sub PreStatTable {
}
else {
if (tie(%CachData,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {
- tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_WRCREAT,0640);
tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
foreach (keys %DiscFac) {delete $CachData{$_};}
foreach (keys %CachData) {delete $CachData{$_};}
@@ -396,7 +392,6 @@ sub PreStatTable {
untie(%CachData);
untie(%GraphDat);
- untie(%DiscFac);
}
@@ -520,7 +515,6 @@ sub ExtractStudentData {
$TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;
$TotalTries += $TempHash{"$Part.Tries"};
$TotParCr += $TempHash{"$Part.ParCr"};
-#$r->print($Version.'---'.$Prob.'==='.$Time.'
');
my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
if ( $Val eq 'correct_by_student' )
{ $Wrongs = $Tries - 1; $Code = 'C'; }
@@ -558,8 +552,6 @@ sub ExtractStudentData {
# $DisF .= '+'.$TempHash{"$part.Time"};
$TimeTot += $TempHash{"$part.Time"};
$Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
-
- #$r->print('
'.$DisFactor,'###',$DiscFac{$DisFactor});
$ptr .= ":$TempHash{$part.'.Tries'}".
":$TempHash{$part.'.Wrongs'}".
":$TempHash{$part.'.Code'}";
@@ -579,7 +571,6 @@ sub ExtractStudentData {
my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;
my $DisFactor = sprintf( "%.4f", $DisFac );
$DiscFac{$DisFactor}=$Dis;
- #$r->print('
'.$DisFactor,'###',$DiscFac{$DisFactor});
#my $time;
#if ($ProbSolved){
#$time = int(($TimeTot/$ProbSolved)-10000000);
@@ -1010,7 +1001,6 @@ sub ClassList {
$name=&Apache::lonnet::unescape($name);
$students[$thisindex]=$name;
my ($sname,$sdom)=split(/\:/,$name);
-
#my %reply=&Apache::lonnet::idrget($sdom,$sname);
#my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
# ':environment:lastname&generation&firstname&middlename',
@@ -1019,7 +1009,6 @@ sub ClassList {
if ($ssec==-1) {next;}
$ssec=($ssec) ? $ssec : '(none)';
#$ssec=(int($ssec)) ? int($ssec) : $ssec;
- #$r->print($sname.'...'.$ssec.'
');
$section{$ssec}=$ssec;
if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
$students[$StudNo]=$name;
@@ -1036,18 +1025,11 @@ sub ClassList {
$r->rflush();
# --------------- Find all assessments and put them into some linear-like order
&tracetable($firstres,'&'.$lastres.'&');
-
# my $c=0;
# foreach (sort keys %mapsort) {
# $r->print('
'.$c.')'.$_.' ... '.$mapsort{$_});
# $c++;
# }
-#foreach(@cols) {
-# $c++;
-# $r->print('
'.$cols[$c]);
-#}
-#$r->print('
Count = '.$c);
-
}
# ------------------------------------------------------------- End render page
@@ -1092,11 +1074,7 @@ sub Menu {
else {
&initial();
&ClassList();
- if ( $content eq 'Discrimination' || #'Problem Evaluation' ||
- $content eq 'Recalculate Discrimintion Factor' ) {
- &CreateDiscFac();
- }
- elsif ( $content eq 'Student Assessment' ||
+ if ( $content eq 'Student Assessment' ||
$content eq 'Create Student Report' ) {
&StudentOptions();
&StudentReport($CurStu,$StuBox{"$CurStu"});