[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /xml lonxml.pm

[albertel]

albertel		Thu Apr 13 14:35:18 2006 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
    /loncom/xml	lonxml.pm 
  Log:
  -elimintaing some endbodytag usaages
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.341 loncom/homework/structuretags.pm:1.342
--- loncom/homework/structuretags.pm:1.341	Tue Apr 11 14:42:58 2006
+++ loncom/homework/structuretags.pm	Thu Apr 13 14:35:06 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.341 2006/04/11 18:42:58 albertel Exp $
+# $Id: structuretags.pm,v 1.342 2006/04/13 18:35:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -251,7 +251,7 @@
     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::lonxml::htmlareafields).
-    "\n</form>\n".&Apache::loncommon::endbodytag()."\n</html>";
+    "\n</form>\n".&Apache::loncommon::end_page();
 }
 
 sub option {
@@ -962,8 +962,7 @@
 	$result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
 	     $env{'request.state'} eq "construct") {
-	$result.='</form>'.&Apache::loncommon::endbodytag().
-	    &Apache::lonxml::xmlend();
+	$result.='</form>'.&Apache::lonxml::xmlend();
     }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.404 loncom/xml/lonxml.pm:1.405
--- loncom/xml/lonxml.pm:1.404	Tue Apr 11 10:17:06 2006
+++ loncom/xml/lonxml.pm	Thu Apr 13 14:35:17 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.404 2006/04/11 14:17:06 albertel Exp $
+# $Id: lonxml.pm,v 1.405 2006/04/13 18:35:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -204,9 +204,9 @@
 	$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
 	&Apache::lonxml::newparser($parser,\$discussion,'');
 	return '';
-    } else {
-	return $discussion.&Apache::loncommon::endbodytag();
     }
+
+    return $discussion.&Apache::loncommon::end_page();
 }
 
 sub tokeninputfield {