--- loncom/homework/lonhomework.pm	2000/08/08 19:14:53	1.5
+++ loncom/homework/lonhomework.pm	2000/10/05 19:25:38	1.13
@@ -8,11 +8,13 @@ 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);
@@ -20,11 +22,20 @@ 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);
+
+  my $problem=&Apache::lonnet::getfile($file);
+  if ($problem == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
+    $problem='';
+  }
+  my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
+  if ($default == -1) {
+    &Apache::lonxml::error("<b>Unable to find <i>$file</i></b>");
+    $default='';
   }
+
+  $result = Apache::lonxml::xmlparse($target, $problem,
+				     $default.&setup_vars($target),%mystyle);
   #$request->print("Result follows:");
   $request->print($result);
   #$request->print(":Result ends");
@@ -32,13 +43,13 @@ 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 ';'
+#  return ';$external::target='.$target.';';
 }
 
 sub send_header {
@@ -56,7 +67,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);