--- rat/lonpage.pm 2000/09/22 10:28:41 1.7 +++ rat/lonpage.pm 2001/08/13 17:36:32 1.24 @@ -4,13 +4,16 @@ # (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 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,11/6,11/14,11/16, +# 08/13/01 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; @@ -73,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; @@ -122,7 +143,22 @@ sub handler { } } +# ------------------------------------------------------------ Add to symb list + my $i; + my %symbhash=(); + for ($i=0;$i<=$#rows;$i++) { + if ($rows[$i]) { + my @colcont=split(/\&/,$rows[$i]); + map { + $symbhash{$hash{'src_'.$_}}=''; + } @colcont; + } + } + &Apache::lonnet::symblist($requrl,%symbhash); + +# ------------------------------------------------------------------ Page parms + my $j; my $lcm=1; my $contents=0; @@ -134,6 +170,9 @@ sub handler { my %ssilink=(); my %ssivlink=(); my %ssialink=(); + + my %metalink=(); + my %cellemb=(); my $allscript=''; @@ -153,12 +192,13 @@ 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 my $prefix=$_.'_'; my %posthash=('request.prefix' => $prefix); - if (($ENV{'$form.'.$prefix.'submit'}) + if (($ENV{'form.'.$prefix.'submit'}) || ($ENV{'form.all_submit'})) { map { if ($_=~/^form.$prefix/) { @@ -171,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; @@ -180,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'}; @@ -192,15 +247,15 @@ sub handler { if ($thisxml) { $xmlbody=$token->[4]; } - } - if ($token->[1] eq 'meta') { + } elsif ($token->[1] eq 'meta') { $allmeta.="\n".$token->[4].''; - } - if ($token->[1] eq 'script') { + } elsif (($token->[1] eq 'script') && + ($bodydef==0)) { $allscript.="\n\n" .$parser->get_text('/script'); } - } + } + } if ($output=~/\]*\>(.*)/si) { $output=$1; } @@ -209,9 +264,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; @@ -236,17 +303,22 @@ 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); $r->print("\n\n"); # ------------------------------------------------------------------ Start body if ($isxml) { $r->print($xmlbody); } else { - $r->print(''); + $r->print( + ''); } - # ------------------------------------------------------------------ Start form if ($nforms) { $r->print('
'. + ''. + '

'; $r->print('print(' bgcolor="'. $ssibgcolor{$rid}.'"'); } - $r->print('>print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); } @@ -283,9 +359,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(''); @@ -318,7 +397,7 @@ sub handler { } } } - $ENV{'user.error.msg'}="$requrl:bre:1:1:Course not initialized"; + $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; return HTTP_NOT_ACCEPTABLE; }