[LON-CAPA-cvs] cvs: rat / lonpage.pm loncom/interface lonmenu.pm
www
lon-capa-cvs@mail.lon-capa.org
Fri, 18 Apr 2003 01:20:25 -0000
www Thu Apr 17 21:20:25 2003 EDT
Modified files:
/loncom/interface lonmenu.pm
/rat lonpage.pm
Log:
Correct filtering of "LON-CAPA Internal" sections.
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.63 loncom/interface/lonmenu.pm:1.64
--- loncom/interface/lonmenu.pm:1.63 Thu Apr 17 21:00:46 2003
+++ loncom/interface/lonmenu.pm Thu Apr 17 21:20:25 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.63 2003/04/18 01:00:46 www Exp $
+# $Id: lonmenu.pm,v 1.64 2003/04/18 01:20:25 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -344,7 +344,7 @@
$tableend
$form
<script>
-//END LON-CAPA Internal
+// END LON-CAPA Internal
</script>
ENDREGTEXT
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.49 rat/lonpage.pm:1.50
--- rat/lonpage.pm:1.49 Fri Feb 14 14:35:55 2003
+++ rat/lonpage.pm Thu Apr 17 21:20:25 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.49 2003/02/14 19:35:55 www Exp $
+# $Id: lonpage.pm,v 1.50 2003/04/18 01:20:25 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -239,6 +239,8 @@
}
}
my $output=Apache::lonnet::ssi($src,%posthash);
+ $output=~
+ s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
if ($target eq 'tex') {
$output =~ s/^([^&]+)\\begin{document}//;
$output =~ s/\\end{document}//;
@@ -348,8 +350,6 @@
}
# ------------------------------------------------------------------------ Head
$r->print("\n<head>\n".$allmeta);
- $allscript=~
- s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
if ($allscript) {
$r->print("\n<script language='JavaScript'>\n".
$allscript."\n</script>\n");