--- loncom/interface/statistics/lonproblemstatistics.pm	2002/07/29 22:01:11	1.6
+++ loncom/interface/statistics/lonproblemstatistics.pm	2002/08/06 02:01:05	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonproblemstatistics.pm,v 1.6 2002/07/29 22:01:11 minaeibi Exp $
+# $Id: lonproblemstatistics.pm,v 1.14 2002/08/06 02:01:05 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,7 @@
 # 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,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
-# 5/12,5/14,5/15,5/19,5/26,7/16,7/25,7/29  Behrouz Minaei
+# 5/12,5/14,5/15,5/19,5/26,7/16,7/25,7/29,8/5  Behrouz Minaei
 #
 ###
 
@@ -56,16 +56,27 @@ sub BuildProblemStatisticsPage {
     $Ptr .= '<table border="0"><tbody>';
     $Ptr .= '<tr><td align="right"><b>Select Map</b></td>'."\n";
     $Ptr .= '<td align="left">';
-    $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics');
+    $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics',
+                                               'Statistics');
+    $Ptr .= '</td></tr>'."\n";
+    $Ptr .= '<tr><td align="right"><b>Sorting Type:</b></td>'."\n";
+    $Ptr .= '<td align="left">'."\n";
+    $Ptr .= &Apache::lonhtmlcommon::AscendOrderOptions(
+                                            $cache{'ProblemStatisticsAscend'}, 
+                                            'ProblemStatistics',
+                                            'Statistics');
     $Ptr .= '</td></tr>'."\n";
-    $Ptr .= &AscendOrderOptions($cache{'Ascend'});
     $Ptr .= &ProblemStatisticsButtons($cache{'DisplayFormat'});
     $Ptr .= '</table>';
     $Ptr .= &ProblemStatisticsLegend();
     $r->print($Ptr);
+    $r->rflush();
 
     untie(%cache);
+    &Create_PrgWin($r);
+    my $count=0;
     foreach (@$students) {
+        &Update_PrgWin(scalar(@$students),$count,$_,$r);
         my $courseData = 
             &Apache::loncoursedata::DownloadCourseInformation($_, $courseID);
         last if ($c->aborted());
@@ -74,42 +85,67 @@ sub BuildProblemStatisticsPage {
                                                        $courseData, $_);
             untie(%cache);
         }
+        $count++;
     }
+    &Close_PrgWin($r);
     if($c->aborted()) { return; }
 
     unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
         return '<html><body>Unable to tie database.</body></html>';
     }
-    my %discriminant=();
-    my @list=();
-    my %Discuss=&Apache::loncoursedata::LoadDiscussion($courseID);
-    my $index=0;
-    foreach (@$students) {
-	$index++;
-	#&Apache::lonstatistics::Update_PrgWin(++$index,$r);
-        &ExtractStudentData(\%cache, $_, \@list,\%Discuss, $r, \%discriminant);
-    }
-    #&Apache::lonstatistics::Close_PrgWin($r);
- 
-    my ($upper, $lower) = &Discriminant(\%discriminant);
+
     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", 13, "Disc.");
     my $color=&setbgcolor(0);
-    my %GraphDat= &BuildStatisticsTable(\%cache, \%discriminant, \@list, 
-                                        \%Header, $students, $r, $color);
-    untie(%cache);
-}
 
+    my $state=$ENV{'form.ProblemStatisticsHeading'}; 
 
-#---- Problem Statistics Web Page ---------------------------------------
+#    my $state=&Apache::lonstatistics::CheckFormElement(\%cache,
+#                                                  'ProblemStatisticsHeading',
+#                                                  'ProblemStatisticsHeading',
+#                                                  'Homework Sets Order'); 
+#    $r->print("<br>state=".$state);
+
+    my $TempCache;
+
+    if ($state) {
+	$TempCache=&CacheStatisticsTable($state,\%cache,\%Header,
+					 $r,$color);
+    } else {    
+	my %discriminant=();
+	my @list=();
+	my %Discuss=&Apache::loncoursedata::LoadDiscussion($courseID);
+	my $index=0;
+	foreach (@$students) {
+	    $index++;
+	    #&Apache::lonstatistics::Update_PrgWin(++$index,$r);
+	    &ExtractStudentData(\%cache, $_, \@list,\%Discuss, $r,
+                                \%discriminant);
+	}
+	#&Apache::lonstatistics::Close_PrgWin($r);
+	my ($upper, $lower) = &Discriminant(\%discriminant,$r);
+	$TempCache= &BuildStatisticsTable(\%cache, $upper, $lower, 
+					   \@list, \%Header, $students,
+					   $r, $color);
+    }
+    untie(%cache);
 
+    foreach (keys %$TempCache) {
+        last if ($c->aborted());
+        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
+	    $cache{$_}=$TempCache->{$_};
 
-sub NumericSort {          
-    $a <=> $b;
+            untie(%cache);
+        }
+    }
+    if($c->aborted()) { return; }
+    untie(%cache);
 }
 
 
+#---- Problem Statistics Web Page ---------------------------------------
+
 sub CreateProblemStatisticsTableHeading {
     my ($displayFormat,$sequenceSource,$sequenceTitle,$headings,$r)=@_;
     if($displayFormat eq 'Display CSV Format') {
@@ -117,10 +153,12 @@ sub CreateProblemStatisticsTableHeading
         $r->print($sequenceSource.'"');
 	return;
     }
-
-    $r->print('<br><a href="'.$sequenceSource.
-              '" target="_blank">'.$sequenceTitle.'</a>');
-
+    if ($sequenceSource eq 'Sorted by: ') {
+	$r->print('<br><b>'.$sequenceSource.$sequenceTitle.'</b>');
+    } else {
+        $r->print('<br><a href="'.$sequenceSource.
+		  '" target="_blank">'.$sequenceTitle.'</a>');
+    }
     my $Result = "\n".'<table border=2><tr><th>P#</th>'."\n";
     for(my $nIndex=0; $nIndex < (scalar (keys %$headings)); $nIndex++) { 
 	$Result .= '<th>'.'<input type="submit" name="';
@@ -142,6 +180,41 @@ sub CloseTable {
 }
 
 
+# Create progress
+sub Create_PrgWin {
+    my ($r)=@_;
+    $r->print(<<ENDPOP);
+    <script>
+    popwin=open('','popwin','width=400,height=100');
+    popwin.document.writeln('<html><body bgcolor="#88DDFF">'+
+      '<title>LON-CAPA Statistics</title>'+
+      '<h4>Computation Progress</h4>'+
+      '<form name=popremain>'+
+      '<input type=text size=35 name=remaining value=Starting></form>'+
+      '</body></html>');
+    popwin.document.close();
+    </script>
+ENDPOP
+
+    $r->rflush();
+}
+
+# update progress
+sub Update_PrgWin {
+    my ($totalStudents,$index,$name,$r)=@_;
+    $r->print('<script>popwin.document.popremain.remaining.value="'.
+              'Computing '.$index.'/'.$totalStudents.': '.
+              $name.'";</script>');
+    $r->rflush();
+}
+
+# close Progress Line
+sub Close_PrgWin {
+    my ($r)=@_;
+    $r->print('<script>popwin.close()</script>');
+    $r->rflush(); 
+}
+
  
 # ------ Dump the Student's DB file and handling the data for statistics table 
 sub ExtractStudentData {
@@ -157,6 +230,7 @@ sub ExtractStudentData {
     my $TotFirst = 0;
     my $TimeTot = 0;
     my $Discussed=0;
+    my $discrim='';
     my $tempSequenceOrder=100;
 
 #$Apache::lonxml::debug=1;
@@ -165,15 +239,15 @@ sub ExtractStudentData {
 
     foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
 	my $tempProblemOrder=100;
-	$tempSequenceOrder++;
-#        if($cache->{'ProblemStatisticsMap'} ne 'All Maps'  &&
-#           $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
+        if($cache->{'ProblemStatisticsMaps'} ne 'All Maps'  &&
+           $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) {
 #	    $r->print("<br>sequences=$cache->{'orderedSequences'}");
 #	    $r->print("<br>".$cache->{$sequence.':title'});
-#            next;
-#        }
+            next;
+        }
+	$tempSequenceOrder++;
 
-        my $Dis = '';
+        #$discrim .= '&';
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
 #	    $r->print("<br>problems=$cache->{$sequence.':problems'}");
             my $problem = $cache->{$problemID.':problem'};
@@ -192,6 +266,7 @@ sub ExtractStudentData {
             #}
 
             my %partData=undef;
+	    $partData{'count'}=0;
             # Initialize part data, display skips correctly
             # Skip refers to when a student made no submissions on that
             # part/problem.
@@ -199,6 +274,7 @@ sub ExtractStudentData {
                                                   $problemID.
                                                   ':parts'})) {
 		$tempProblemOrder++;
+		$partData{'count'}++;
 #		$r->print("<br>parts=$cache->{$sequence.':'.$problemID.':parts'}");
                 $partData{$part.':order'}=$tempProblemOrder;
                 $partData{$part.':tries'}=0;
@@ -225,13 +301,12 @@ sub ExtractStudentData {
 		    $Discussed=0;
                     my $code='-';
 
-                    $awarded = $cache->{$name.
-                                        "$Version:$problem:resource.".
+                    $awarded = $cache->{"$name:$Version:$problem:resource.".
                                         "$part.awarded"};
                     $partData{$part.':awarded'} = ($awarded) ? $awarded : 0;
                     $totalAwarded += $awarded;
 
-                    $tries = $cache->{$name.":$Version:$problem".
+                    $tries = $cache->{"$name:$Version:$problem".
                                       ":resource.$part.tries"};
                     $partData{$part.':tries'} = ($tries) ? $tries : 0;
                     $partData{$part.':wrong'} = $partData{$part.':tries'};
@@ -258,10 +333,10 @@ sub ExtractStudentData {
 
             # Loop through all the parts for the current problem in the 
             # correct order and prepare the output
+	    my $partCounter=0;
             foreach (split(/\:/,$cache->{$sequence.':'.$problemID.
                                          ':parts'})) {
-	    #$r->print("<br>".$cache->{$sequence.':title'});
-
+		$partCounter++;
                 my $Yes = 0;
                 if($partData{$_.':code'} eq 'C' || 
                    $partData{$_.':code'} eq 'O') {
@@ -270,10 +345,12 @@ sub ExtractStudentData {
                 my $pOrder=$partData{$_.':order'};
                 my $ptr = $tempSequenceOrder.':'.$pOrder.':'.$problemID;
 
-                if($_ > 1) {
+                if($partData{'count'} > 1) {
                     $ptr .= "*(part $_)";
-                    $Dis .= '&';
                 }
+                #if($partCounter > 1) {
+                    $discrim .= '&';
+                #}
 
 		my ($pr_no,$dod)=split('&',$ptr);
 #		my $DoDiff=$DoDiff->{$dod};
@@ -293,7 +370,7 @@ sub ExtractStudentData {
                     $Discussed=1;
                 }
                 my $time = $cache->{"$name:$LatestVersion:$problem:timestamp"};
-                $Dis .= $tempSequenceOrder.'@'.$pOrder.'='.$DisF.'+'.$Yes;
+                $discrim .= $tempSequenceOrder.'@'.$pOrder.'='.$DisF.'+'.$Yes;
                 $ptr .= '&'.$partData{$_.':tries'}.
                         '&'.$partData{$_.':wrong'}.
                         '&'.$partData{$_.':code'};
@@ -323,41 +400,38 @@ sub ExtractStudentData {
                 $tempProblemOrder++;
             }
         }
-	my $pstr;
-        if($totalTries) {
-	    my $DisFac = ($totalAwarded/$totalTries);
-	    my $DisFactor = sprintf( "%.4f", $DisFac );
-            my $TS = sprintf( "%.2f", $spent );
-            my $TS_yes = sprintf( "%.2f", $spent_yes );
-	   # $DiscFac{$DisFactor}=$Dis;
-	    $pstr=$DisFactor.':'.$name.':'.$ProbTot.':'.$TotalOpend.':'.
-                  $totalTries.':'.$ProbSolved.':'.$TotFirst.':'.
-                  $TS_yes.':'.$TS.':'.$TotDiscuss;
-	    (%$discriminant)->{$pstr}=$Dis;
-	}
+    }
+    my $pstr;
+    if($totalTries) {
+	my $DisFac = ($totalAwarded/$totalTries);
+	my $DisFactor = sprintf( "%.4f", $DisFac );
+        my $TS = sprintf( "%.2f", $spent );
+        my $TS_yes = sprintf( "%.2f", $spent_yes );
+	$pstr=$DisFactor.':'.$name.':'.$ProbTot.':'.$TotalOpend.':'.
+              $totalTries.':'.$ProbSolved.':'.$TotFirst.':'.
+              $TS_yes.':'.$TS.':'.$TotDiscuss;
+	(%$discriminant)->{$pstr}=$discrim;
     }
 }
 
+sub NumericSort {
+    $a <=> $b;
+}
 
-=pod
-sub MySort {          
-    if ( $Pos > 0 ) {
-	if ($ENV{'form.order'} eq 'Descending') {$b <=> $a;}
-	else { $a <=> $b; }
-    }
-    else {
-	if ($ENV{'form.order'} eq 'Descending') {$b cmp $a;}
-	else { $a cmp $b; }
+sub OrderedSort  {
+    if ($ENV{'form.order'} eq 'Descending') {
+	$b <=> $a;
+    } else { 
+	$a <=> $b;
     }
 }
-=cut
 
 
-sub BuildStatisticsTable {
-    my ($cache,$discriminantFactor,$list,$headings,$students,$r,$color)=@_;
 
+sub BuildStatisticsTable {
+    my ($cache,$upper,$lower,$list,$headings,$students,$r,$color)=@_;
     my $NoElements = scalar @$list;
-    my @List=sort(@$list);
+    my @list=sort(@$list);
 
 #6666666
 #    my $file="/home/httpd/perl/tmp/183d.txt";
@@ -377,18 +451,20 @@ sub BuildStatisticsTable {
     my $dummy;
     my $p_val;
     my $ResId;
-    my %GraphDat;
+    my %TempCache;
     my $cIdx=0;
 
     foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
-
-        &CreateProblemStatisticsTableHeading(1,$cache->{$sequence.':source'},
+        if($cache->{'ProblemStatisticsMaps'} ne 'All Maps'  &&
+           $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) {
+            next;
+        }
+        &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, 
+                                             $cache->{$sequence.':source'},
                                              $cache->{$sequence.':title'}, 
                                              $headings,$r);
-
 	my ($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/,
-                                                   $List[$cIdx]);
-
+                                                   $list[$cIdx]);
         my ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar);
 	$sequence+=100;
 	while ($SqOrd==$sequence && $cIdx<$NoElements) {
@@ -415,7 +491,7 @@ sub BuildStatisticsTable {
 		elsif( $Code eq 'O' ) { $Override++; }
 		elsif( $Code eq '-' ) { $StdNo--; }
 		($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/,
-                                                     $List[$cIdx]);
+                                                     $list[$cIdx]);
 	        ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar);
 	    }
 
@@ -427,7 +503,11 @@ sub BuildStatisticsTable {
 	    $Temp = '<a href="'.$cache->{$ResId.':source'}.
                 '" target="_blank">'.$cache->{$ResId.':title'}.$Dummy.'</a>';
 
-	    my $res = &Apache::lonnet::declutter($cache->{'src_'.$ResId});
+	    #$r->print('<br>rid='.$ResId);
+	    #$r->print('<br>src='.$cache->{$ResId.':source'});
+	    #$r->print('<br>tit='.$cache->{$ResId.':title'});
+
+	    my $res = &Apache::lonnet::declutter($cache->{$ResId.':source'});
 	    my $urlres=$res;
 
 	    $ResId=~/(\d+)\.(\d+)/;
@@ -435,7 +515,7 @@ sub BuildStatisticsTable {
 	    $urlres=$Map;
 #######################
 
-#	    $res = '<a href="'.$cache->{'src_'.$ResId}.'">'.$res.'</a>';
+#	    $res = '<a href="'.$cache->{$ResId.':source'}.'">'.$res.'</a>';
 	    #$Map = '<a href="'.$Map.'">'.$res.'</a>';
 
 #------------------------ Compute the Average of Tries about one problem
@@ -481,8 +561,9 @@ sub BuildStatisticsTable {
 	    }
 
 #--------------------- Compute the Discrimination Factors
-            my ($Up1,$Up2)=split(/\:/,':');#jason$DisUp->{$lpr[$i]});
-	    my ($Lw1,$Lw2)=split(/\:/,':');#jason$DisLow->{$lpr[$i]});
+            my ($Up1,$Up2)=split(/\:/,$upper->{$sequence.'@'.$pOrd});
+	    my ($Lw1,$Lw2)=split(/\:/,$lower->{$sequence.'@'.$pOrd});
+
 	    my $Dis1 = $Up1 - $Lw1;
 	    my $Dis2 = $Up2 - $Lw2;
 	    my $_D1 = sprintf("%.2f", $Dis1);
@@ -494,12 +575,14 @@ sub BuildStatisticsTable {
 	    my $SD = sprintf( "%.1f", $StdDev );
 	    my $DoD = sprintf( "%.2f", $DoDiff );
 	    my $Sk = sprintf( "%.1f", $Skewness );
-	    my $join = $Prob.'&'.$Temp.'&'.$StdNo.'&'.
+	    my $join = $sequence.'@'.$pOrd.'&'.$Temp.'&'.$StdNo.'&'.
                        $TotalTries.'&'.$MxTries.'&'.$Avg.'&'.
                        $YES.'&'.$Override.'&'.$Wrng.'&'.$DoD.'&'.
 		       $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'.
                        $DiscNo.'&'.$Prob;
-##8888	    $CachData{($p_count-1)}=$join;
+
+#####{$sequence.'@'.$pOrd}
+	    $TempCache{'CacheTable:'.($p_count-1)}=$join;
 
 #6666666
 #	    $r->print('<br>'.$out.'&'.$DoD);
@@ -509,118 +592,137 @@ sub BuildStatisticsTable {
 	    $urlres=~/^(\w+)\/(\w+)/;
 	    if ($StdNo) { 
 		&Apache::lonnet::put('resevaldata',\%storestats,$1,$2); 
-	    }
+    }
 #-------------------------------- Row of statistical table
-            &TableRow($cache,$join,$cIdx,($p_count-1),$r,$color,\%GraphDat);
+            &TableRow($cache,$join,$cIdx,($p_count-1),$r,$color,
+                      \%TempCache);
 	}
+	$TempCache{'ProblemCount'}=$p_count;
 	&CloseTable($cache,$r);
     }
 ###    &Close_PrgWin();
-#666666
+#6666666
 #    close( OUT );
 #666666
+    return \%TempCache;
 }
 
-=pod
-sub Cache_Statistics {
-    my ($cache,$color)=@_;
-    my @list = ();
-    my $Useful;
-    my $UnUseful;
-#    $r->print('<input type="hidden" name="show" value="excel" />'."\n"); 
-    my %myHeader = reverse( %Header );
-    $Pos = $myHeader{$ENV{'form.sort'}};
-    if ($Pos > 0) {$Pos++;}
-    my $p_count = 0;
-    foreach my $key( keys %CachData) { 
-	my @Temp=split(/\&/,$CachData{$key});
-	if ( $Pos == 0 ) {
-	    ($UnUseful,$Useful)=split(/\>/,$Temp[$Pos]);
-	}
-	else {
-	    $Useful = $Temp[$Pos];
-	}   
-	$list[$p_count]=$Useful.'@'.$CachData{$key};
-        $p_count++;
-    }
 
-    @list = sort MySort (@list);
+sub CacheStatisticsTable {
+    my ($state,$cache,$headings,$r,$color)=@_;
+    my @list = (); 
+    my %TempCache;
+    my %myHeader = reverse( %$headings );
+    my $pos = $myHeader{$state};
+    if ($pos > 0) {$pos++;}
+    my $p_count = $cache->{'ProblemCount'};
+
+    for ( my $k=0; $k<$p_count;$k++) {
+	my $key=$cache->{'CacheTable:'.$k};
+	my @Temp=split(/\&/,$key);
+	$list[$k]=$Temp[$pos].'+'.$key;
+    }
+    
+    if ($pos>0) {
+#	$r->print('<br>pos1='.$pos);
+#        @list = sort OrderedSort (@list);
+	@list = sort NumericSort (@list);
+    } else {
+        @list = sort (@list);
+    }
+    my $cIdx=0;
 
-    my $nIndex=0;
+    if ( $pos == 0 ) {
+	foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
+	    if($cache->{'ProblemStatisticsMaps'} ne 'All Maps'  &&
+	       $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) {
+		next;
+	    }
+	    if ($cIdx==$p_count) {
+		return \%TempCache;
+	    }
+	    &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, 
+                                             $cache->{$sequence.':source'},
+                                             $cache->{$sequence.':title'}, 
+                                             $headings,$r);
 
-    if ( $Pos == 0 ) {
-	foreach (sort keys %mapsort) {
-	    my ($Hid,$pr)=split(/\:/,$mapsort{$_});
-	    &CreateProblemStatisticsTableHeading($cache,1,$Hid);
-	    my @lpr=split(/\&/,$pr);
-	    for (my $i=1; $i<=$#lpr; $i++) {
-		my($Pre, $Post) = split(/\@/,$list[$nIndex]); 
-		#$r->print('<br>'.$Pre.'---'.$Post);
-		&TableRow($cache,$Post,$i,$nIndex,$color,\%GraphDat);
-		$nIndex++;
+	    my ($tar)=split(/\&/,$list[$cIdx]);
+	    $tar=~s/\+//eg;
+	    my ($SqOrd)=split(/\@/,$tar);
+	    $sequence+=100;
+	    while ($SqOrd==$sequence && $cIdx<$p_count) {
+		my($Pre, $Post) = split(/\+/,$list[$cIdx]); 
+		&TableRow($cache,$Post,$cIdx,$cIdx,$r,$color,\%TempCache);
+		$cIdx++;
+		my ($tar)=split(/\&/,$list[$cIdx]);
+		$tar=~s/\+//eg;
+		($SqOrd)=split(/\@/,$tar);
 	    }
-	    &CloseTable($cache);
+	    &CloseTable($cache,$r);
 	}
     }
     else {
-	&CreateProblemStatisticsTableHeading($cache,0);
+        &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, 
+                                             'Sorted by: ',
+					     $headings->{$pos-1},
+                                             $headings,$r);
 	for ( my $nIndex = 0; $nIndex < $p_count; $nIndex++ ) {
-	    my($Pre, $Post) = split(/\@/,$list[$nIndex]); 
-	    &TableRow($cache,$Post,$nIndex,$nIndex,$color,\%GraphDat);
+	    my($Pre, $Post) = split(/\+/,$list[$nIndex]);
+	    &TableRow($cache,$Post,$nIndex,$nIndex,$r,$color,\%TempCache);
 	} 
-	&CloseTable($cache);
+	&CloseTable($cache,$r);
     }
+
+    return \%TempCache;
 }
-=cut 
+
 
 sub TableRow {
     my ($cache,$Str,$Idx,$RealIdx,$r,$color,$GraphDat)=@_;
     my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override,
        $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$DiscNo,$Prob)=split(/\&/,$Str);	
-#    $r->print('<br>'.$Str);
-    if ($ENV{'form.showcsv'}) {
+    my $Ptr;
+    if($cache->{'DisplayFormat'} eq 'Display CSV Format') {
         my ($ResId,$Dummy)=split(/\*/,$Prob);
-        my $Ptr =  "\n".'<br>'.
-               "\n".'"'.($RealIdx+1).'",'.
-               "\n".'"'.$cache->{'title_'.$ResId}.$Dummy.'",'.
-               "\n".'"'.$cache->{'src_'.$ResId}.'",'.
-               "\n".'"'.$StdNo.'",'.
-               "\n".'"'.$TotalTries.'",'.
-               "\n".'"'.$MxTries.'",'.
-               "\n".'"'.$Avg.'",'.
-               "\n".'"'.$YES.'",'.
-               "\n".'"'.$Override.'",'.
-               "\n".'"'.$Wrng.'",'.
-               "\n".'"'.$DoD.'",'.
-               "\n".'"'.$SD.'",'.
-               "\n".'"'.$Sk.'",'.
-               "\n".'"'.$_D1.'",'.
-	       "\n".'"'.$_D2.'"'.
-	       "\n".'"'.$DiscNo.'"';
+        $Ptr="\n".'<br>'.
+             "\n".'"'.($RealIdx+1).'",'.
+             "\n".'"'.$cache->{$ResId.':title'}.$Dummy.'",'.
+             "\n".'"'.$cache->{$ResId.':source'}.'",'.
+             "\n".'"'.$StdNo.'",'.
+             "\n".'"'.$TotalTries.'",'.
+             "\n".'"'.$MxTries.'",'.
+             "\n".'"'.$Avg.'",'.
+             "\n".'"'.$YES.'",'.
+             "\n".'"'.$Override.'",'.
+             "\n".'"'.$Wrng.'",'.
+             "\n".'"'.$DoD.'",'.
+             "\n".'"'.$SD.'",'.
+             "\n".'"'.$Sk.'",'.
+             "\n".'"'.$_D1.'",'.
+	     "\n".'"'.$_D2.'"'.
+	     "\n".'"'.$DiscNo.'"';
 
         $r->print("\n".$Ptr);
-    }
-    else{
-        my $Ptr =  "\n".'<tr>'.
-               "\n".'<td>'.($RealIdx+1).'</td>'.
-          #     "\n".'<td>'.$PrOrd.$Temp.'</td>'.
-               "\n".'<td>'.$Temp.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$StdNo.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$TotalTries.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$MxTries.'</td>'.
-               "\n".'<td bgcolor='.$color->{"gb"}.'>'.$Avg.'</td>'.
-               "\n".'<td bgcolor='.$color->{"gb"}.'> '.$YES.'</td>'.
-               "\n".'<td bgcolor='.$color->{"gb"}.'> '.$Override.'</td>'.
-               "\n".'<td bgcolor='.$color->{"red"}.'> '.$Wrng.'</td>'.
-               "\n".'<td bgcolor='.$color->{"red"}.'> '.$DoD.'</td>'.
-               "\n".'<td bgcolor='.$color->{"green"}.'> '.$SD.'</td>'.
-               "\n".'<td bgcolor='.$color->{"green"}.'> '.$Sk.'</td>'.
-               "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D1.'</td>'.
-	       "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D2.'</td>'.
-               "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$DiscNo.'</td>';
+    } else {
+        $Ptr="\n".'<tr>'.
+             "\n".'<td>'.($RealIdx+1).'</td>'.
+             "\n".'<td>'.$Temp.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$StdNo.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$TotalTries.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'>'.$MxTries.'</td>'.
+             "\n".'<td bgcolor='.$color->{"gb"}.'>'.$Avg.'</td>'.
+             "\n".'<td bgcolor='.$color->{"gb"}.'> '.$YES.'</td>'.
+             "\n".'<td bgcolor='.$color->{"gb"}.'> '.$Override.'</td>'.
+             "\n".'<td bgcolor='.$color->{"red"}.'> '.$Wrng.'</td>'.
+             "\n".'<td bgcolor='.$color->{"red"}.'> '.$DoD.'</td>'.
+             "\n".'<td bgcolor='.$color->{"green"}.'> '.$SD.'</td>'.
+             "\n".'<td bgcolor='.$color->{"green"}.'> '.$Sk.'</td>'.
+             "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D1.'</td>'.
+	     "\n".'<td bgcolor='.$color->{"purple"}.'> '.$_D2.'</td>'.
+             "\n".'<td bgcolor='.$color->{"yellow"}.'> '.$DiscNo.'</td>';
         $r->print("\n".$Ptr.'</tr>' );
     }
-#    $GraphDat->{$RealIdx}=$DoD.':'.$Wrng;
+    $GraphDat->{'GraphGif:'.$RealIdx}=$DoD.':'.$Wrng;
 }
 
 
@@ -645,59 +747,10 @@ sub setbgcolor {
     return \%color;
 }
 
-
-sub StatusOptions {
-    my ($cache)=@_;
-
-    my $Status = $cache->{'Status'};
-    my $OpSel1 = '';
-    my $OpSel2 = '';
-    my $OpSel3 = '';
-
-    if($Status eq 'Any')         { $OpSel3 = ' selected'; }
-    elsif($Status eq 'Expired' ) { $OpSel2 = ' selected'; }
-    else                         { $OpSel1 = ' selected'; }
-
-    my $Ptr = '';
-    $Ptr .= '<tr><td align="right"><b>Student Status:</b></td>'."\n";
-    $Ptr .= '<td align="left"><select name="Status">';
-    $Ptr .= '<option'.$OpSel1.'>Active</option>'."\n";
-    $Ptr .= '<option'.$OpSel2.'>Expired</option>'."\n";
-    $Ptr .= '<option'.$OpSel3.'>Any</option>'."\n";
-    $Ptr .= '</select></td></tr>'."\n";
-
-    return $Ptr;
-}
-
-sub AscendOrderOptions {
-    my ($order)=@_;
-
-    my $OpSel1 = '';
-    my $OpSel2 = '';
-
-    if($order eq 'Ascending') {
-        $OpSel1 = ' selected';
-    } else {
-        $OpSel2 = ' selected';
-    }
-
-    my $Ptr = '';
-    $Ptr .= '<tr><td align="right"><b>Sorting Type:</b></td>'."\n";
-    $Ptr .= '<td align="left"><select name="Ascend">'."\n";
-    $Ptr .= '<option'.$OpSel1.'>Ascending</option>'."\n".
-	    '<option'.$OpSel2.'>Descending</option>'."\n";
-    $Ptr .= '</select></td></tr>'."\n";
-
-    return $Ptr;
-}
-
 sub ProblemStatisticsButtons {
     my ($displayFormat)=@_;
 
     my $Ptr = '<tr><td></td><td align="left">';
-    $Ptr .= '<input type=submit name="ProblemStatisticsRecalculate" ';
-    $Ptr .= 'value="Recalculate Statistics"/>'."\n";
-    $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="DoDiffGraph" ';
     $Ptr .= 'value="DoDiff Graph" />'."\n";
     $Ptr .= '&nbsp;&nbsp;&nbsp;';
@@ -706,9 +759,9 @@ sub ProblemStatisticsButtons {
     $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="DisplayCSVFormat" ';
     if($displayFormat eq 'Display CSV Format') {
-        $Ptr .= 'value="Display CSV Format" />'."\n";
-    } else {
         $Ptr .= 'value="Display Table Format" />'."\n";
+    } else {
+        $Ptr .= 'value="Display CSV Format" />'."\n";
     }
     $Ptr .= '</td></tr>';
 
@@ -773,7 +826,7 @@ sub ProblemStatisticsLegend {
 
 #------- Processing upperlist and lowerlist according to each problem
 sub ProcessDiscriminant {
-    my ($List) = @_;
+    my ($List,$r) = @_;
     my @sortedList = sort (@$List);
     my $Count = scalar @sortedList;
     my $Problem;
@@ -786,6 +839,7 @@ sub ProcessDiscriminant {
     my $nStudent=0;
     my %Proc=undef;
     while ($nIndex<$Count) {
+#        $r->print("<br> $nIndex) $sortedList[$nIndex]");
 	($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]);
 	@Dis=split(/\+/,$tmp);
 	my $Temp = $Problem;
@@ -797,9 +851,8 @@ sub ProcessDiscriminant {
 	    ($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]);
 	    @Dis=split(/\+/,$tmp);
 	} while ( $Problem eq $Temp && $nIndex < $Count );
-#	$Proc{$Temp}=($Sum1/$nStudent).':'.$nStudent;
 	$Proc{$Temp}=($Sum1/$nStudent).':'.($Sum2/$nStudent);
-#       $r->print("$nIndex) $Temp --> ($nStudent) $Proc{$Temp} <br>");
+#        $r->print("<br> $nIndex) $Temp --> ($nStudent) $Proc{$Temp}");
 	$Sum1=0;
 	$Sum2=0;
 	$nStudent=0;
@@ -810,8 +863,11 @@ sub ProcessDiscriminant {
 
 #------- Creating Discimination factor   
 sub Discriminant {
-    my ($discriminantFactor)=@_;
-    my @discriminantKeys=keys(%$discriminantFactor);
+    my ($discriminant,$r)=@_;
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%$discriminant);
+#$Apache::lonxml::debug=0;
+    my @discriminantKeys=keys(%$discriminant);
     my $Count = scalar @discriminantKeys;
 
     my $UpCnt = int(0.27*$Count);
@@ -825,8 +881,8 @@ sub Discriminant {
 	$Count++;    
 	if($low < $UpCnt || $Count > $up) {
             $low++;
-            my $str=$discriminantFactor->{$key};
-            foreach(split(/\:/,$str)){
+            my $str=$discriminant->{$key};
+            foreach(split(/\&/,$str)){
                 if($_) {
                     if($low<$UpCnt) { push(@LowList,$_); }
                     else            { push(@UpList,$_);  }
@@ -834,13 +890,11 @@ sub Discriminant {
             }
         }
     }
-    my %DisUp =  &ProcessDiscriminant(\@UpList);
-    my %DisLow = &ProcessDiscriminant(\@LowList);
+    my %DisUp =  &ProcessDiscriminant(\@UpList,$r);
+    my %DisLow = &ProcessDiscriminant(\@LowList,$r);
 
     return (\%DisUp, \%DisLow);
-}
-
-   
+}   
 
 #---- END Problem Statistics Web Page ----------------------------------------
 
@@ -852,59 +906,64 @@ sub BuildDiffGraph {
     my ($r)=@_;
 
     my $graphData = &GetGraphData('DiffGraph', $r);
-    return '<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />';
+    $r->print('<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />');
+
+    return;
 }
 
 sub BuildWrongGraph {
     my ($r)=@_;
 
     my $graphData = &GetGraphData('WrongGraph', $r);
-    return '<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />';
+    $r->print('<IMG src="/cgi-bin/graph.gif?'.$graphData.'" />');
+
+    return;
 }
 
 
 sub GetGraphData {
-    my ($ylab,$r,%GraphDat)=@_;
+    my ($ylab,$r,$cache)=@_;
     my $Col;
     my $data='';
     my $count = 0;
     my $Max = 0;
     my $cid=$ENV{'request.course.id'};
-    my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
-                  "_$ENV{'user.domain'}_$cid\_graph.db";
-    foreach (keys %GraphDat) {delete $GraphDat{$_};}
-    if (-e "$GraphDB") {
-	if (tie(%GraphDat,'GDBM_File',"$GraphDB",&GDBM_READER,0640)) {
-	    if ( $ylab eq 'DoDiff Graph' ) {
-		$ylab = 'Degree-of-Difficulty';
-		$Col = 0;
-	    }
-	    else {
-		$ylab = 'Wrong-Percentage';
-		$Col = 1;
-	    }
-	    foreach (sort NumericSort keys %GraphDat) { 
-		my @Temp=split(/\:/,$GraphDat{$_});
-                my $inf = $Temp[$Col]; 
-		if ( $Max < $inf ) {$Max = $inf;}
-		$data .= $inf.',';
-		$count++;
-	    }
-	    if ( $Max > 1 ) { 
-		$Max += (10 - $Max % 10);
-		$Max = int($Max);
-	    }
-	    else { $Max = 1; }
-            untie(%GraphDat);
-	    my $Course = $ENV{'course.'.$cid.'.description'};
-	    $Course =~ s/\ /"_"/eg;
-	    my $GData=$Course.'&'.'Problems'.'&'.$ylab.'&'.
-		      $Max.'&'.$count.'&'.$data;
-	}
-	else {
-	    $r->print("Unable to tie hash to db file");
-	}
+
+    if ( $ylab eq 'DoDiff Graph' ) {
+	$ylab = 'Degree-of-Difficulty';
+	$Col = 0;
     }
+    else {
+	$ylab = 'Wrong-Percentage';
+	$Col = 1;
+    }
+
+    my $p_count = $cache->{'ProblemCount'};
+
+    for ( my $k=0; $k<$p_count;$k++) {
+        my $key=$cache->{'CacheTable:'.$k};
+        my @Temp=split(/\&/,$key);
+       # $list[$k]=$key;
+    }
+
+  #  foreach (sort NumericSort keys %GraphDat) { 
+	#	my @Temp=split(/\:/,$GraphDat{$_});
+        #        my $inf = $Temp[$Col]; 
+	#	if ( $Max < $inf ) {$Max = $inf;}
+	#	$data .= $inf.',';
+	#	$count++;
+  # }
+    if ( $Max > 1 ) { 
+	$Max += (10 - $Max % 10);
+      	$Max = int($Max);
+    } else { $Max = 1; }
+
+    #untie(%GraphDat);
+
+    my $Course = $ENV{'course.'.$cid.'.description'};
+    $Course =~ s/\ /"_"/eg;
+    my $GData=$Course.'&'.'Problems'.'&'.$ylab.'&'.
+	      $Max.'&'.$count.'&'.$data;
 }