--- loncom/interface/statistics/lonproblemstatistics.pm	2002/07/30 22:09:01	1.7
+++ loncom/interface/statistics/lonproblemstatistics.pm	2002/08/05 18:10:08	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonproblemstatistics.pm,v 1.7 2002/07/30 22:09:01 minaeibi Exp $
+# $Id: lonproblemstatistics.pm,v 1.12 2002/08/05 18:10:08 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,9 +56,16 @@ 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();
@@ -80,24 +87,53 @@ sub BuildProblemStatisticsPage {
     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,$r);
+
     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, $upper, $lower, \@list, 
-                                        \%Header, $students, $r, $color);
+
+    my $state=$ENV{'form.ProblemStatisticsHeading'}; 
+
+#    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->{$_};
+
+            untie(%cache);
+        }
+    }
+    if($c->aborted()) { return; }
     untie(%cache);
 }
 
@@ -166,13 +202,13 @@ 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++;
 
         #$discrim .= '&';
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
@@ -342,24 +378,26 @@ sub ExtractStudentData {
 }
 
 
-=pod
-sub MySort {          
-    if ( $Pos > 0 ) {
+
+sub MySort {
+    my $pos=shift;
+    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; }
+#	if ($ENV{'form.order'} eq 'Descending') {$b cmp $a;}
+#	else { $a cmp $b; }
+	$a cmp $b;
     }
 }
-=cut
+
 
 
 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";
@@ -379,16 +417,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 +457,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 +469,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 +481,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
@@ -495,12 +541,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);
@@ -512,47 +560,72 @@ sub BuildStatisticsTable {
 		&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
 #    close( OUT );
 #666666
+    return \%TempCache;
 }
 
-=pod
-sub Cache_Statistics {
-    my ($cache,$color)=@_;
+
+sub CacheStatisticsTable {
+    my ($state,$cache,$Header,$r,$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]);
+    my $UnUseful; 
+    my %TempCache;
+    my %myHeader = reverse( %$Header );
+    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);
+	if ( $pos == 0 ) {
+	    ($UnUseful,$Useful)=split(/\>/,$Temp[$pos]);
 	}
 	else {
-	    $Useful = $Temp[$Pos];
+	    $Useful = $Temp[$pos];
 	}   
-	$list[$p_count]=$Useful.'@'.$CachData{$key};
-        $p_count++;
+	$list[$k]=$Useful.'@'.$key;
+	$r->print('<br>'.$list[$k]);
     }
 
+
     @list = sort MySort (@list);
 
     my $nIndex=0;
 
+    return \%TempCache;
+}
+
+
+=pod
+
     if ( $Pos == 0 ) {
-	foreach (sort keys %mapsort) {
-	    my ($Hid,$pr)=split(/\:/,$mapsort{$_});
-	    &CreateProblemStatisticsTableHeading($cache,1,$Hid);
+	foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
+	    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]);
+	    my ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar);
+	    $sequence+=100;
+	while ($SqOrd==$sequence && $cIdx<$NoElements) {
+	    my %storestats=();
 	    my @lpr=split(/\&/,$pr);
 	    for (my $i=1; $i<=$#lpr; $i++) {
 		my($Pre, $Post) = split(/\@/,$list[$nIndex]); 
@@ -564,64 +637,70 @@ sub Cache_Statistics {
 	}
     }
     else {
-	&CreateProblemStatisticsTableHeading($cache,0);
+        &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, 
+                                             $cache->{$sequence.':source'},
+                                             $cache->{$sequence.':title'}, 
+                                             $headings,$r);
 	for ( my $nIndex = 0; $nIndex < $p_count; $nIndex++ ) {
 	    my($Pre, $Post) = split(/\@/,$list[$nIndex]); 
 	    &TableRow($cache,$Post,$nIndex,$nIndex,$color,\%GraphDat);
 	} 
 	&CloseTable($cache);
     }
+
+    return \%TempCache;
 }
-=cut 
+
+=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>'.$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>';
         $r->print("\n".$Ptr.'</tr>' );
     }
-#    $GraphDat->{$RealIdx}=$DoD.':'.$Wrng;
+    $GraphDat->{'graph_gif:'.$RealIdx}=$DoD.':'.$Wrng;
 }
 
 
@@ -646,59 +725,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;';
@@ -707,9 +737,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>';
 
@@ -842,9 +872,7 @@ sub Discriminant {
     my %DisLow = &ProcessDiscriminant(\@LowList,$r);
 
     return (\%DisUp, \%DisLow);
-}
-
-   
+}   
 
 #---- END Problem Statistics Web Page ----------------------------------------
 
@@ -856,14 +884,18 @@ 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;
 }