--- loncom/interface/statistics/lonstathelpers.pm 2011/03/25 01:34:53 1.66 +++ loncom/interface/statistics/lonstathelpers.pm 2012/06/21 13:46:10 1.70 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.66 2011/03/25 01:34:53 www Exp $ +# $Id: lonstathelpers.pm,v 1.70 2012/06/21 13:46:10 goltermann Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,10 +90,10 @@ sub render_resource { my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb); $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; - return '
'. - ''. - $rendered_problem. - '
'; + return '
'. + '

'.&mt('Problem').'

'. + ''.$rendered_problem. + '
'; } #################################################### @@ -716,10 +716,7 @@ sub GetStudentAnswers { # Read in the cache (if it exists) before we start timing things. &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); # Open progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Student Answer Compilation Status', - 'Student Answer Compilation Progress', scalar(@$Students), - $status_type,undef,$formname,$inputname); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students)); $r->rflush(); foreach my $student (@$Students) { last if ($c->aborted()); @@ -1004,7 +1001,7 @@ prior to every analysis lookup. sub ensure_proper_cache { my ($symb) = @_; my $cid = $env{'request.course.id'}; - my $new_filename = '/home/httpd/perl/tmp/'. + my $new_filename = LONCAPA::tempdir() . 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || $cache_filename ne $new_filename || @@ -1492,10 +1489,7 @@ sub gather_full_student_data { my @Students = @Apache::lonstatistics::Students; # # Open the progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,&mt('Student Data Compilation Status'), - &mt('Student Data Compilation Progress'), scalar(@Students), - $status_type,undef,$formname,$inputname); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students)); # while (my $student = shift @Students) { return if ($c->aborted());