--- rat/lonpage.pm 2000/10/16 09:46:23 1.12 +++ rat/lonpage.pm 2000/10/31 19:31:42 1.15 @@ -5,7 +5,7 @@ # # 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 Gerd Kortemeyer package Apache::lonpage; @@ -168,6 +168,9 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + + my %metalink=(); + my %cellemb=(); my $allscript=''; @@ -177,6 +180,8 @@ sub handler { my $xmlheader=''; my $xmlbody=''; + my %httpref=(); + # --------------------------------------------- Get SSI output, post parameters for ($i=0;$i<=$#rows;$i++) { @@ -187,6 +192,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 @@ -209,6 +215,7 @@ sub handler { my $bodydef=0; my $thisxml=0; my @rlinks=(); + my @alinks=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -226,9 +233,23 @@ 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') { @@ -268,9 +289,13 @@ sub handler { $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/; } } @rlinks; + map { + $httpref{'httpref.'. + &Apache::lonnet::hreflocation($thisdir,$_)}= + $r->uri; + } @alinks; $output=~s/\<\s*applet/\content_type('text/xml'); @@ -319,13 +346,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 +372,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('');