--- loncom/homework/lonhomework.pm 2000/08/08 19:14:53 1.5 +++ loncom/homework/lonhomework.pm 2000/08/11 14:35:13 1.7 @@ -16,15 +16,12 @@ sub handler { $request->content_type('text/html'); $request->send_http_header; &Apache::lonhomework::send_header($request); - my $file = "/home/httpd/html".$request->uri; + my $file = $request->uri; my %mystyle; my $result = ''; &Apache::inputtags::initialize_inputtags; - if ($target eq "web") { - $result = Apache::lonxml::xmlparse($target,'/res/103/albertel/default_homework'.&setup_vars($target).&getfile($file),%mystyle); - } else { - $result = Apache::lonxml::xmlparse($target,&getfile($file),%mystyle); - } + $result = Apache::lonxml::xmlparse($target, &getfile($file), + &getfile('/res/103/albertel/default_homework').&setup_vars($target),%mystyle); #$request->print("Result follows:"); $request->print($result); #$request->print(":Result ends"); @@ -32,13 +29,12 @@ sub handler { } sub get_target { - return "edit"; + return "web"; } sub setup_vars { my ($target) = @_; - $Apache::lonhomework::target=$target; - return ''; + return ';$external::target='.$target.';'; } sub send_header { @@ -58,7 +54,7 @@ sub getfile { my $a=""; &Apache::lonnet::repcopy($filename); { - my $fh=Apache::File->new($filename); + my $fh=Apache::File->new("/home/httpd/html".$filename); while (<$fh>) { $a .=$_;