--- rat/lonpage.pm	2000/09/16 17:42:01	1.6
+++ rat/lonpage.pm	2000/11/16 11:58:30	1.20
@@ -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 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 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;
@@ -104,7 +123,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};
@@ -122,10 +141,26 @@ 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;
+                  my $nforms=0;
                   
                   my %ssibody=();
                   my %ssibgcolor=();
@@ -133,8 +168,18 @@ sub handler {
                   my %ssilink=();
                   my %ssivlink=();
                   my %ssialink=();
+     
+                  my %metalink=();
+
                   my %cellemb=();
 
+                  my $allscript='';
+                  my $allmeta='';
+
+                  my $isxml=0;
+                  my $xmlheader='';
+                  my $xmlbody='';
+
 # --------------------------------------------- Get SSI output, post parameters
 
                   for ($i=0;$i<=$#rows;$i++) {
@@ -145,40 +190,92 @@ 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);
-                              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 $thisdir=$src;
                               my $bodydef=0;
-                              while (($bodydef==0) &&
-                                     ($token=$parser->get_token)) {
-				  if ($token->[1] eq 'body') {
-                                     $bodydef=1
-                                  }
-                                  if ($token->[1] eq 'meta') {
-                                  }
-                                  if ($token->[1] eq 'script') {
-                                  }
-                                  if ($token->[1] eq 'basefont') {
+                              my $thisxml=0;
+                              my @rlinks=();
+                              if ($output=~/\?xml/) {
+                                 $isxml=1;
+                                 $thisxml=1;
+                                 $output=~
+         /((?:\<(?:\?xml|\!DOC|html)[^\>]*(?:\>|\>\]\>)\s*)+)\<body[^\>]*\>/si;
+                                 $xmlheader=$1;
+			      }
+                              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'};
+                                      $ssilink{$_}=$token->[2]->{'link'};
+                                      $ssivlink{$_}=$token->[2]->{'vlink'};
+                                      $ssialink{$_}=$token->[2]->{'alink'};
+                                      if ($thisxml) {
+					  $xmlbody=$token->[4];
+                                      }
+                                  } elsif ($token->[1] eq 'meta') {
+				      $allmeta.="\n".$token->[4].'</meta>';
+                                  } elsif (($token->[1] eq 'script') &&
+                                           ($bodydef==0)) {
+				      $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;
+                                  $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;
@@ -190,11 +287,36 @@ sub handler {
                       $r->print('<html><body>Empty page.</body></html>');
                   } else {
 # ------------------------------------------------------------------ Build page
-                      $r->content_type('text/html');
-                      $r->send_http_header;
-                      $r->print('<html><body>');
- 
-                      $r->print('<table cols="'.$lcm.'" border="1">');
+
+# ---------------------------------------------------------------- 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>");
@@ -202,20 +324,50 @@ 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') {
-                                 $r->print('>'.$ssibody{$rid});
+				  if ($ssibgcolor{$rid}) {
+                                     $r->print(' bgcolor="'.
+                                               $ssibgcolor{$rid}.'"');
+                                  }
+                                  $r->print('>'.$metainfo.'<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}.'">');
-			      }
+                                  $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>');
 		        }
                       }
                       $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
                   }                  
@@ -236,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; 
 }