--- rat/lonpage.pm	2000/08/31 10:14:08	1.2
+++ rat/lonpage.pm	2000/09/14 09:26:37	1.3
@@ -4,7 +4,7 @@
 # (TeX Content Handler
 #
 # 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31 Gerd Kortemeyer
+# 08/30,08/31,09/06,09/14 Gerd Kortemeyer
 
 package Apache::lonpage;
 
@@ -28,23 +28,30 @@ sub tracetable {
        if (defined($hash{'is_map_'.$rid})) {
            if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
                (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
+               my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	       $sofar=
                 &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-                '&'.$hash{'map_finish_'.$hash{'src_'.$rid}}.'&');
+                '&'.$frid.'&');
                $sofar++;
-               if (defined($rows[$sofar])) {
-                   $rows[$sofar].='&'.$hash{'map_finish_'.$hash{'src_'.$rid}};
-               } else {
-                   $rows[$sofar]=$hash{'map_finish_'.$hash{'src_'.$rid}};
-               }
+               my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
+               if (($brepriv eq '2') || ($brepriv eq 'F')) {
+                 if (defined($rows[$sofar])) {
+                   $rows[$sofar].='&'.$frid;
+                 } else {
+                   $rows[$sofar]=$frid;
+                 }
+	       }
 	   }
        } else {
            $sofar++;
-           if (defined($rows[$sofar])) {
+           my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
+           if (($brepriv eq '2') || ($brepriv eq 'F')) {
+             if (defined($rows[$sofar])) {
                $rows[$sofar].='&'.$rid;
-           } else {
+             } else {
                $rows[$sofar]=$rid;
-           }
+             }
+	   }
        }
 
        if (defined($hash{'to_'.$rid})) {
@@ -63,16 +70,17 @@ sub tracetable {
 sub handler {
   my $r=shift;
 
-# ----------------------------------------------------------- Set document type
-
-  if ($ENV{'browser.mathml'}) {
-    $r->content_type('text/xml');
-  } else {
-    $r->content_type('text/html');
-  }
-  $r->send_http_header;
+# ------------------------------------------- Set document type for header only
 
-  return OK if $r->header_only;
+  if ($r->header_only) {
+       if ($ENV{'browser.mathml'}) {
+           $r->content_type('text/xml');
+       } else {
+           $r->content_type('text/html');
+       }
+       $r->send_http_header;
+       return OK;
+   }
 
   my $requrl=$r->uri;
 # ----------------------------------------------------------------- Tie db file
@@ -86,20 +94,52 @@ sub handler {
               if (($firstres) && ($lastres)) {
 # ----------------------------------------------------------------- Render page
 
-		  $r->print("<h2>All is cool.</h2>");
-
                   @rows=();
+
                   &tracetable(0,$firstres,'&'.$lastres.'&');
                   $rows[$#rows+1]=''.$lastres;
 
                   my $i;
+                  my $maxcols=-1;
+                  my %ssibody=();
+                  my %ssibgcolor=();
+                  my %ssitext=();
+                  my %ssilink=();
+                  my %ssivlink=();
+                  my %ssialink=();
+                  my %cellemb=();
+
+# --------------------------------------------- Get SSI output, post parameters
+
                   for ($i=0;$i<=$#rows;$i++) {
-                      $r->print($i.' - '.$rows[$i].'<br>');
+                      my @colcont=split(/\&/,$rows[$i]);
+                      $maxcols=$#colcont>$maxcols?$#colcont:$maxcols;
+                      map {
+                          my $src=$hash{'src_'.$_};
+                          $src=~/\.\w+$/;
+                          $cellemb{$_}=Apache::lonnet::fileembstyle($1);
+                          if ($cellemb{$_} eq 'ssi') {
+# --------------------------------------------------------- This is an SSI cell
+
+# ---------------------------------------------------------------- End SSI cell
+                          }
+                      } @colcont;
+                      
                   }
+                  if ($maxcols<0) {
+                      $r->content_type('text/html');
+                      $r->send_http_header;
+                      $r->print('<html><body>Empty page.</body></html>');
+                  } else {
+# ------------------------------------------------------------------ Build page
 
+# -------------------------------------------------------------------- End page
+                  }                  
 # ------------------------------------------------------------- End render page
               } else {
-		  $r->print("<h2>Page undefined.</h2>");
+                  $r->content_type('text/html');
+                  $r->send_http_header;
+		  $r->print('<html><body>Page undefined.</body></html>');
               }
 # ------------------------------------------------------------------ Untie hash
               unless (untie(%hash)) {