--- rat/lonpage.pm	2000/10/31 19:31:42	1.15
+++ rat/lonpage.pm	2001/11/05 19:28:54	1.28
@@ -5,13 +5,15 @@
 #
 # 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,10/14,10/16,10/18,10/19,10/31 Gerd Kortemeyer
+# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16,
+# 08/13/01,08/30,10/1 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;
 
@@ -180,8 +182,6 @@ sub handler {
                   my $xmlheader='';
                   my $xmlbody='';
 
-                  my %httpref=();
-
 # --------------------------------------------- Get SSI output, post parameters
 
                   for ($i=0;$i<=$#rows;$i++) {
@@ -215,7 +215,6 @@ sub handler {
                               my $bodydef=0;
                               my $thisxml=0;
                               my @rlinks=();
-                              my @alinks=();
                               if ($output=~/\?xml/) {
                                  $isxml=1;
                                  $thisxml=1;
@@ -233,23 +232,9 @@ sub handler {
 				  } elsif ($token->[1] eq 'img') {
                                          $rlinks[$#rlinks+1]=
 					     $token->[2]->{'src'};
-                                         $alinks[$#alinks+1]=
-					     $token->[2]->{'src'};
 				  } elsif ($token->[1] eq 'embed') {
                                          $rlinks[$#rlinks+1]=
 					     $token->[2]->{'src'};
-                                         $alinks[$#alinks+1]=
-					     $token->[2]->{'src'};
-				  } elsif ($token->[1] eq 'applet') {
-                                         $alinks[$#alinks+1]=
-					     $token->[2]->{'code'};
-                                         $alinks[$#alinks+1]=
-					     $token->[2]->{'archive'};
-				  } elsif ($token->[1] eq 'param') {
-				      if ($token->[2]->{'name'} eq 'cabbase') {
-                                         $alinks[$#alinks+1]=
-					     $token->[2]->{'value'};
-                                      }   
 				  } elsif ($token->[1] eq 'base') {
 				      $thisdir=$token->[2]->{'href'};
 				  } elsif ($token->[1] eq 'body') {
@@ -263,7 +248,11 @@ sub handler {
 					  $xmlbody=$token->[4];
                                       }
                                   } elsif ($token->[1] eq 'meta') {
+				    if ($token->[4] !~ m:/>$:) {
 				      $allmeta.="\n".$token->[4].'</meta>';
+				    } else {
+				      $allmeta.="\n".$token->[4];
+				    }
                                   } elsif (($token->[1] eq 'script') &&
                                            ($bodydef==0)) {
 				      $allscript.="\n\n"
@@ -279,6 +268,8 @@ 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 {
@@ -289,12 +280,8 @@ sub handler {
                      $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/;
 				  }
 			      } @rlinks;
-                              map {
-                                  $httpref{'httpref.'.
-			       &Apache::lonnet::hreflocation($thisdir,$_)}=
-				   $r->uri;
-                              } @alinks;
-                     $output=~s/\<\s*applet/\<applet codebase=\"$thisdir\" /gi;
+# -------------------------------------------------- Deal with Applet codebases
+  $output=~s/(\<applet[^\>]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei;
 			      $ssibody{$_}=$output;
 # ---------------------------------------------------------------- End SSI cell
                           }
@@ -308,8 +295,6 @@ sub handler {
                   } else {
 # ------------------------------------------------------------------ Build page
 
-# ------------------------------------------------------------- Mark references
-                      &Apache::lonnet::appenv(%httpref);
 # ---------------------------------------------------------------- Send headers
                       if ($isxml) {
 			  $r->content_type('text/xml');
@@ -322,15 +307,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(1));
                       $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) {
@@ -349,7 +340,29 @@ sub handler {
                               my $metainfo='<a href="'.
                                     $metalink{$rid}.'" target="LONcatInfo">'.
                           '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
-			  '</img></a><br></br>';
+			  '</img></a>';
+                              if (
+ ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+ (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
+				  my ($mapid,$resid)=split(/\./,$rid);
+                                 my $symb=
+                &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
+                '___'.$resid.'___'.
+		&Apache::lonnet::declutter($hash{'src_'.$rid});
+                                 $metainfo.=
+                  '<a href="/adm/grades?symb='.$symb.
+                  '&command=submission" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/subm_button.gif" border=0>'.
+			  '</img></a>'.
+                  '<a href="/adm/grades?symb='.$symb.
+                  '&command=viewgrades" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'.
+			  '</img></a>'.
+                  '<a href="/adm/parmset?symb='.$symb.'" target="LONcatInfo">'.
+                          '<img src="/adm/lonMisc/pprm_button.gif" border=0>'.
+			      '</img></a>';
+                              }
+                              $metainfo.='<br></br>';
                               $r->print('<td colspan="'.$avespan.'"');
                               if ($cellemb{$rid} eq 'ssi') {
 				  if ($ssibgcolor{$rid}) {
@@ -390,7 +403,7 @@ sub handler {
 	                  '<input name="all_submit" value="Submit All" type="'.
 			  (($nforms>1)?'submit':'hidden').'"></input></form>');
                       }
-                      $r->print('</body></html>');
+                      $r->print('</body>'.&Apache::lonxml::xmlend());
 # -------------------------------------------------------------------- End page
                   }                  
 # ------------------------------------------------------------- End render page