--- loncom/homework/lonhomework.pm 2000/08/11 14:25:24 1.6
+++ loncom/homework/lonhomework.pm 2000/11/07 17:21:18 1.15
@@ -8,51 +8,84 @@ 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');
+ $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 = "/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/103/albertel/default_homework').&setup_vars($target),%mystyle);
+
+ 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");
&Apache::lonhomework::send_footer($request);
+ 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.'.$ENV{'form.request.prefix'}.'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(&Apache::lontexconvert::footer());
}
-sub getfile {
+sub getfilenothere {
my ($filename) = @_;
my $a="";
- &Apache::lonnet::repcopy($filename);
+ if (! -e $filename ) {
+ &Apache::lonnet::subscribe($filename);
+ &Apache::lonnet::repcopy($filename);
+ }
{
my $fh=Apache::File->new($filename);