Diff for /loncom/interface/statistics/lonstathelpers.pm between versions 1.65 and 1.70

version 1.65, 2011/03/12 02:58:49 version 1.70, 2012/06/21 13:46:10
Line 90  sub render_resource { Line 90  sub render_resource {
     my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb);      my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb);
     $rendered_problem =~ s/<\s*form\s*/<nop /g;      $rendered_problem =~ s/<\s*form\s*/<nop /g;
     $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;      $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
     return '<table bgcolor="ffffff"><tr><td>'.      return '<div class="LC_Box">'.
         '<base href="'.$base.'" />'.          '<h4 class="LC_hcell">'.&mt('Problem').'</h4>'.
         $rendered_problem.          '<base href="'.$base.'" />'.$rendered_problem.
         '</td></tr></table>';          '</div>';
 }  }
   
 ####################################################  ####################################################
Line 145  sub problem_selector { Line 145  sub problem_selector {
     if ($onclick) {      if ($onclick) {
         $jsadd="onClick='$onclick'";          $jsadd="onClick='$onclick'";
     }      }
     $Str =  &Apache::loncommon::start_scrollbox(($smallbox?'520px':'620px'),      $Str =  &Apache::loncommon::start_scrollbox(($smallbox?'420px':'620px'),
                                                 ($smallbox?'500px':'600px'),                                                  ($smallbox?'400px':'600px'),
                                                 ($smallbox?'50px':'300px')).                                                  ($smallbox?'60px':'300px')).
             &Apache::loncommon::start_data_table();              &Apache::loncommon::start_data_table();
     my $rb_count =0;      my $rb_count =0;
     my ($navmap,@sequences) =       my ($navmap,@sequences) = 
Line 716  sub GetStudentAnswers { Line 716  sub GetStudentAnswers {
     # Read in the cache (if it exists) before we start timing things.      # Read in the cache (if it exists) before we start timing things.
     &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});      &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
     # Open progress window      # Open progress window
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students));
         ($r,'Student Answer Compilation Status',  
          'Student Answer Compilation Progress', scalar(@$Students),  
          $status_type,undef,$formname,$inputname);  
     $r->rflush();      $r->rflush();
     foreach my $student (@$Students) {      foreach my $student (@$Students) {
         last if ($c->aborted());          last if ($c->aborted());
Line 1004  prior to every analysis lookup. Line 1001  prior to every analysis lookup.
 sub ensure_proper_cache {  sub ensure_proper_cache {
     my ($symb) = @_;      my ($symb) = @_;
     my $cid = $env{'request.course.id'};      my $cid = $env{'request.course.id'};
     my $new_filename =  '/home/httpd/perl/tmp/'.      my $new_filename = LONCAPA::tempdir() .
         'problemanalysis_'.$cid.'_analysis_cache.db';          'problemanalysis_'.$cid.'_analysis_cache.db';
     if (! defined($cache_filename) ||      if (! defined($cache_filename) ||
         $cache_filename ne $new_filename ||          $cache_filename ne $new_filename ||
Line 1492  sub gather_full_student_data { Line 1489  sub gather_full_student_data {
     my @Students = @Apache::lonstatistics::Students;      my @Students = @Apache::lonstatistics::Students;
     #      #
     # Open the progress window      # Open the progress window
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students));
         ($r,&mt('Student Data Compilation Status'),  
          &mt('Student Data Compilation Progress'), scalar(@Students),  
          $status_type,undef,$formname,$inputname);  
     #      #
     while (my $student = shift @Students) {      while (my $student = shift @Students) {
         return if ($c->aborted());          return if ($c->aborted());

Removed from v.1.65  
changed lines
  Added in v.1.70


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>