--- loncom/homework/lonhomework.pm 2004/02/16 20:30:34 1.168
+++ loncom/homework/lonhomework.pm 2004/03/09 20:37:58 1.171
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.168 2004/02/16 20:30:34 albertel Exp $
+# $Id: lonhomework.pm,v 1.171 2004/03/09 20:37:58 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,6 +47,7 @@ use Apache::externalresponse();
use Apache::rankresponse();
use Apache::matchresponse();
use Apache::chemresponse();
+use Apache::drawimage();
use Apache::Constants qw(:common);
use HTML::Entities();
use Apache::loncommon();
@@ -398,29 +399,29 @@ sub handle_save_or_undo {
if ((!$error) && (!copy($filebak,$file))) { $error=1; }
if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
if (!$error) {
- $request->print("".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file
");
+ &Apache::lonxml::info("".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file
");
} else {
- $request->print("".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file
");
+ &Apache::lonxml::info("".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file
");
$error=1;
}
} else {
my $fs=Apache::File->new(">$filebak");
if (defined($fs)) {
print $fs $$problem;
- $request->print("".&mt("Making Backup to").
- " $filebak
");
+ &Apache::lonxml::info("".&mt("Making Backup to").
+ " $filebak");
} else {
- $request->print("".&mt("Unable to make backup")." $filebak");
+ &Apache::lonxml::info("".&mt("Unable to make backup")." $filebak");
$error=2;
}
my $fh=Apache::File->new(">$file");
if (defined($fh)) {
print $fh $$result;
- $request->print("".&mt("Saving Modifications to").
- " $file
");
+ &Apache::lonxml::info("".&mt("Saving Modifications to").
+ " $file");
} else {
- $request->print("".
- &mt("Unable to write to")." $file");
+ &Apache::lonxml::info("".
+ &mt("Unable to write to")." $file");
$error|=4;
}
}
@@ -431,7 +432,7 @@ sub analyze_header {
my ($request) = @_;
my $result.='
'.&mt("Analyzing a problem").'
-
+ '.&Apache::lonxml::message_location().'
';
+ &Apache::lonxml::add_messages(\$result);
$request->print($result);
$request->rflush();
}
@@ -548,21 +550,23 @@ sub editxmlmode {
if ($cols > 80) { $cols = 80; }
if ($cols < 70) { $cols = 70; }
if ($rows < 20) { $rows = 20; }
- $result.='
+ $result.=''.
+ &Apache::lonxml::message_location().'
';
+ &Apache::lonxml::add_messages(\$result);
$request->print($result);
}
return '';
@@ -574,6 +578,7 @@ sub renderpage {
my (@targets) = &get_target();
&Apache::lonhomework::showhashsubset(\%ENV,'form.');
&Apache::lonxml::debug("Running targets ".join(':',@targets));
+ my $overall_result;
foreach my $target (@targets) {
#my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
@@ -605,12 +610,16 @@ sub renderpage {
#$result =~ s:::;
#$result.="
Spent $td seconds processing target $target\n";
#}
- $request->print($result);
- $request->rflush();
+# $request->print($result);
+ $overall_result.=$result;
+# $request->rflush();
}
#$request->print(":Result ends");
#my $td=&tv_interval($t0);
}
+ &Apache::lonxml::add_messages(\$overall_result);
+ $request->print($overall_result);
+ $request->rflush();
}
# with no arg it returns a HTML