[LON-CAPA-cvs] cvs: loncom /homework imagechoice.pm /publisher lonconstruct.pm /xml lontex.pm

[albertel]

albertel		Thu Feb 17 04:01:04 2005 EDT

  Modified files:              
    /loncom/homework	imagechoice.pm 
    /loncom/publisher	lonconstruct.pm 
    /loncom/xml	lontex.pm 
  Log:
  - last? of the eradication of direct calls to $r->content_type()
  
  
Index: loncom/homework/imagechoice.pm
diff -u loncom/homework/imagechoice.pm:1.6 loncom/homework/imagechoice.pm:1.7
--- loncom/homework/imagechoice.pm:1.6	Thu Sep  9 16:35:10 2004
+++ loncom/homework/imagechoice.pm	Thu Feb 17 04:01:03 2005
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.6 2004/09/09 20:35:10 albertel Exp $
+# $Id: imagechoice.pm,v 1.7 2005/02/17 09:01:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -217,7 +217,8 @@
 
 sub handler {
     my ($r)=@_;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
     my %data;
     my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
     my $filename = &Apache::lonnet::unescape($ENV{"imagechoice.$id.file"});
Index: loncom/publisher/lonconstruct.pm
diff -u loncom/publisher/lonconstruct.pm:1.27 loncom/publisher/lonconstruct.pm:1.28
--- loncom/publisher/lonconstruct.pm:1.27	Fri Dec 10 13:26:49 2004
+++ loncom/publisher/lonconstruct.pm	Thu Feb 17 04:01:04 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Page Wrapper for Construction
 #
-# $Id: lonconstruct.pm,v 1.27 2004/12/10 18:26:49 raeburn Exp $
+# $Id: lonconstruct.pm,v 1.28 2005/02/17 09:01:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,7 +92,7 @@
 
 # -------------------------------------------------------------- Build frameset
 
-   $r->content_type('text/html');
+   &Apache::loncommon::content_type($r,'text/html');
    $r->send_http_header;
    return OK if $r->header_only;
 
Index: loncom/xml/lontex.pm
diff -u loncom/xml/lontex.pm:1.5 loncom/xml/lontex.pm:1.6
--- loncom/xml/lontex.pm:1.5	Mon Feb 17 12:34:17 2003
+++ loncom/xml/lontex.pm	Thu Feb 17 04:01:04 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Content Handler
 #
-# $Id: lontex.pm,v 1.5 2003/02/17 17:34:17 www Exp $
+# $Id: lontex.pm,v 1.6 2005/02/17 09:01:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,9 +57,9 @@
 # ----------------------------------------------------------- Set document type
 
   if ($ENV{'browser.mathml'}) {
-    $r->content_type('text/xml');
+      &Apache::loncommon::content_type($r,'text/xml');
   } else {
-    $r->content_type('text/html');
+      &Apache::loncommon::content_type($r,'text/html');
   }
   $r->send_http_header;