version 1.210, 2005/06/04 07:47:51
|
version 1.211, 2005/06/06 01:21:53
|
Line 124 sub get_target {
|
Line 124 sub get_target {
|
if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) { |
if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) { |
return ('modified','web','answer'); |
return ('modified','web','answer'); |
} else { |
} else { |
return ('modified','edit'); |
return ('modified','no_output_web','edit'); |
} |
} |
} else { |
} else { |
return ('edit'); |
return ('no_output_web','edit'); |
} |
} |
} else { |
} else { |
return ('web'); |
return ('web'); |
Line 733 sub editxmlmode {
|
Line 733 sub editxmlmode {
|
# Render the page in whatever target desired. |
# Render the page in whatever target desired. |
# |
# |
sub renderpage { |
sub renderpage { |
my ($request,$file) = @_; |
my ($request,$file,$targets) = @_; |
|
|
my (@targets) = &get_target(); |
my @targets = @{$targets || [&get_target()]}; |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonxml::debug("Running targets ".join(':',@targets)); |
&Apache::lonxml::debug("Running targets ".join(':',@targets)); |
my $overall_result; |
my $overall_result; |
Line 748 sub renderpage {
|
Line 748 sub renderpage {
|
# $request->print(" You most likely shouldn't see me."); |
# $request->print(" You most likely shouldn't see me."); |
#} |
#} |
#my $t0 = [&gettimeofday()]; |
#my $t0 = [&gettimeofday()]; |
|
my $output=1; |
|
if ($target eq 'no_output_web') { |
|
$target = 'web'; $output=0; |
|
} |
my $problem=&Apache::lonnet::getfile($file); |
my $problem=&Apache::lonnet::getfile($file); |
if ($problem eq -1) { |
if ($problem eq -1) { |
&Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>"); |
&Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>"); |
Line 755 sub renderpage {
|
Line 759 sub renderpage {
|
} |
} |
|
|
my %mystyle; |
my %mystyle; |
my $result = ''; |
|
if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } |
if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } |
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } |
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } |
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} |
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} |
|
|
&Apache::lonxml::debug("Should be parsing now"); |
&Apache::lonxml::debug("Should be parsing now"); |
$result = &Apache::lonxml::xmlparse($request, $target, $problem, |
my $result = &Apache::lonxml::xmlparse($request, $target, $problem, |
&setup_vars($target),%mystyle); |
&setup_vars($target),%mystyle); |
undef($Apache::lonhomework::parsing_a_problem); |
undef($Apache::lonhomework::parsing_a_problem); |
|
if (!$output) { $result = &Apache::lonxml::message_location(); } |
#$request->print("Result follows:"); |
#$request->print("Result follows:"); |
if ($target eq 'modified') { |
if ($target eq 'modified') { |
&handle_save_or_undo($request,\$problem,\$result); |
&handle_save_or_undo($request,\$problem,\$result); |
Line 948 sub handler {
|
Line 952 sub handler {
|
&renderpage($request,$file); |
&renderpage($request,$file); |
} elsif ($env{'form.problemmode'} eq &mt('EditXML') || |
} elsif ($env{'form.problemmode'} eq &mt('EditXML') || |
$env{'form.problemmode'} eq 'EditXML') { |
$env{'form.problemmode'} eq 'EditXML') { |
|
&renderpage($request,$file,['no_output_web']); |
&editxmlmode($request,$file); |
&editxmlmode($request,$file); |
} elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) { |
} elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) { |
&analyze($request,$file); |
&analyze($request,$file); |