--- rat/lonpage.pm	2000/09/23 20:12:46	1.8
+++ rat/lonpage.pm	2000/11/13 18:15:54	1.17
@@ -4,7 +4,8 @@
 # (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 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 Gerd Kortemeyer
 
 package Apache::lonpage;
 
@@ -73,10 +74,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 +141,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 +168,9 @@ sub handler {
                   my %ssilink=();
                   my %ssivlink=();
                   my %ssialink=();
+     
+                  my %metalink=();
+
                   my %cellemb=();
 
                   my $allscript='';
@@ -153,6 +190,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
@@ -171,8 +209,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 +220,22 @@ sub handler {
          /((?:\<(?:\?xml|\!DOC|html)[^\>]*(?:\>|\>\]\>)\s*)+)\<body[^\>]*\>/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 +245,15 @@ sub handler {
                                       if ($thisxml) {
 					  $xmlbody=$token->[4];
                                       }
-                                  }
-                                  if ($token->[1] eq 'meta') {
+                                  } elsif ($token->[1] eq 'meta') {
 				      $allmeta.="\n".$token->[4].'</meta>';
-                                  }
-                                  if ($token->[1] eq 'script') {
+                                  } elsif (($token->[1] eq 'script') &&
+                                           ($bodydef==0)) {
 				      $allscript.="\n\n"
                                                 .$parser->get_text('/script');
                                   }
-                              }
+			        }
+			      }
                               if ($output=~/\<body[^\>]*\>(.*)/si) {
                                  $output=$1; 
                               }
@@ -209,9 +262,20 @@ sub handler {
 				  $nforms++;
                                   $output=~s/\<form[^\>]*\>//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;
+                     $output=~s/\<\s*applet/\<applet codebase=\"$thisdir\" /gi;
 			      $ssibody{$_}=$output;
-
 # ---------------------------------------------------------------- End SSI cell
                           }
                       } @colcont;
@@ -246,7 +310,6 @@ sub handler {
                       } else {
 			  $r->print('<body bgcolor="#FFFFFF">');
                       }
-
 # ------------------------------------------------------------------ Start form
                       if ($nforms) {
 			  $r->print('<form method="post" action="'.
@@ -261,13 +324,17 @@ sub handler {
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
+                              my $metainfo='<a href="'.
+                                    $metalink{$rid}.'" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
+			  '</img></a><br></br>';
                               $r->print('<td colspan="'.$avespan.'"');
                               if ($cellemb{$rid} eq 'ssi') {
 				  if ($ssibgcolor{$rid}) {
                                      $r->print(' bgcolor="'.
                                                $ssibgcolor{$rid}.'"');
                                   }
-                                  $r->print('><font');
+                                  $r->print('>'.$metainfo.'<font');
                                   if ($ssitext{$rid}) {
 				     $r->print(' text="'.$ssitext{$rid}.'"');
                                   }
@@ -283,9 +350,12 @@ sub handler {
                             
                                   $r->print('>'.$ssibody{$rid}.'</font>');
                               } elsif ($cellemb{$rid} eq 'img') {
-                                  $r->print('><img src="'.
+                                  $r->print('>'.$metainfo.'<img src="'.
                                     $hash{'src_'.$rid}.'"></img>');
-			      }
+			      } elsif ($cellemb{$rid} eq 'emb') {
+                                  $r->print('>'.$metainfo.'<embed src="'.
+                                    $hash{'src_'.$rid}.'"></embed>');
+                              }
                               $r->print('</td>');
                           }
                           $r->print('</tr>');
@@ -318,7 +388,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; 
 }
 
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>