--- loncom/interface/lonstatistics.pm	2002/03/06 23:56:13	1.8
+++ loncom/interface/lonstatistics.pm	2002/03/26 18:11:32	1.14
@@ -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.14 2002/03/26 18:11:32 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,9 +28,10 @@
 # (Navigate problems for statistical reports
 # YEAR=2001
 # 5/05,7/09,7/25/01,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
-# 11/1, 11/4, 11/16, 12/14, 12/16, 12/18,12/20,12/31 Behrouz Minaei
+# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
 # YEAR=2002
-# 1/22, 2/1, 2/6, 2/25, 3/2, 3/6 Behrouz Minaei
+# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26 Behrouz Minaei
+#
 ###
 
 package Apache::lonstatistics; 
@@ -39,6 +40,7 @@ use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
 use Apache::lonhomework;
+use Apache::loncommon;
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -46,6 +48,7 @@ use GDBM_File;
 my %hash;
 my %CachData;
 my %GraphDat;
+my %OpResp;
 my %maps;
 my %mapsort;
 my %section;
@@ -78,7 +81,8 @@ my $HWN;
 my $P_Order;
 my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",
               4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",
-              9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd");
+              9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd");#,13,"OpResp");
+
 
 #------- Processing upperlist and lowerlist according to each problem
 sub ProcessDisc {
@@ -155,17 +159,13 @@ sub NumericSort {
 
 # ------ Create different Student Report 
 sub StudentReport {
-
     my ($sname,$sdom)=@_;
-
     if ( $sname eq 'All Students' ) {
 	$r->print( '<h3><font color=blue>WARNING: 
                     Please select a student</font></h3>' );
 	return;
     }
-    my $shome=&Apache::lonnet::homeserver($sname,$sdom);          
-    my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );
-    my %result = ();
+    my %result = &Apache::lonnet::dump($cid,$sdom,$sname);
     my $ResId;
     my $PrOrd;
     my $Code;
@@ -186,11 +186,8 @@ sub StudentReport {
 	      "\n".'<th> Results </th>'.
 	      "\n".'<th> Tries </th>'.
 	      "\n".'</tr>';
-    unless ($reply=~/^error\:/) {
-        foreach (split(/\&/,$reply)){
-            my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
-            $result{$name}=$value;
-        }
+    my ($temp)=keys(%result);
+    unless ($temp=~/^error\:/) {
         foreach my $CurCol (@cols) {
 	    if (!$CurCol){
 		my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
@@ -218,7 +215,7 @@ sub StudentReport {
 	    my $PartNo = 0;
 	    undef %TempHash;
 	    foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))){
-		if ($_=~/^stores\_(\d+)\_tries$/) {
+		if ($_=~/^stores\_(\w+)\_tries$/) {
                     my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		    if ( $TempHash{"$Part"} eq '' ) { 
 			$TempHash{"$Part"} = $Part;
@@ -313,8 +310,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='';
@@ -360,10 +355,10 @@ sub PreStatTable {
 	'evaluating the problem according to a Criterion<br>'.
 	'<b>           [Applied Criterion in %27 Upper Students - '.
 	'Applied the same Criterion in %27 Lower Students]</b><br>'.
-    '<b>           1st </b>Criterion for Sorting the Students: '.
-	'Sum of Partial Credit Awarded / Total Number of Tries<br>'.
-    '<b>           2nd </b>Criterion for Sorting the Students: '.
-	'Total number of Correct Answers / Total Number of Tries'.	
+    '<b>           1st Criterion</b> for Sorting the Students: '.
+	'<b>Sum of Partial Credit Awarded / Total Number of Tries</b><br>'.
+    '<b>           2nd Criterion</b> for Sorting the Students: '.
+	'<b>Total number of Correct Answers / Total Number of Tries</b>'.	
             '</pre>';
 
     $r->print($Ptr);
@@ -371,7 +366,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 +375,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{$_};}
@@ -392,11 +385,27 @@ sub PreStatTable {
 	    $r->print("Unable to tie hash to db file");
         }
     }
+
+#33333
+#    my $c=0;
+#    foreach (sort keys %OpResp) {
+#	$r->print('<br>'.$c.$_.' ====== '.$OpResp{$_});
+#	my $count=$#students+1;
+#	for (my $n=0;$n<1;$n++){
+#	    my ($sname,$sdom)=$students[$n];
+#	    my $Prob=$OpResp{$_};
+##my $userview=&Apache::lonnet::ssi($hash{'src_'.$ResId});
+#		$r->print('<br>'.$Prob.$sname.$sdom.$cid.
+#			  '<br>'.&Apache::loncommon::get_previous_attempt($Prob,$sname,$sdom,$cid));
+#		#$r->print('<br>'.$Prob.$sname. ' *** '.&Apache::lonnet::ssi($hash{'src_'.$Prob})); 
+#	}
+#	$c++;
+#    }
+
     #$r->print('Total instances of the problems : '.($p_count*($#students+1)));
 
     untie(%CachData);
     untie(%GraphDat);
-    untie(%DiscFac);       
 }
 
 
@@ -440,11 +449,9 @@ sub usection {
 # ------ Dump the Student's DB file and handling the data for statistics table 
 
 sub ExtractStudentData {
-    my ($student,$coid)=@_;
+    my $student=shift;
     my ($sname,$sdom) = split( /\:/, $student );
-    my $shome=&Apache::lonnet::homeserver( $sname,$sdom );          
-    my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$coid,$shome );
-    my %result = ();
+    my %result = &Apache::lonnet::dump($cid,$sdom,$sname);
     my $ResId;
     my $PrOrd;
     my $Dis = '';
@@ -463,11 +470,8 @@ sub ExtractStudentData {
     my $LatestVersion;
     my $SecLimit;
     my $MapLimit;
-    unless ($reply=~/^error\:/) {
-        foreach (split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
-            $result{$name}=$value;
-        }
+    my ($temp)=keys(%result);
+    unless ($temp=~/^error\:/) {
         foreach my $CurCol(@cols) {
 	    ($PrOrd,$ResId)=split(/\:/,$CurCol);
 	    if ( !$CurCol ) { next; }
@@ -483,8 +487,9 @@ sub ExtractStudentData {
 	    my $PartNo = 0;
 	    $Dis .= ':';
 	    undef %TempHash;
-	    foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
-		if ($_=~/^stores\_(\d+)\_tries$/) {
+
+	    foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) { 
+		if ($_=~/^stores\_(\w+)\_tries$/) {
                     my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		    if ( $TempHash{"$Part"} eq '' ) { 
 			$TempHash{"$Part"} = $Part;
@@ -493,6 +498,7 @@ sub ExtractStudentData {
 			$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;
 			$PartNo++;
 		    }
+                    #my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		}
             }
 
@@ -508,8 +514,23 @@ sub ExtractStudentData {
 		for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
 		    my $vkeys = $result{"$Version:keys:$Prob"};
 		    my @keys = split(/\:/,$vkeys);		
-  
+
 		    foreach my $Key (@keys) {		  
+#333333333
+#			if ($OpResp{$PrOrd}) {
+#			    if (($Key=~/\.(\w+)\.submission$/)) {
+#				my $Resp = $result{"$Version:$Prob:$Key"};
+#				$r->print('<br>'.$Prob.'<br>'.$sname.'<br>'.$PrOrd.'<br>'.$Key.'<br><b>'.$Resp.'</b>'); 
+#				$r->rflush();
+#
+#				my %submission=&Apache::lonnet::str2hash($Resp);
+#    my $cb=0;
+#    foreach (sort keys %submission) {
+#	$r->print('<br>'.$cb.')'.$_.' ... '.$submission{$_});
+#	$cb++;
+#    }
+#			    }	  
+#			}
 			if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
 			    my $Part = $1;
 			    $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
@@ -520,7 +541,6 @@ sub ExtractStudentData {
 			    $TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;        
 			    $TotalTries += $TempHash{"$Part.Tries"};
 			    $TotParCr += $TempHash{"$Part.ParCr"};
-#$r->print($Version.'---'.$Prob.'==='.$Time.'<br>');
 			    my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
 			    if ( $Val eq 'correct_by_student' )
                                { $Wrongs = $Tries - 1; $Code = 'C'; } 
@@ -542,11 +562,11 @@ sub ExtractStudentData {
 		       {$ProbSolved++;$Yes=1;}		
 
  #		    my $ptr = "$hash{'title_'.$ResId}";
-		    my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;
+		    my $ptr = $TempHash{$part.'.PrOrd'}.'&'.$ResId;
 
 		    if ( $PartNo > 1 ) {                
 			$ptr .= "*(part $part)";
-			$Dis .= ':';
+			$Dis .= '&';
 		    }
 		    my $Fac = ($TempHash{"$part.Tries"}) ? 
                               ($TempHash{"$part.ParCr"}/$TempHash{"$part.Tries"}) : 0;
@@ -558,11 +578,9 @@ sub ExtractStudentData {
 #		    $DisF .= '+'.$TempHash{"$part.Time"};
 		    $TimeTot += $TempHash{"$part.Time"};
 		    $Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
-
-            #$r->print('<br>'.$DisFactor,'###',$DiscFac{$DisFactor});
-		    $ptr .= ":$TempHash{$part.'.Tries'}".
-		            ":$TempHash{$part.'.Wrongs'}".
-                            ":$TempHash{$part.'.Code'}";
+		    $ptr .= "&$TempHash{$part.'.Tries'}".
+		            "&$TempHash{$part.'.Wrongs'}".
+                            "&$TempHash{$part.'.Code'}";
 		    push (@list, $ptr);
 		    $TotalOpend++;
 		    $ProbTot++;
@@ -570,7 +588,7 @@ sub ExtractStudentData {
             }
 	    #else { 
 		#for(my $n=0; $n<$PartNo; $n++) {
-		#    push (@list, "$hash{'title_'.$ResId}*$ResId:0:0:U");
+		#    push (@list, "$TempHash{'0'.'.PrOrd'}.':'.$ResId:0:0:U");
 		#    $ProbTot++; 
 		#}
 	    #}
@@ -579,7 +597,6 @@ sub ExtractStudentData {
 	    my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;
 	    my $DisFactor = sprintf( "%.4f", $DisFac );
 	    $DiscFac{$DisFactor}=$Dis;
-            #$r->print('<br>'.$DisFactor,'###',$DiscFac{$DisFactor});
 	    #my $time;
 	    #if ($ProbSolved){
 		#$time = int(($TimeTot/$ProbSolved)-10000000);
@@ -595,6 +612,7 @@ sub ExtractStudentData {
 # ------------------------------------------------------------ Build page table
 sub tracetable {
     my ($rid,$beenhere)=@_;
+    my $IsMap=0;
     $rid=~/(\d+)\.(\d+)/;
     $maps{&Apache::lonnet::declutter($hash{'map_id_'.$1})}='';#$hash{'title_'.$rid}; 
     #$maps{$HWN}=$hash{'title_'.$rid}; 
@@ -606,7 +624,9 @@ sub tracetable {
                $cols[$#cols+1]=0;
 	       $P_Order++;
 	       $HWN=$P_Order;
-               $mapsort{$HWN} = $rid.':'; 
+               $mapsort{$HWN} = $rid.':';
+	       $IsMap=1;
+ 
                #$maps{&Apache::lonnet::declutter($hash{'src_'.$rid})}= 
                #      $hash{'title_'.$rid}; 
            }
@@ -621,36 +641,54 @@ sub tracetable {
       
 	       my $meta=$hash{'src_'.$frid};
 	       my $PartNo = 0;
+	       my $Part;
+	#       if ($IsMap==0){
                if ($meta) {
 		   if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 		       foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
-			   if ($_=~/^stores\_(\d+)\_tries$/) {
-			       &Apache::lonnet::metadata($meta,$_.'.part');
+			   if ($_=~/^stores\_(\w+)\_tries$/) {
+			       $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 			       $P_Order++;
 			       $mapsort{$HWN} .= '&'.$P_Order;
 			       $PartNo++;
-			       $r->print('<br>'.$PartNo.'---'.$P_Order);
+			       #$r->print('<br>'.$PartNo.'---'.$P_Order);
+			   }
+			   foreach my $K(split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+			       if ($K=~/^optionresponse\_($Part)\_(\w+)$/) {
+				   #$r->print('<br>'.$_.'...'.$P_Order.'---'.$Part);
+				   $OpResp{$P_Order+1}=$frid;
+			       } 
+		   
 			   }
 		       }
 		   }
                }
 	   }
+	 #  }
        } else {
 	   $cols[$#cols+1]=($P_Order+1).':'.$rid;
 	   my $meta=$hash{'src_'.$rid};
 	   my $PartNo = 0;
-           if ($meta) {
+	   if ($meta) {
 	       if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-		   foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
-		       if ($_=~/^stores\_(\d+)\_tries$/) {
-			   &Apache::lonnet::metadata($meta,$_.'.part');
+		   foreach my $Key(split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
+		       if ($Key=~/^stores\_(\w+)\_tries$/) {
+			   my $Part=&Apache::lonnet::metadata($meta,$Key.'.part');
 			   $P_Order++;
 			   $mapsort{$HWN} .= '&'.$P_Order;
 			   $PartNo++;
+			   foreach (split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+			       if ($_=~/^optionresponse\_($Part)\_(\w+)$/) {
+				   #$r->print('<br>'.$_.'...'.$P_Order.'---'.$Part);
+				   $OpResp{$P_Order+1}=$rid;
+			       } 
+		   
+			   }
+
 		       }
 		   }
 	       }
-	   }
+	   }       
        }
        if (defined($hash{'to_'.$rid})) {
           foreach (split(/\,/,$hash{'to_'.$rid})){
@@ -695,7 +733,7 @@ ENDPOP
                   $students[$index].'";</script>');
         $r->rflush();
 
-        &ExtractStudentData($students[$index],$cid);
+        &ExtractStudentData($students[$index]);
     }
 
 # -------------------- sorting the Data
@@ -723,7 +761,7 @@ ENDPOP
 	&CreateTable(1,$Hid);
 	for (my $i=1; $i<=$#lpr; $i++) {
 	    my %storestats=();
-	    my ($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
+	    my ($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\&/,$list[$nIdx]);
 	    my $Temp = $Prob;
 	    my $MxTries = 0;
 	    my $TotalTries = 0;
@@ -743,7 +781,7 @@ ENDPOP
 		elsif( $Code eq 'I' ) { $Incorrect++; }
 		elsif( $Code eq 'O' ) { $Override++; }
 		elsif( $Code eq 'U' ) { $StdNo--; }
-		($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
+		($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\&/,$list[$nIdx]);
 	    }	
 
 	    $p_count++;
@@ -819,10 +857,10 @@ ENDPOP
 	    my $SD = sprintf( "%.1f", $StdDev );
 	    my $DoD = sprintf( "%.2f", $DoDiff );
 	    my $Sk = sprintf( "%.1f", $Skewness );
-	    my $join = $PrOrd.':'.$Temp.':'.$StdNo.':'.
-                       $TotalTries.':'.$MxTries.':'.$Avg.':'.
-                       $YES.':'.$Override.':'.$Wrng.':'.$DoD.':'.
-		       $SD.':'.$Sk.':'.$_D1.':'.$_D2.':'.$Prob;
+	    my $join = $PrOrd.'&'.$Temp.'&'.$StdNo.'&'.
+                       $TotalTries.'&'.$MxTries.'&'.$Avg.'&'.
+                       $YES.'&'.$Override.'&'.$Wrng.'&'.$DoD.'&'.
+		       $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'.$Prob;
 	    $CachData{($p_count-1)}=$join;
 
 	    $urlres=~/^(\w+)\/(\w+)/;
@@ -850,14 +888,14 @@ sub Cache_Statistics {
     if ($Pos > 0) {$Pos++;}
     $p_count = 0;
     foreach my $key( keys %CachData) { 
-	my @Temp=split(/\:/,$CachData{$key});
+	my @Temp=split(/\&/,$CachData{$key});
 	if ( $Pos == 0 ) {
 	    ($UnUseful,$Useful)=split(/\>/,$Temp[$Pos]);
 	}
 	else {
 	    $Useful = $Temp[$Pos];
 	}   
-	$list[$p_count]=$Useful.'&'.$CachData{$key};
+	$list[$p_count]=$Useful.'@'.$CachData{$key};
         $p_count++;
     }
 
@@ -871,7 +909,8 @@ sub Cache_Statistics {
 	    &CreateTable(1,$Hid);
 	    my @lpr=split(/\&/,$pr);
 	    for (my $i=1; $i<=$#lpr; $i++) {
-		my($Pre, $Post) = split(/\&/,$list[$nIdx]); 
+		my($Pre, $Post) = split(/\@/,$list[$nIdx]); 
+		#$r->print('<br>'.$Pre.'---'.$Post);
 		&TableRow($Post,$i,$nIdx);
 		$nIdx++;
 	    }
@@ -881,7 +920,7 @@ sub Cache_Statistics {
     else {
 	&CreateTable(0);
 	for ( my $nIdx = 0; $nIdx < $p_count; $nIdx++ ) {
-	    my($Pre, $Post) = split(/\&/,$list[$nIdx]); 
+	    my($Pre, $Post) = split(/\@/,$list[$nIdx]); 
 	    &TableRow($Post,$nIdx,$nIdx);
 	} 
 	&CloseTable();
@@ -890,10 +929,11 @@ sub Cache_Statistics {
 
 sub TableRow {
     my ($Str,$Idx,$RealIdx)=@_;
-    my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,
-       $Override,$Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$Prob)=split(/\:/,$Str);	
-    $r->print( "\n".'<tr>'.
+    my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override,
+       $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$Prob)=split(/\&/,$Str);	
+    my $Ptr =  "\n".'<tr>'.
                "\n".'<td>'.($RealIdx+1).'</td>'.
+          #     "\n".'<td>'.$PrOrd.$Temp.'</td>'.
                "\n".'<td>'.$Temp.'</td>'.
                "\n".'<td bgcolor="#EEFFCC"> '.$StdNo.'</td>'.
                "\n".'<td bgcolor="#EEFFCC">'.$TotalTries.'</td>'.
@@ -906,8 +946,14 @@ sub TableRow {
                "\n".'<td bgcolor="#DDFFDD"> '.$SD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.
                "\n".'<td bgcolor="#FFDDFF"> '.$_D1.'</td>'.
-               "\n".'<td bgcolor="#FFDDFF"> '.$_D2.'</td>'.
-               "\n".'</tr>' );
+	       "\n".'<td bgcolor="#FFDDFF"> '.$_D2.'</td>';
+#    if( $OpResp{$PrOrd} ) {
+#	$Ptr.='<td>'.'<input type="submit" name="OpResp" value="'."View_$PrOrd".'" />'.'</td>';
+#    }   
+#    else {
+#	$Ptr.='<td> -------- </td>';
+#    }
+    $r->print("\n".$Ptr.'</tr>' );
     $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }
 
@@ -964,6 +1010,7 @@ sub initial {
   undef %CachData;
   undef %GraphDat;
   undef %DiscFac;
+  undef %OpResp;
   undef $CurMap;
   undef $CurSec;
   undef $CurStu;
@@ -1010,7 +1057,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 +1065,6 @@ sub ClassList {
 		    if ($ssec==-1) {next;}
 		    $ssec=($ssec) ? $ssec : '(none)';
 		    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
-		    #$r->print($sname.'...'.$ssec.'<br>');
 		    $section{$ssec}=$ssec;
 		    if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
 			$students[$StudNo]=$name;
@@ -1036,18 +1081,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('<br>'.$c.')'.$_.' ... '.$mapsort{$_});
 #	$c++;
 #    }
-#foreach(@cols) {
-#    $c++;
-#    $r->print('<br>'.$cols[$c]);
-#}
-#$r->print('<br> Count = '.$c);
-
     }
 
 # ------------------------------------------------------------- End render page 
@@ -1092,11 +1130,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"});