--- loncom/homework/structuretags.pm	2006/04/18 22:36:23	1.347
+++ loncom/homework/structuretags.pm	2006/04/20 02:05:30	1.349
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.347 2006/04/18 22:36:23 albertel Exp $
+# $Id: structuretags.pm,v 1.349 2006/04/20 02:05:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -250,7 +250,7 @@ sub problem_edit_header {
 sub problem_edit_footer {
     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
-    &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmcommon::get_htmlareafields()).
+    &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();
 }
 
@@ -861,7 +861,7 @@ sub end_problem {
 	    if ($target ne 'tex' &&
 		$env{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
-		$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmcommon::get_htmlareafields());
+		$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
 	    }
 	    if ($target eq 'web') {
 		$result.= &Apache::loncommon::end_page({'discussion' => 1});
@@ -872,7 +872,6 @@ sub end_problem {
 		}
                 if ($env{'form.print_discussions'} eq 'yes') {
 		    $result.=&Apache::lonxml::xmlend($target,$parser);
-		    $result=~s/<\/html>//;
 		} else {
 		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
 		    if (not $env{'request.symb'} =~ m/\.page_/) {
@@ -957,7 +956,7 @@ sub end_library {
 	$result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
 	     $env{'request.state'} eq "construct") {
-	$result.='</form>'.&Apache::lonxml::xmlend();
+	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;