--- rat/lonpage.pm 2000/10/16 09:46:23 1.12 +++ rat/lonpage.pm 2001/08/09 16:30:17 1.23 @@ -5,13 +5,14 @@ # # 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 Gerd Kortemeyer +# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 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; @@ -168,6 +169,9 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + + my %metalink=(); + my %cellemb=(); my $allscript=''; @@ -187,6 +191,7 @@ sub handler { map { my $src=$hash{'src_'.$_}; $src=~/\.(\w+)$/; + $metalink{$_}=$src.'.meta'; $cellemb{$_}=Apache::lonnet::fileembstyle($1); if ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell @@ -258,6 +263,8 @@ sub handler { $nforms++; $output=~s/\]*\>//gsi; $output=~s/\<\/form[^\>]*\>//gsi; + $output=~ + s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([\w\.\:]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; } $thisdir=~s/\/[^\/]*$//; map { @@ -270,7 +277,6 @@ sub handler { } @rlinks; $output=~s/\<\s*applet/\print("\n\n".$allmeta); + $allscript=~ + s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; if ($allscript) { - $r->print("\n\n"); + $r->print("\n\n"); } + $r->print(&Apache::lonxml::registerurl); $r->print("\n\n"); # ------------------------------------------------------------------ Start body if ($isxml) { $r->print($xmlbody); } else { - $r->print(''); + $r->print( + ''); } # ------------------------------------------------------------------ Start form if ($nforms) { @@ -319,13 +331,17 @@ sub handler { my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; + my $metainfo=''. + ''. + '

'; $r->print('print(' bgcolor="'. $ssibgcolor{$rid}.'"'); } - $r->print('>print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); } @@ -341,9 +357,12 @@ sub handler { $r->print('>'.$ssibody{$rid}.''); } elsif ($cellemb{$rid} eq 'img') { - $r->print('>'); - } + } elsif ($cellemb{$rid} eq 'emb') { + $r->print('>'.$metainfo.''); + } $r->print(''); } $r->print('');