--- loncom/homework/lonhomework.pm 2000/10/02 22:23:19 1.12
+++ loncom/homework/lonhomework.pm 2000/11/21 18:39:35 1.16
@@ -10,28 +10,77 @@ use Apache::inputtags;
use Apache::structuretags;
use Apache::response;
+
sub handler {
my $request=shift;
-
+
my $target=&get_target();
$Apache::lonxml::debug=1;
- $request->content_type('text/html');
+ if ($ENV{'browser.mathml'}) {
+ $request->content_type('text/xml');
+ } else {
+ $request->content_type('text/html');
+ }
$request->send_http_header;
+ return 'OK' if $request->header_only;
+
&Apache::lonhomework::send_header($request);
- my $file = "/home/httpd/html".$request->uri;
+ my $file = &Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
my $result = '';
&Apache::inputtags::initialize_inputtags;
- $result = Apache::lonxml::xmlparse($target, &getfile($file),
- &getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm').&setup_vars($target),%mystyle);
+ %Apache::lonhomework::results=();
+ %Apache::lonhomework::history=&Apache::lonnet::restore;
+ #ignore error conditions
+ my ($temp)=keys %Apache::lonhomework::history ;
+ if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
+
+ my $resultkey;
+ foreach $resultkey (sort keys %Apache::lonhomework::history) {
+ &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
+ }
+ &Apache::lonxml::debug("\n
restored values^\n");
+
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem == -1) {
+ &Apache::lonxml::error(" Unable to find $file");
+ $problem='';
+ }
+ my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
+ if ($default == -1) {
+ &Apache::lonxml::error("Unable to find $file");
+ $default='';
+ }
+
+ $result = Apache::lonxml::xmlparse($target, $problem,
+ $default.&setup_vars($target),%mystyle);
#$request->print("Result follows:");
$request->print($result);
#$request->print(":Result ends");
+
+ foreach $resultkey (sort keys %Apache::lonhomework::results) {
+ &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
+ }
+ &Apache::lonxml::debug("\n
storing values^\n");
+
&Apache::lonhomework::send_footer($request);
+ ($temp) = keys %Apache::lonhomework::results;
+ if ( $temp ne '' ) {
+ &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));
+ }
+ return 'OK';
}
sub get_target {
- return "web";
+ if ( $ENV{'request.state'} eq "published") {
+ return 'web';
+ } elsif ($ENV{'request.state'} eq "construct") {
+ if ( defined $ENV{'form.preview'}) {
+ return 'web';
+ } else {
+ return 'edit';
+ }
+ }
}
sub setup_vars {
@@ -42,17 +91,18 @@ sub setup_vars {
sub send_header {
my ($request)= @_;
- $request->print('');
- $request->print('