--- loncom/interface/statistics/lonproblemstatistics.pm	2002/07/25 19:29:23	1.2
+++ loncom/interface/statistics/lonproblemstatistics.pm	2002/07/26 21:50:12	1.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonproblemstatistics.pm,v 1.2 2002/07/25 19:29:23 minaeibi Exp $
+# $Id: lonproblemstatistics.pm,v 1.3 2002/07/26 21:50:12 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,7 @@ use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use GDBM_File;
 
-my %mapsort;
+#my %mapsort;
 
 sub BuildProblemStatisticsPage {
     my ($cacheDB, $students, $courseID, $c, $r,%color)=@_;
@@ -86,12 +86,13 @@ sub BuildProblemStatisticsPage {
     my %Discuss=&Apache::loncoursedata::LoadDiscussion($courseID);
     my $index=0;
     foreach (@$students) {
+	$index++;
 	#&Apache::lonstatistics::Update_PrgWin(++$index,$r);
-        $discriminantFactor = &ExtractStudentData(\%cache, $_, \@list,\%Discuss);
+        $discriminantFactor = &ExtractStudentData(\%cache, $_, \@list,
+						  \%Discuss, $r);
     }
     #&Apache::lonstatistics::Close_PrgWin($r);
 
-    return $Ptr;
     my ($upper, $lower) = &Discriminant($discriminantFactor);
     my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",
                   4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",
@@ -427,7 +428,7 @@ sub CloseTable {
  
 # ------ Dump the Student's DB file and handling the data for statistics table 
 sub ExtractStudentData {
-    my ($cache,$name,$list,%Discuss)=@_;
+    my ($cache,$name,$list,$Discuss,$r)=@_;
     my %discriminantFactor;
 
     my $totalTries = 0;
@@ -443,18 +444,24 @@ sub ExtractStudentData {
     my $TimeTot = 0;
     my $Discussed=0;
 
+$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%$cache);
+$Apache::lonxml::debug=0;
+
     foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
-        if($cache->{'ProblemStatisticsMap'} ne 'All Maps'  &&
-           $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
-            next;
-        }
+#        if($cache->{'ProblemStatisticsMap'} ne 'All Maps'  &&
+#           $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
+	    $r->print("<br>$name ---   $sequence");
+	    $r->print("<br>".$cache->{$sequence.':title'});
+#            next;
+#        }
 
         my $Dis = '';
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
             my $problem = $cache->{$problemID.':problem'};
+	    $r->print("<br>$problemID === $problem");
             my $LatestVersion = $cache->{$name.':version:'.$problem};
-
-            # Output dashes for all the parts of this problem if there
+	    # Output dashes for all the parts of this problem if there
             # is no version information about the current problem.
             #if(!$LatestVersion) {
             #    foreach my $part (split(/\:/,$cache->{$sequence.':'.
@@ -481,7 +488,7 @@ sub ExtractStudentData {
             # oldest version.  Basically, it gets the most recent 
             # set of grade data for each part.
 	    for(my $Version=1; $Version<=$LatestVersion; $Version++) {
-                foreach my $part (split(/\:/,$cache->{$sequence.':'.
+		foreach my $part (split(/\:/,$cache->{$sequence.':'.
                                                       $problemID.
                                                       ':parts'})) {
 
@@ -517,7 +524,6 @@ sub ExtractStudentData {
                     elsif ($val eq 'incorrect_by_override'){$code = 'I';}
                     elsif ($val eq 'excused')              {$code = 'x';}
                     $partData{$part.':code'}=$code;
-
                     if($partData{$part.':wrong'} ne 0 && 
                        ($code eq 'C' || $code eq 'O')) {
                         $partData{$part.':wrong'}--;
@@ -554,17 +560,18 @@ sub ExtractStudentData {
                     $DisF = $Fac;
                 }
 
-                if ($Discuss{"$name:$problem"}) {
+                if ($Discuss->{"$name:$problem"}) {
 		    $TotDiscuss++;
                     $Discussed=1;
                 }
                 my $time = $cache->{"$name:$LatestVersion:$problem:timestamp"};
                 $Dis .= $tempProblemOrder.'='.$DisF.'+'.$Yes;
-                $ptr .= '&'.$partData{$_.'.Tries'}.
-                        '&'.$partData{$_.'.Wrongs'}.
-                        '&'.$partData{$_.'.Code'};
+                $ptr .= '&'.$partData{$_.'.tries'}.
+                        '&'.$partData{$_.'.wrongs'}.
+                        '&'.$partData{$_.'.code'};
                 push (@$list, $ptr."&$Discussed");
-
+                $r->print('<br>'.$name.'---'.$ptr);
+		
 ####		if ($DoDiff>0.85) {
 
                 $TimeTot += $time;
@@ -619,6 +626,7 @@ sub MySort {
 }
 =cut
 
+
 sub BuildStatisticsTable {
     my ($cache,$discriminantFactor,$list,$headings,$students,$r,%color)=@_;
 
@@ -641,17 +649,22 @@ sub BuildStatisticsTable {
     my %GraphDat;
     my $NoElements = scalar @$list;
 
+
     foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
-        if($cache->{'ProblemStatisticsMap'} ne 'All Maps'  &&
-           $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) {
-            next;
-        }
 
 	&CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'},
                                              $cache->{$sequence.':source'}, 
                                              $cache->{$sequence.':title'},
                                              $headings,$r);
 
+        foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
+            my $problem = $cache->{$problemID.':problem'};
+	    $r->print("<br>$problem");
+	
+	}
+    }  
+}
+=pod
 ##777777
 ##    $Str .= &Classify($discriminantFactor, $students);
 
@@ -783,6 +796,7 @@ sub BuildStatisticsTable {
 #    close( OUT );
 #666666
 }
+=cut
 
 =pod
 sub Cache_Statistics {
@@ -1051,7 +1065,8 @@ sub GetGraphData {
             untie(%GraphDat);
 	    my $Course = $ENV{'course.'.$cid.'.description'};
 	    $Course =~ s/\ /"_"/eg;
-	    my $GData=$Course.'&'.'Problems'.'&'.$ylab.'&'.$Max.'&'.$count.'&'.$data;
+	    my $GData=$Course.'&'.'Problems'.'&'.$ylab.'&'.
+		      $Max.'&'.$count.'&'.$data;
 	}
 	else {
 	    $r->print("Unable to tie hash to db file");