--- loncom/homework/lonhomework.pm 2000/08/11 14:57:32 1.8
+++ loncom/homework/lonhomework.pm 2000/11/30 16:20:49 1.17
@@ -1,5 +1,6 @@
# The LON-CAPA Homework handler
# Guy Albertelli
+# 11/30 Gerd Kortemeyer
package Apache::lonhomework;
use strict;
@@ -8,48 +9,67 @@ use Apache::lonxml;
use Apache::lonnet;
use Apache::inputtags;
use Apache::structuretags;
+use Apache::response;
-sub handler {
- my $request=shift;
- my $target=&get_target();
- $request->content_type('text/html');
- $request->send_http_header;
- &Apache::lonhomework::send_header($request);
- my $file = "/home/httpd/html".$request->uri;
+sub subhandler {
+ my ($target,$problem)=@_;
my %mystyle;
my $result = '';
&Apache::inputtags::initialize_inputtags;
- $result = Apache::lonxml::xmlparse($target, &getfile($file),
- &getfile('/home/httpd/html/res/103/albertel/default_homework').&setup_vars($target),%mystyle);
- #$request->print("Result follows:");
- $request->print($result);
- #$request->print(":Result ends");
- &Apache::lonhomework::send_footer($request);
+ %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 $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
+ if ($default == -1) {
+ &Apache::lonxml::error("Unable to find default_homework.lcpm");
+ $default='';
+ }
+
+ return Apache::lonxml::xmlparse($target, $problem,
+ $default.&setup_vars($target),%mystyle);
}
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 {
my ($target) = @_;
- return ';$external::target='.$target.';';
+ return ';'
+# return ';$external::target='.$target.';';
}
sub send_header {
my ($request)= @_;
- $request->print('');
- $request->print('');
- $request->print('');
+# $request->print('');
+ $request->print(&Apache::lontexconvert::footer());
}
-sub getfile {
+sub getfilenothere {
my ($filename) = @_;
my $a="";
if (! -e $filename ) {
@@ -66,5 +86,47 @@ sub getfile {
return $a
}
+sub handler {
+ my $request=shift;
+
+ $Apache::lonxml::debug=1;
+ 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=&Apache::lonnet::filelocation("",$request->uri);
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem == -1) {
+ &Apache::lonxml::error(" Unable to find $file");
+ $problem='';
+ }
+
+ my $result=&subhandler(&get_target(),$problem);
+
+ #$request->print("Result follows:");
+ $request->print($result);
+ #$request->print(":Result ends");
+
+ my $temp;
+ my $resultkey;
+ 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';
+
+}
+
1;
__END__