--- rat/lonpage.pm	2000/09/15 20:03:48	1.5
+++ rat/lonpage.pm	2000/09/22 10:28:41	1.7
@@ -4,26 +4,32 @@
 # (TeX Content Handler
 #
 # 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15 Gerd Kortemeyer
+# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21 Gerd Kortemeyer
 
 package Apache::lonpage;
 
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
+use HTML::TokeParser;
 use GDBM_File;
 
 # -------------------------------------------------------------- Module Globals
 my %hash;
 my @rows;
-                  
-my %ssibody=();
-my %ssibgcolor=();
-my %ssitext=();
-my %ssilink=();
-my %ssivlink=();
-my %ssialink=();
-my %cellemb=();
+
+# ------------------------------------------------------------------ Euclid gcd
+
+sub euclid {
+    my ($e,$f)=@_;
+    my $a; my $b; my $r;
+    if ($e>$f) { $b=$e; $r=$f; } else { $r=$e; $b=$f; }
+    while ($r!=0) {
+	$a=$b; $b=$r;
+        $r=$a%$b;
+    }
+    return $b;
+}
 
 # ------------------------------------------------------------ Build page table
 
@@ -76,17 +82,6 @@ sub tracetable {
     return $further;
 }
 
-sub cell {
-    my ($r,$colspan,$rid)=@_;
-    $r->print('<td colspan="'.$colspan.'"');
-    if ($cellemb{$rid} eq 'ssi') {
-       $r->print('>'.$ssibody{$rid});
-    } elsif ($cellemb{$rid} eq 'img') {
-       $r->print('><img src="'.$hash{'src_'.$rid}.'">');
-    }
-    $r->print('</td>');
-}
-
 # ================================================================ Main Handler
 
 sub handler {
@@ -109,7 +104,7 @@ sub handler {
   if ($ENV{'request.course.fn'}) {
       my $fn=$ENV{'request.course.fn'};
       if (-e "$fn.db") {
-          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) {
+          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) {
 # ------------------------------------------------------------------- Hash tied
               my $firstres=$hash{'map_start_'.$requrl};
               my $lastres=$hash{'map_finish_'.$requrl};
@@ -129,14 +124,32 @@ sub handler {
 
                   my $i;
                   my $j;
-                  my $maxcols=-1;
+                  my $lcm=1;
+                  my $contents=0;
+                  my $nforms=0;
+                  
+                  my %ssibody=();
+                  my %ssibgcolor=();
+                  my %ssitext=();
+                  my %ssilink=();
+                  my %ssivlink=();
+                  my %ssialink=();
+                  my %cellemb=();
+
+                  my $allscript='';
+                  my $allmeta='';
+
+                  my $isxml=0;
+                  my $xmlheader='';
+                  my $xmlbody='';
 
 # --------------------------------------------- Get SSI output, post parameters
 
                   for ($i=0;$i<=$#rows;$i++) {
 		     if ($rows[$i]) {
+		      $contents++;
                       my @colcont=split(/\&/,$rows[$i]);
-                      $maxcols=$#colcont>$maxcols?$#colcont:$maxcols;
+                      $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       map {
                           my $src=$hash{'src_'.$_};
                           $src=~/\.(\w+)$/;
@@ -145,15 +158,58 @@ sub handler {
 # --------------------------------------------------------- This is an SSI cell
 			      my $prefix=$_.'_';
                               my %posthash=('request.prefix' => $prefix);
-                              map {
+                              if (($ENV{'$form.'.$prefix.'submit'}) 
+                               || ($ENV{'form.all_submit'})) {
+                               map {
 				  if ($_=~/^form.$prefix/) {
 				      my $name=$_;
                                       $name=~s/^form.$prefix//;
                                       $posthash{$name}=$ENV{$_};
                                   }
-                              } keys %ENV;
+                               } keys %ENV;
+			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
-
+                              my $parser=HTML::TokeParser->new(\$output);
+                              my $token;
+                              my $bodydef=0;
+                              my $thisxml=0;
+                              if ($output=~/\?xml/) {
+                                 $isxml=1;
+                                 $thisxml=1;
+                                 $output=~
+         /((?:\<(?:\?xml|\!DOC|html)[^\>]*(?:\>|\>\]\>)\s*)+)\<body[^\>]*\>/si;
+                                 $xmlheader=$1;
+			      }
+                              while (($bodydef==0) &&
+                                     ($token=$parser->get_token)) {
+				  if ($token->[1] eq 'body') {
+				      $bodydef=1;
+                                      $ssibgcolor{$_}=$token->[2]->{'bgcolor'};
+                                      $ssitext{$_}=$token->[2]->{'text'};
+                                      $ssilink{$_}=$token->[2]->{'link'};
+                                      $ssivlink{$_}=$token->[2]->{'vlink'};
+                                      $ssialink{$_}=$token->[2]->{'alink'};
+                                      if ($thisxml) {
+					  $xmlbody=$token->[4];
+                                      }
+                                  }
+                                  if ($token->[1] eq 'meta') {
+				      $allmeta.="\n".$token->[4].'</meta>';
+                                  }
+                                  if ($token->[1] eq 'script') {
+				      $allscript.="\n\n"
+                                                .$parser->get_text('/script');
+                                  }
+                              }
+                              if ($output=~/\<body[^\>]*\>(.*)/si) {
+                                 $output=$1; 
+                              }
+                              $output=~s/\<\/body\>.*//si;
+                              if ($output=~/\<form/si) {
+				  $nforms++;
+                                  $output=~s/\<form[^\>]*\>//gsi;
+                                  $output=~s/\<\/form[^\>]*\>//gsi;
+                              }
 			      $ssibody{$_}=$output;
 
 # ---------------------------------------------------------------- End SSI cell
@@ -161,34 +217,87 @@ sub handler {
                       } @colcont;
                      } 
                   }
-                  if ($maxcols<0) {
+                  unless ($contents) {
                       $r->content_type('text/html');
                       $r->send_http_header;
                       $r->print('<html><body>Empty page.</body></html>');
                   } else {
 # ------------------------------------------------------------------ Build page
-                      $maxcols++;
-                      $r->content_type('text/html');
-                      $r->send_http_header;
-                      $r->print('<html><body>');
- 
-                      $r->print('<table cols="'.$maxcols.'" rows="'.
-                                 $#rows.'" border="0">');
+
+# ---------------------------------------------------------------- Send headers
+                      if ($isxml) {
+			  $r->content_type('text/xml');
+                          $r->send_http_header;
+                          $r->print($xmlheader);
+		      } else {
+                          $r->content_type('text/html');
+                          $r->send_http_header;
+                          $r->print('<html>');
+		      }
+# ------------------------------------------------------------------------ Head
+                      $r->print("\n<head>\n".$allmeta);
+                      if ($allscript) {
+			  $r->print("\n<script>\n".$allscript."\n</script>\n");
+                      }
+                      $r->print("\n</head>\n");
+# ------------------------------------------------------------------ Start body
+                      if ($isxml) {
+                          $r->print($xmlbody);
+                      } else {
+			  $r->print('<body bgcolor="#FFFFFF">');
+                      }
+
+# ------------------------------------------------------------------ Start form
+                      if ($nforms) {
+			  $r->print('<form method="post" action="'.
+				    $requrl.'">');
+                      }
+# ----------------------------------------------------------------- Start table
+                      $r->print('<table cols="'.$lcm.'" border="0">');
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
                           $r->print("\n<tr>");
                           my @colcont=split(/\&/,$rows[$i]);
-                          my $avespan=int($maxcols/($#colcont+1));
-                          my $lastspan=$maxcols-$avespan*$#colcont;
-                          for ($j=0;$j<$#colcont;$j++) {
-                              &cell($r,$avespan,$colcont[$j]);
+                          my $avespan=$lcm/($#colcont+1);
+                          for ($j=0;$j<=$#colcont;$j++) {
+                              my $rid=$colcont[$j];
+                              $r->print('<td colspan="'.$avespan.'"');
+                              if ($cellemb{$rid} eq 'ssi') {
+				  if ($ssibgcolor{$rid}) {
+                                     $r->print(' bgcolor="'.
+                                               $ssibgcolor{$rid}.'"');
+                                  }
+                                  $r->print('><font');
+                                  if ($ssitext{$rid}) {
+				     $r->print(' text="'.$ssitext{$rid}.'"');
+                                  }
+                                  if ($ssilink{$rid}) {
+				     $r->print(' link="'.$ssilink{$rid}.'"');
+                                  }
+                                  if ($ssitext{$rid}) {
+				     $r->print(' vlink="'.$ssivlink{$rid}.'"');
+                                  }
+                                  if ($ssialink{$rid}) {
+				     $r->print(' alink="'.$ssialink{$rid}.'"');
+                                  }
+                            
+                                  $r->print('>'.$ssibody{$rid}.'</font>');
+                              } elsif ($cellemb{$rid} eq 'img') {
+                                  $r->print('><img src="'.
+                                    $hash{'src_'.$rid}.'"></img>');
+			      }
+                              $r->print('</td>');
                           }
-                          &cell($r,$lastspan,$colcont[$#colcont]);
                           $r->print('</tr>');
 		        }
                       }
                       $r->print("\n</table>");
-
+# ---------------------------------------------------------------- Submit, etc.
+                      if ($nforms) {
+                          $r->print(
+	                  '<input name="all_submit" value="Submit All" type="'.
+			  (($nforms>1)?'submit':'hidden').'"></input></form>');
+                      }
                       $r->print('</body></html>');
 # -------------------------------------------------------------------- End page
                   }