--- loncom/homework/lonhomework.pm 2005/11/08 17:53:20 1.219 +++ loncom/homework/lonhomework.pm 2005/11/15 18:38:47 1.224 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.219 2005/11/08 17:53:20 www Exp $ +# $Id: lonhomework.pm,v 1.224 2005/11/15 18:38:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -581,10 +581,8 @@ sub handle_save_or_undo { sub analyze_header { my ($request) = @_; - my $bodytag=''; - if ($env{'environment.remote'} eq 'off') { - $bodytag=&Apache::loncommon::bodytag(); - } + my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, + ($env{'environment.remote'} ne 'off')); my $html=&Apache::lonxml::xmlbegin(); my $result.=$html.' '.&mt("Analyzing a problem").' @@ -659,7 +657,7 @@ sub analyze { foreach my $part (sort(keys(%allparts))) { if (defined(@{ $overall{$part.'.answer'} })) { my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); - $request->print(''); + $request->print('
'.&mt('Part').' '.$part.'
'); my %frequency; foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { $frequency{join("\0",@{ $answer })}++; @@ -667,9 +665,9 @@ sub analyze { $request->print(''); foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { - $request->print(''); } $request->print('
'.&mt('Part').' '.$part.'
'.&mt('Answer').''.&mt('Frequency').'
(' .&mt('click for example').')
'. - join('',split("\0",$answer)). - ''.$frequency{$answer}. + $request->print('
'. + join('',split("\0",$answer)). + ''.$frequency{$answer}. '
'); @@ -717,10 +715,8 @@ sub editxmlmode { if ($cols > 80) { $cols = 80; } if ($cols < 70) { $cols = 70; } if ($rows < 20) { $rows = 20; } - my $bodytag=''; - if ($env{'environment.remote'} eq 'off') { - $bodytag=&Apache::loncommon::bodytag(); - } + my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, + ($env{'environment.remote'} ne 'off')); my $html=&Apache::lonxml::xmlbegin(); $result.=$html.$bodytag. &renderpage($request,$file,['no_output_web'],1). @@ -770,8 +766,10 @@ sub renderpage { $target = 'web'; $output=0; } my $problem=&Apache::lonnet::getfile($file); + my $result; if ($problem eq -1) { - &Apache::lonxml::error(" ".&mt('Unable to find')." $file"); + my $filename=(split('/',$file))[-1]; + $result.=" ".&mt('Unable to find')." $filename"; $problem=''; } @@ -781,8 +779,8 @@ sub renderpage { if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} &Apache::lonxml::debug("Should be parsing now"); - my $result = &Apache::lonxml::xmlparse($request, $target, $problem, - &setup_vars($target),%mystyle); + $result .= &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); undef($Apache::lonhomework::parsing_a_problem); if (!$output) { $result = ''; } #$request->print("Result follows:"); @@ -921,7 +919,7 @@ EDITMENU sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; - + $Apache::lonxml::request=$request; $Apache::lonxml::debug=$env{'user.debug'}; $env{'request.uri'}=$request->uri; &setuppermissions(); @@ -941,10 +939,6 @@ sub handler { if ($Apache::lonhomework::browse ne 'F' && $env{'request.state'} ne "construct") { #should know where we are, so ask - if ( &Apache::lonnet::mod_perl_version() == 2 ) { - &Apache::lonnet::cleanenv(); - } - &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version()); $request->internal_redirect('/adm/ambiguous'); return OK; } }