--- loncom/homework/lonhomework.pm	2000/08/02 16:47:06	1.3
+++ loncom/homework/lonhomework.pm	2000/10/05 19:25:38	1.13
@@ -8,26 +8,48 @@ 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 = "/home/httpd/html".$request->uri;
   my %mystyle;
+  my $result = '';
   &Apache::inputtags::initialize_inputtags;
-  my $result = Apache::lonxml::xmlparse("web",'<scriptlib>/home/httpd/html/res/103/albertel/default_homework</scriptlib>'.&setup_vars.&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");
   &Apache::lonhomework::send_footer($request);
 }
 
+sub get_target {
+  return "web";
+}
+
 sub setup_vars {
-  $Apache::lonhomework::target="web";
-  return '<script>$external::target=web;</script>';
+  my ($target) = @_;
+  return ';'
+#  return ';$external::target='.$target.';';
 }
 
 sub send_header {
@@ -45,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);