--- loncom/homework/lonhomework.pm	2000/11/21 18:39:35	1.16
+++ loncom/homework/lonhomework.pm	2000/11/30 16:20:49	1.17
@@ -1,5 +1,6 @@
 # The LON-CAPA Homework handler
 # Guy Albertelli
+# 11/30 Gerd Kortemeyer
 
 package Apache::lonhomework;
 use strict;
@@ -11,21 +12,8 @@ use Apache::structuretags;
 use Apache::response;
 
 
-sub handler {
-  my $request=shift;
-  
-  my $target=&get_target();
-  $Apache::lonxml::debug=1;
-  if ($ENV{'browser.mathml'}) {
-    $request->content_type('text/xml');
-  } else {
-    $request->content_type('text/html');
-  }
-  $request->send_http_header;
-  return 'OK' if $request->header_only;
-
-  &Apache::lonhomework::send_header($request);
-  my $file = &Apache::lonnet::filelocation("",$request->uri);
+sub subhandler {
+  my ($target,$problem)=@_;
   my %mystyle;
   my $result = '';
   &Apache::inputtags::initialize_inputtags;
@@ -40,35 +28,14 @@ sub handler {
     &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
   }
   &Apache::lonxml::debug("\n<br>restored values^</br>\n");
-
-  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>");
+    &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
     $default='';
   }
 
-  $result = Apache::lonxml::xmlparse($target, $problem,
+  return Apache::lonxml::xmlparse($target, $problem,
 				     $default.&setup_vars($target),%mystyle);
-  #$request->print("Result follows:");
-  $request->print($result);
-  #$request->print(":Result ends");
-
-  foreach $resultkey (sort keys %Apache::lonhomework::results) {
-    &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
-  }
-  &Apache::lonxml::debug("\n<br>storing values^</br>\n");
-
-  &Apache::lonhomework::send_footer($request);
-  ($temp) = keys %Apache::lonhomework::results;
-  if ( $temp ne '' ) {
-    &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));
-  }
-  return 'OK';
 }
 
 sub get_target {
@@ -119,5 +86,47 @@ sub getfilenothere {
   return $a
 }
 
+sub handler {
+  my $request=shift;
+
+  $Apache::lonxml::debug=1;
+  if ($ENV{'browser.mathml'}) {
+    $request->content_type('text/xml');
+  } else {
+    $request->content_type('text/html');
+  }
+  $request->send_http_header;
+  return 'OK' if $request->header_only;
+
+  &Apache::lonhomework::send_header($request);
+  my $file=&Apache::lonnet::filelocation("",$request->uri);
+  my $problem=&Apache::lonnet::getfile($file);
+  if ($problem == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
+    $problem='';
+  }
+
+  my $result=&subhandler(&get_target(),$problem);
+
+  #$request->print("Result follows:");
+  $request->print($result);
+  #$request->print(":Result ends");
+
+  my $temp;
+  my $resultkey;
+  foreach $resultkey (sort keys %Apache::lonhomework::results) {
+    &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
+  }
+  &Apache::lonxml::debug("\n<br>storing values^</br>\n");
+
+  &Apache::lonhomework::send_footer($request);
+  ($temp) = keys %Apache::lonhomework::results;
+  if ( $temp ne '' ) {
+    &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));
+  }
+  return 'OK';
+
+}
+
 1;
 __END__