--- rat/lonpage.pm	2000/10/10 20:34:09	1.11
+++ 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 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
@@ -205,8 +210,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;
@@ -214,9 +221,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'};
@@ -226,15 +246,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; 
                               }
@@ -243,9 +263,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;
@@ -270,15 +301,21 @@ sub handler {
 		      }
 # ------------------------------------------------------------------------ Head
                       $r->print("\n<head>\n".$allmeta);
+                      $allscript=~
+       s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
                       if ($allscript) {
-			  $r->print("\n<script>\n".$allscript."\n</script>\n");
+			  $r->print("\n<script language='JavaScript'>\n".
+                                   $allscript."\n</script>\n");
                       }
+                      $r->print(&Apache::lonxml::registerurl);
                       $r->print("\n</head>\n");
 # ------------------------------------------------------------------ Start body
                       if ($isxml) {
                           $r->print($xmlbody);
                       } else {
-			  $r->print('<body bgcolor="#FFFFFF">');
+			  $r->print(
+ '<body bgcolor="#FFFFFF" onLoad="'.&Apache::lonxml::loadevents.
+                     '" onUnload="'.&Apache::lonxml::unloadevents.'">');
                       }
 # ------------------------------------------------------------------ Start form
                       if ($nforms) {
@@ -294,13 +331,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}.'"');
                                   }
@@ -316,9 +357,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>');