--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/19 20:10:36 1.59 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/01/19 21:31:08 1.60 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.59 2004/01/19 20:10:36 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.60 2004/01/19 21:31:08 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use Apache::lonstathelpers; use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); @@ -58,22 +59,6 @@ my @SubmitButtons = ({ name => 'PrevProb { name => 'ExcelOutput', text => 'Produce Excel Output' }); -sub render_resource { - my ($resource) = @_; - ## - ## Render the problem - my $base; - ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); - $base = "http://".$ENV{'SERVER_NAME'}.$base; - my $rendered_problem = - &Apache::lonnet::ssi_body($resource->{'src'}); - $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; - return '
'. - ''. - $rendered_problem. - '
'; -} sub BuildProblemAnalysisPage { my ($r,$c)=@_; @@ -152,7 +137,7 @@ sub BuildProblemAnalysisPage { my $resource = $current_problem->{'resource'}; $r->print('

'.$resource->{'title'}.'

'); $r->print('

'.$resource->{'src'}.'

'); - $r->print(&render_resource($resource)); + $r->print(&Apache::lonstathelpers::render_resource($resource)); $r->rflush(); my %Data = &get_problem_data($resource->{'src'}); my $ProblemData = $Data{$current_problem->{'part'}.