[LON-CAPA-cvs] cvs: rat / lonambiguous.pm lonpage.pm lonpageflip.pm lonratsrv.pm lonsequence.pm lonwrapper.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 17 Feb 2005 09:09:58 -0000
This is a MIME encoded message
--albertel1108631398
Content-Type: text/plain
albertel Thu Feb 17 04:09:58 2005 EDT
Modified files:
/rat lonambiguous.pm lonpage.pm lonpageflip.pm lonratsrv.pm
lonsequence.pm lonwrapper.pm
Log:
- more $r->content_type eradication
--albertel1108631398
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20050217040958.txt"
Index: rat/lonambiguous.pm
diff -u rat/lonambiguous.pm:1.13 rat/lonambiguous.pm:1.14
--- rat/lonambiguous.pm:1.13 Mon Dec 20 15:13:52 2004
+++ rat/lonambiguous.pm Thu Feb 17 04:09:57 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to resolve ambiguous file locations
#
-# $Id: lonambiguous.pm,v 1.13 2004/12/20 20:13:52 albertel Exp $
+# $Id: lonambiguous.pm,v 1.14 2005/02/17 09:09:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,11 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 10/11,10/12,10/16 Gerd Kortemeyer
package Apache::lonambiguous;
@@ -56,7 +51,7 @@
sub getlost {
my ($r,$errmsg)=@_;
$errmsg=&mt($errmsg);
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print(
'<head><title>Unknown Error</title></head>'.
@@ -139,7 +134,7 @@
if ($syval=~/\_$/) {
# ----------------------------------- Okay, this should have appeared on a page
$syval=~s/\_\_\_$//;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location =>
'http://'.$ENV{'HTTP_HOST'}.'/res/'.$syval);
return REDIRECT;
@@ -151,7 +146,7 @@
}
# ------------------------------------Encrypted requests go straight to navmaps
if ($ENV{'request.enc'}) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps');
return REDIRECT;
}
@@ -183,7 +178,7 @@
my $resurl=$bighash{'src_'.$id};
my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]};
my $symb=&make_symb($id);
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
&Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
$r->header_out(Location =>
'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
@@ -191,7 +186,7 @@
}
if ($#possibilities>0) {
# ----------------------------------------------- Okay, really multiple choices
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my $bodytag=
&Apache::loncommon::bodytag('Pick Instance of Resource');
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.66 rat/lonpage.pm:1.67
--- rat/lonpage.pm:1.66 Fri Dec 17 17:34:53 2004
+++ rat/lonpage.pm Thu Feb 17 04:09:57 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.66 2004/12/17 22:34:53 albertel Exp $
+# $Id: lonpage.pm,v 1.67 2005/02/17 09:09:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,17 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (TeX Content Handler
-#
-# YEAR=2000
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16,
-# YEAR=2001
-# 08/13/01,08/30,10/1 Gerd Kortemeyer
-# YEAR=2002
-# 03/19 Gerd Kortemeyer
-#
###
package Apache::lonpage;
@@ -563,7 +552,7 @@
}
# ------------------------------------------------------------- End render page
} else {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
&Apache::lonsequence::viewmap($r,$requrl);
}
@@ -578,7 +567,7 @@
}
}
}
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
&Apache::lonsequence::viewmap($r,$requrl);
return OK;
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.50 rat/lonpageflip.pm:1.51
--- rat/lonpageflip.pm:1.50 Thu Nov 11 14:43:22 2004
+++ rat/lonpageflip.pm Thu Feb 17 04:09:57 2005
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.50 2004/11/11 19:43:22 albertel Exp $
+# $Id: lonpageflip.pm,v 1.51 2005/02/17 09:09:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,17 +26,6 @@
#
# http://www.lon-capa.org/
#
-# (Page Handler
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02 Gerd Kortemeyer)
-#
-# 10/03,10/05,10/06,10/07,10/09,10/10,10/11,10/16,10/17,
-# 11/14,11/16,
-# 10/01/01,05/01,05/28,07/05 Gerd Kortemeyer
package Apache::lonpageflip;
@@ -190,9 +179,9 @@
# ------------------------------------------- Set document type for header only
if ($r->header_only) {
- $r->content_type('text/html');
- $r->send_http_header;
- return OK;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ return OK;
}
my %cachehash=();
@@ -226,7 +215,6 @@
($murl,$id,$fn)=&Apache::lonnet::decode_symb(&Apache::lonnet::symbread($fn));
$id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id;
$newloc=$hash{'src_'.$id};
- &Apache::lonnet::logthis(" hrrm 1 ");
if ($newloc) {
if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); }
@@ -237,7 +225,7 @@
} else {
$newloc='/adm/noidea.html';
}
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location =>
'http://'.$ENV{'HTTP_HOST'}.$newloc);
@@ -258,7 +246,7 @@
if ($last) {
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[1]);
} else {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location =>
'http://'.$ENV{'HTTP_HOST'}.'/adm/noidea.html');
return REDIRECT;
@@ -358,13 +346,13 @@
&Apache::lonnet::appenv('user.criticalcheck.time'=>time);
}
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location =>
'http://'.$ENV{'HTTP_HOST'}.$redirecturl);
return REDIRECT;
} else {
# --------------------------------------------------------- There was a problem
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
if ($#possibilities>0) {
my $bodytag=
Index: rat/lonratsrv.pm
diff -u rat/lonratsrv.pm:1.28 rat/lonratsrv.pm:1.29
--- rat/lonratsrv.pm:1.28 Fri Apr 23 15:59:01 2004
+++ rat/lonratsrv.pm Thu Feb 17 04:09:57 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Server for RAT Maps
#
-# $Id: lonratsrv.pm,v 1.28 2004/04/23 19:59:01 www Exp $
+# $Id: lonratsrv.pm,v 1.29 2005/02/17 09:09:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,13 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (Edit Handler for RAT Maps
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 7/1 Gerd Kortemeyer)
-# 7/1,7/3,7/4,7/7,7/8,7/10,7/26,10/2 Gerd Kortemeyer
-# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer
package Apache::lonratsrv;
@@ -322,7 +315,7 @@
sub handler {
my $r=shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.21 rat/lonsequence.pm:1.22
--- rat/lonsequence.pm:1.21 Fri Oct 15 21:14:28 2004
+++ rat/lonsequence.pm Thu Feb 17 04:09:57 2005
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.21 2004/10/16 01:14:28 albertel Exp $
+# $Id: lonsequence.pm,v 1.22 2005/02/17 09:09:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,13 +28,6 @@
#
# (Handler to resolve ambiguous file locations
#
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 10/11,10/12 Gerd Kortemeyer)
-#
-# 10/16 Gerd Kortemeyer
package Apache::lonsequence;
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.16 rat/lonwrapper.pm:1.17
--- rat/lonwrapper.pm:1.16 Sat Sep 18 12:32:17 2004
+++ rat/lonwrapper.pm Thu Feb 17 04:09:57 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.16 2004/09/18 16:32:17 albertel Exp $
+# $Id: lonwrapper.pm,v 1.17 2005/02/17 09:09:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,13 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (Edit Handler for RAT Maps
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 7/1,6/30 Gerd Kortemeyer)
-#
-# 7/5 Gerd Kortemeyer
package Apache::lonwrapper;
--albertel1108631398--