--- loncom/homework/lonhomework.pm	2000/08/08 19:14:53	1.5
+++ loncom/homework/lonhomework.pm	2000/09/19 18:04:47	1.10
@@ -8,6 +8,7 @@ use Apache::lonxml;
 use Apache::lonnet;
 use Apache::inputtags;
 use Apache::structuretags;
+use Apache::response;
 
 sub handler {
   my $request=shift;
@@ -20,11 +21,8 @@ sub handler {
   my %mystyle;
   my $result = '';
   &Apache::inputtags::initialize_inputtags;
-  if ($target eq "web") {
-    $result = Apache::lonxml::xmlparse($target,'<scriptlib>/res/103/albertel/default_homework</scriptlib>'.&setup_vars($target).&getfile($file),%mystyle);
-  } else {
-    $result = Apache::lonxml::xmlparse($target,&getfile($file),%mystyle);
-  }
+  $result = Apache::lonxml::xmlparse($target, &getfile($file),
+		&getfile('/home/httpd/html/res/adm/includes/default_homework').&setup_vars($target),%mystyle);
   #$request->print("Result follows:");
   $request->print($result);
   #$request->print(":Result ends");
@@ -32,13 +30,12 @@ sub handler {
 }
 
 sub get_target {
-  return "edit";
+  return "web";
 }
 
 sub setup_vars {
   my ($target) = @_;
-  $Apache::lonhomework::target=$target;
-  return '<script>$external::target='.$target.';</script>';
+  return ';$external::target='.$target.';';
 }
 
 sub send_header {
@@ -56,7 +53,10 @@ 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($filename);