[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm

Tue, 01 Mar 2005 03:24:05 -0000

albertel		Mon Feb 28 22:24:05 2005 EDT

  Modified files:              
    /loncom/homework	lonhomework.pm 
  Log:
  - conversions to use the start html wrapper
  
  
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.196 loncom/homework/lonhomework.pm:1.197

--- loncom/homework/lonhomework.pm:1.196	Mon Jan 31 16:57:32 2005
+++ loncom/homework/lonhomework.pm	Mon Feb 28 22:24:05 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.196 2005/01/31 21:57:32 albertel Exp $
+# $Id: lonhomework.pm,v 1.197 2005/03/01 03:24:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -431,11 +431,7 @@
 
 sub setupheader {
     my $request=$_[0];
-    if ($ENV{'browser.mathml'}) {
-	&Apache::loncommon::content_type($request,'text/xml');
-    } else {
-	&Apache::loncommon::content_type($request,'text/html');
-    }
+    &Apache::loncommon::content_type($request,'text/html');
     if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
 	&Apache::loncommon::no_cache($request);
     }
@@ -496,7 +492,8 @@
     if ($ENV{'environment.remote'} eq 'off') {
 	$bodytag=&Apache::loncommon::bodytag();
     }
-    my $result.='<html>
+    my $html=&Apache::lonxml::xmlbegin();
+    my $result.=$html.'
             <head><title>'.&mt("Analyzing a problem").'</title></head>
             '.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
@@ -623,7 +620,8 @@
 	if ($ENV{'environment.remote'} eq 'off') {
 	    $bodytag=&Apache::loncommon::bodytag();
 	}
-	$result.='<html>'.$bodytag.&Apache::lonxml::message_location().'
+	my $html=&Apache::lonxml::xmlbegin();
+	$result.=$html.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'



