--- rat/lonpage.pm 2000/10/31 19:31:42 1.15 +++ rat/lonpage.pm 2001/11/29 19:23:48 1.29 @@ -1,17 +1,43 @@ # The LearningOnline Network with CAPA # Page Handler # +# $Id: lonpage.pm,v 1.29 2001/11/29 19:23:48 www Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (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,10/10,10/14,10/16,10/18,10/19,10/31 Gerd Kortemeyer +# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16, +# 08/13/01,08/30,10/1 Gerd Kortemeyer package Apache::lonpage; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet(); +use Apache::lonxml(); use HTML::TokeParser; use GDBM_File; @@ -180,8 +206,6 @@ sub handler { my $xmlheader=''; my $xmlbody=''; - my %httpref=(); - # --------------------------------------------- Get SSI output, post parameters for ($i=0;$i<=$#rows;$i++) { @@ -215,7 +239,6 @@ sub handler { my $bodydef=0; my $thisxml=0; my @rlinks=(); - my @alinks=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -233,23 +256,9 @@ sub handler { } elsif ($token->[1] eq 'img') { $rlinks[$#rlinks+1]= $token->[2]->{'src'}; - $alinks[$#alinks+1]= - $token->[2]->{'src'}; } elsif ($token->[1] eq 'embed') { $rlinks[$#rlinks+1]= $token->[2]->{'src'}; - $alinks[$#alinks+1]= - $token->[2]->{'src'}; - } elsif ($token->[1] eq 'applet') { - $alinks[$#alinks+1]= - $token->[2]->{'code'}; - $alinks[$#alinks+1]= - $token->[2]->{'archive'}; - } elsif ($token->[1] eq 'param') { - if ($token->[2]->{'name'} eq 'cabbase') { - $alinks[$#alinks+1]= - $token->[2]->{'value'}; - } } elsif ($token->[1] eq 'base') { $thisdir=$token->[2]->{'href'}; } elsif ($token->[1] eq 'body') { @@ -263,7 +272,11 @@ sub handler { $xmlbody=$token->[4]; } } elsif ($token->[1] eq 'meta') { + if ($token->[4] !~ m:/>$:) { $allmeta.="\n".$token->[4].''; + } else { + $allmeta.="\n".$token->[4]; + } } elsif (($token->[1] eq 'script') && ($bodydef==0)) { $allscript.="\n\n" @@ -279,6 +292,8 @@ sub handler { $nforms++; $output=~s/\