--- loncom/homework/lonhomework.pm 2000/08/11 14:35:13 1.7
+++ loncom/homework/lonhomework.pm 2000/10/05 19:25:38 1.13
@@ -8,20 +8,34 @@ use Apache::lonxml;
use Apache::lonnet;
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');
$request->send_http_header;
&Apache::lonhomework::send_header($request);
- my $file = $request->uri;
+ my $file = "/home/httpd/html".$request->uri;
my %mystyle;
my $result = '';
&Apache::inputtags::initialize_inputtags;
- $result = Apache::lonxml::xmlparse($target, &getfile($file),
- &getfile('/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");
@@ -34,7 +48,8 @@ sub get_target {
sub setup_vars {
my ($target) = @_;
- return ';$external::target='.$target.';';
+ return ';'
+# return ';$external::target='.$target.';';
}
sub send_header {
@@ -52,9 +67,12 @@ sub send_footer {
sub getfile {
my ($filename) = @_;
my $a="";
- &Apache::lonnet::repcopy($filename);
+ if (! -e $filename ) {
+ &Apache::lonnet::subscribe($filename);
+ &Apache::lonnet::repcopy($filename);
+ }
{
- my $fh=Apache::File->new("/home/httpd/html".$filename);
+ my $fh=Apache::File->new($filename);
while (<$fh>) {
$a .=$_;