--- rat/lonpage.pm 2000/10/02 21:33:40 1.10 +++ rat/lonpage.pm 2001/11/05 19:28:54 1.28 @@ -5,13 +5,15 @@ # # 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/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; @@ -74,10 +76,28 @@ sub tracetable { } if (defined($hash{'to_'.$rid})) { + my $mincond=1; + my $next=''; map { - my $now=&tracetable($sofar,$hash{'goesto_'.$_},$beenhere); - if ($now>$further) { $further=$now; } + my $thiscond= + &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}}); + if ($thiscond>=$mincond) { + if ($next) { + $next.=','.$_.':'.$thiscond; + } else { + $next=$_.':'.$thiscond; + } + if ($thiscond>$mincond) { $mincond=$thiscond; } + } } split(/\,/,$hash{'to_'.$rid}); + map { + my ($linkid,$condval)=split(/\:/,$_); + if ($condval>=$mincond) { + my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere); + if ($now>$further) { $further=$now; } + } + } split(/\,/,$next); + } } return $further; @@ -150,6 +170,9 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + + my %metalink=(); + my %cellemb=(); my $allscript=''; @@ -169,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 @@ -187,8 +211,10 @@ sub handler { my $output=Apache::lonnet::ssi($src,%posthash); my $parser=HTML::TokeParser->new(\$output); my $token; + my $thisdir=$src; my $bodydef=0; my $thisxml=0; + my @rlinks=(); if ($output=~/\?xml/) { $isxml=1; $thisxml=1; @@ -196,9 +222,22 @@ sub handler { /((?:\<(?:\?xml|\!DOC|html)[^\>]*(?:\>|\>\]\>)\s*)+)\]*\>/si; $xmlheader=$1; } - while (($bodydef==0) && - ($token=$parser->get_token)) { - if ($token->[1] eq 'body') { + while ($token=$parser->get_token) { + if ($token->[0] eq 'S') { + if ($token->[1] eq 'a') { + if ($token->[2]->{'href'}) { + $rlinks[$#rlinks+1]= + $token->[2]->{'href'}; + } + } elsif ($token->[1] eq 'img') { + $rlinks[$#rlinks+1]= + $token->[2]->{'src'}; + } elsif ($token->[1] eq 'embed') { + $rlinks[$#rlinks+1]= + $token->[2]->{'src'}; + } elsif ($token->[1] eq 'base') { + $thisdir=$token->[2]->{'href'}; + } elsif ($token->[1] eq 'body') { $bodydef=1; $ssibgcolor{$_}=$token->[2]->{'bgcolor'}; $ssitext{$_}=$token->[2]->{'text'}; @@ -208,15 +247,19 @@ sub handler { if ($thisxml) { $xmlbody=$token->[4]; } - } - if ($token->[1] eq 'meta') { + } elsif ($token->[1] eq 'meta') { + if ($token->[4] !~ m:/>$:) { $allmeta.="\n".$token->[4].''; - } - if ($token->[1] eq 'script') { + } else { + $allmeta.="\n".$token->[4]; + } + } elsif (($token->[1] eq 'script') && + ($bodydef==0)) { $allscript.="\n\n" .$parser->get_text('/script'); } - } + } + } if ($output=~/\]*\>(.*)/si) { $output=$1; } @@ -225,9 +268,21 @@ 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 { + unless (($_=~/^http:\/\//i) || + ($_=~/^\//)) { + my $newlocation= + &Apache::lonnet::hreflocation($thisdir,$_); + $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/; + } + } @rlinks; +# -------------------------------------------------- Deal with Applet codebases + $output=~s/(\]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei; $ssibody{$_}=$output; - # ---------------------------------------------------------------- End SSI cell } } @colcont; @@ -252,15 +307,21 @@ sub handler { } # ------------------------------------------------------------------------ Head $r->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(1)); $r->print("\n\n"); # ------------------------------------------------------------------ Start body if ($isxml) { $r->print($xmlbody); } else { - $r->print(''); + $r->print( + ''); } # ------------------------------------------------------------------ Start form if ($nforms) { @@ -276,13 +337,39 @@ sub handler { my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; + my $metainfo=''. + ''. + ''; + if ( + ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && + (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) { + my ($mapid,$resid)=split(/\./,$rid); + my $symb= + &Apache::lonnet::declutter($hash{'map_id_'.$mapid}). + '___'.$resid.'___'. + &Apache::lonnet::declutter($hash{'src_'.$rid}); + $metainfo.= + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''; + } + $metainfo.='

'; $r->print('print(' bgcolor="'. $ssibgcolor{$rid}.'"'); } - $r->print('>print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); } @@ -298,9 +385,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(''); @@ -313,7 +403,7 @@ sub handler { ''); } - $r->print(''); + $r->print(''.&Apache::lonxml::xmlend()); # -------------------------------------------------------------------- End page } # ------------------------------------------------------------- End render page