--- loncom/publisher/lonpublisher.pm	2001/08/17 21:25:36	1.41
+++ loncom/publisher/lonpublisher.pm	2001/10/16 19:33:26	1.51
@@ -11,7 +11,7 @@
 # 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer
 # 05/28/2001 Scott Harrison
-# 06/23,08/07,08/11,8/13,8/17 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -259,7 +259,7 @@ sub publish {
 			  }
                           $allow{$newurl}=1;
                       }
-                  } ('src','href');
+                  } ('src','href','background');
 
                   if ($tag eq 'applet') {
 		      my $codebase='';
@@ -317,9 +317,18 @@ sub publish {
           }
 # ------------------------------------------------------------ Construct Allows
      unless ($style eq 'rat') {
+	$scrout.='<h3>Dependencies</h3>';
 	my $allowstr="\n";
         map {
            $allowstr.='<allow src="'.$_.'" />'."\n";
+           $scrout.='<br>';
+           unless ($_=~/\*/) {
+	       $scrout.='<a href="'.$_.'">';
+           }
+           $scrout.='<tt>'.$_.'</tt>';
+           unless ($_=~/\*/) {
+	       $scrout.='</a>';
+           }
         } keys %allow;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
     }
@@ -352,6 +361,8 @@ sub publish {
      %metadatakeys=();
      
      my %oldparmstores=();
+     
+     $scrout.='<h3>Metadata Information</h3>';
 
 # ------------------------------------------------ First, check out environment
      unless (-e $source.'.meta') {
@@ -402,7 +413,11 @@ sub publish {
 
 # -------------------------------------------------- Parse content for metadata
     if ($style eq 'ssi') {
+        my $oldenv=$ENV{'request.uri'};
+
+        $ENV{'request.uri'}=$target;
         $allmeta=Apache::lonxml::xmlparse('meta',$content);
+        $ENV{'request.uri'}=$oldenv;
 
         &metaeval($allmeta);
     }
@@ -455,7 +470,7 @@ sub publish {
 	my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';
         my $colcount=0;
         
-	{
+	if (length($content<500000) {
 	    my $textonly=$content;
             $textonly=~s/\<script[^\<]+\<\/script\>//g;
             $textonly=~s/\<m\>[^\<]+\<\/m\>//g;
@@ -487,11 +502,14 @@ sub publish {
                 }
                 $colcount++;
             } sort keys %keywords;
-            $keywordout.='</tr></table>';
 
+        } else {
+	    $keywordout.='<td>File too long for keyword analysis</td>';
         }         
         
-	$scrout.=$keywordout;
+	$keywordout.='</tr></table>';
+
+        $scrout.=$keywordout;
 
         $scrout.=&textfield('Additional Keywords','addkey','');
 
@@ -518,6 +536,13 @@ sub publish {
 			   
 	$scrout.=&textfield('Publisher/Owner','owner',
                             $metadatafields{'owner'});
+# --------------------------------------------------- Correct copyright for rat        
+    if ($style eq 'rat') {
+       if ($metadatafields{'copyright'} eq 'public') { 
+          delete $metadatafields{'copyright'};
+       }
+       delete $cprtag{'public'};
+   }
 
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},%cprtag);
@@ -833,6 +858,20 @@ sub handler {
      return OK;
   }
 
+# Get query string for limited number of parameters
+
+    map {
+       my ($name, $value) = split(/=/,$_);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+       if ($name eq 'filename') {
+           unless ($ENV{'form.'.$name}) {
+              $ENV{'form.'.$name}=$value;
+	   }
+       }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+
+
 # -------------------------------------------------------------- Check filename
 
   my $fn=$ENV{'form.filename'};
@@ -864,7 +903,8 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+  $fn=~s/^http\:\/\/[^\/]+//;
+  $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
 
   my $targetdir='';
   $docroot=$r->dir_config('lonDocRoot');