--- loncom/interface/statistics/lonproblemanalysis.pm	2002/11/25 18:12:52	1.15
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/06/18 17:34:02	1.22
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
 #
-# $Id: lonproblemanalysis.pm,v 1.15 2002/11/25 18:12:52 minaeibi Exp $
+# $Id: lonproblemanalysis.pm,v 1.22 2003/06/18 17:34:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,9 +55,7 @@ sub BuildProblemAnalysisPage {
     $Ptr .= '<td align="left">'."\n";
     my @sectionsSelected = split(':',$cache{'sectionsSelected'});
     my @sections = split(':',$cache{'sectionList'});
-    $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
-                                                          \@sectionsSelected,
-                                                          'Statistics');
+    $Ptr .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Ptr .= '</td></tr>'."\n";
     $Ptr .= '<tr><td align="right"><b>Intervals</b></td>'."\n";
     $Ptr .= '<td align="left">';
@@ -66,6 +63,7 @@ sub BuildProblemAnalysisPage {
     $Ptr .= '</td></tr></table><br>';
     $r->print($Ptr);
     $r->rflush();
+#   $r->print($cache{'OptionResponses'}.'<br>');
     $r->print(&OptionResponseTable($cache{'OptionResponses'}, \%cache, $r));
 
     untie(%cache);
@@ -117,10 +115,10 @@ sub BuildAnalyzePage {
         $r->print('Can not untie hash.');
         $r->rflush();
     }
-    #if($status eq 'true')
-    { &Apache::lonhtmlcommon::Close_PrgWin($r); }
 
+    &Apache::lonhtmlcommon::Close_PrgWin($r);
 
+### jason code for checing is there data in cache
 #    my $error =
 #        &Apache::loncoursedata::DownloadStudentCourseDataSeparate($students,
 #                                                                  'true',
@@ -134,7 +132,6 @@ sub BuildAnalyzePage {
 #        return;
 #    }
 
-
     unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
         $Str .= 'Unable to tie database.';
         $r->print($Str);
@@ -146,8 +143,6 @@ sub BuildAnalyzePage {
     my $problem  = $cache{$problemId.':problem'};
     my $title    = $cache{$problemId.':title'};
     my $interval = $cache{'Interval'};
-
-#    my $title = 'LON-CAPA Statistics';
     my $heading = 'Restore this particular Option Response Problem '.
                   'Results, Please wait...';
 
@@ -178,20 +173,20 @@ sub BuildAnalyzePage {
     $Str = '';
     if($c->aborted()) {  untie(%cache); return; }
 
-    &Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading);
 
-    my $count=0;
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r, $title,
+						      $heading,$#$students+1);
+
     #Java script Progress window
     for(my $index=0; $index<(scalar @$students); $index++) {
         if($c->aborted()) {  untie(%cache); return; }
-        $count++;
-        my $displayString = $count.'/'.$studentCount.': '.$_;
-        &Apache::lonhtmlcommon::Update_PrgWin($displayString, $r);
+	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+					 'last student '.$students->[$index]);
 	&OpStatus($problemId, $students->[$index], \%ConceptData,
                   $analyzeData->{'foil_to_concept'}, $analyzeData,
 		  \%cache, $courseID);
     }
-    &Apache::lonhtmlcommon::Close_PrgWin($r);
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 
     $Str .= '<br>';
     for (my $k=0; $k<$interval; $k++ ) {
@@ -207,7 +202,7 @@ sub BuildAnalyzePage {
         $r->print($Str);
         $Str = '';
     }
-    my $Answ=&Apache::lonnet::ssi($uri);
+    my $Answ=&Apache::lonnet::ssi_body($uri);
     $Str .= '<br><b>Here you can see the Problem:</b><br>'.$Answ;
     $Str .= '<form>';
     $r->print($Str);
@@ -438,7 +433,7 @@ sub DrawGraph {
     $GData  = $Titr.'&Concepts&Answers&'.$Max.'&'.$P_No.'&';
     $GData .= (join(',',@data1)).'&'.(join(',',@data2));
 
-    return '<IMG src="/cgi-bin/graph.gif?'.$GData.'" border=1/>';
+    return '<IMG src="/cgi-bin/graph.png?'.$GData.'" border=1/>';
 }
 
 sub DrawTable {