--- loncom/publisher/lonpublisher.pm	2001/08/11 19:06:54	1.36
+++ loncom/publisher/lonpublisher.pm	2001/10/16 18:46:10	1.49
@@ -11,7 +11,8 @@
 # 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer
 # 05/28/2001 Scott Harrison
-# 06/23,08/07,08/11 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26 Gerd Kortemeyer
+# 10/3,10/8 Scott Harrison
 
 package Apache::lonpublisher;
 
@@ -71,7 +72,8 @@ sub metaeval {
               } @{$token->[3]};
               if ($metadatafields{$unikey}) {
 		  my $newentry=$parser->get_text('/'.$entry);
-                  unless ($metadatafields{$unikey}=~/$newentry/) {
+                  unless (($metadatafields{$unikey}=~/$newentry/) ||
+                          ($newentry eq '')) {
                      $metadatafields{$unikey}.=', '.$newentry;
 		  }
 	      } else {
@@ -135,6 +137,7 @@ sub selectbox {
 
 sub urlfixup {
     my ($url,$target)=@_;
+    unless ($url) { return ''; }
     my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
     map {
 	if ($_ eq $host) {
@@ -142,6 +145,7 @@ sub urlfixup {
             $url=~s/^$host//;
         }
     } values %Apache::lonnet::hostname;
+    if ($url=~/^http\:\/\//) { return $url; }
     $url=~s/\~$cuname/res\/$cudom\/$cuname/;
     if ($target) {
 	$target=~s/\/[^\/]+$//;
@@ -151,7 +155,6 @@ sub urlfixup {
 }
 
 sub publish {
-
     my ($source,$target,$style)=@_;
     my $logfile;
     my $scrout='';
@@ -256,7 +259,38 @@ sub publish {
 			  }
                           $allow{$newurl}=1;
                       }
-                  } ('src','href','codebase');
+                  } ('src','href','background');
+
+                  if ($tag eq 'applet') {
+		      my $codebase='';
+                      if (defined($parms{'codebase'})) {
+		         my $oldcodebase=$parms{'codebase'};
+                         unless ($oldcodebase=~/\/$/) {
+                            $oldcodebase.='/';
+                         }
+                         $codebase=&urlfixup($oldcodebase,$target);
+                         $codebase=~s/\/$//;    
+                         if ($codebase ne $oldcodebase) {
+			     $parms{'codebase'}=$codebase;
+                             print $logfile 'URL codebase: '.$tag.':'.
+                                  $oldcodebase.' - '.
+				  $codebase."\n";
+			 }
+                         $allow{$codebase.'/*'}=1;
+		      } else {
+                        map {
+                          if (defined($parms{$_})) {
+			      my $oldurl=$parms{$_};
+                              my $newurl=&urlfixup($oldurl,$target);
+			      $newurl=~s/\/[^\/]+$/\/\*/;
+                                  print $logfile 'Allow: applet '.$_.':'.
+                                  $oldurl.' allows '.
+				  $newurl."\n";
+                              $allow{$newurl}=1;
+                          }
+                        } ('archive','code','object');
+                      }
+                  }
 
                   my $newparmstring='';
                   my $endtag='';
@@ -275,19 +309,31 @@ sub publish {
 		 }
               } elsif ($token->[0] eq 'E') {
                   unless ($token->[1] eq 'allow') {
-                     $outstring.=$token->[2];
+                     $outstring.='</'.$token->[1].'>';
 		  }
               } else {
                   $outstring.=$token->[1];
               }
           }
 # ------------------------------------------------------------ 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;
-        
+    }
+# ------------------------------------------------------------- Write modified
+
         {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
@@ -306,7 +352,7 @@ sub publish {
       } else {
 	  print $logfile "Does not need ID and/or index fixup\n";
       }
-
+    }
 # --------------------------------------------- Initial step done, now metadata
 
 # ---------------------------------------- Storage for metadata keys and fields
@@ -315,6 +361,8 @@ sub publish {
      %metadatakeys=();
      
      my %oldparmstores=();
+     
+     $scrout.='<h3>Metadata Information</h3>';
 
 # ------------------------------------------------ First, check out environment
      unless (-e $source.'.meta') {
@@ -364,11 +412,15 @@ 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);
-
+    }
 # ---------------- Find and document discrepancies in the parameters and stores
 
         my $chparms='';
@@ -401,7 +453,7 @@ sub publish {
 	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
                      $chparms;
         }
-    }
+
 # ------------------------------------------------------- Now have all metadata
 
         $scrout.=
@@ -428,12 +480,29 @@ sub publish {
             $textonly=~s/[^a-z\s]//g;
 
             my %keywords=();
-            map {
-		unless ($nokey{$_}) {
-                   $keywords{$_}=1;
-                } 
-            } ($textonly=~m/(\w+)/g);
+            my $j=0;
+            my $word;
+            for (my $i=0; $i<length($textonly); $i++) {
+		my $ch.=substr($textonly,$i,1);
+		if ($ch=~/\s/) {
+		    if (length($word)) {
+			unless ($nokey{$word}) {
+			    $keywords{$word}=1;
+			}
+		    }
+		    $word='';
+		}
+		else {
+		    $word.=$ch;
+		}
+#		map {
+#		    unless ($nokey{$_}) {
+#			$keywords{$_}=1;
+#		    } 
+#		} ($textonly=~m/(\w+)/g);
+	    }
 
+	    my $sizkeys=scalar(keys %keywords); # use this value at some point
             map {
 		$keywords{$_}=1;
             } split(/\W+/,$metadatafields{'keywords'});
@@ -448,12 +517,13 @@ sub publish {
 		    $keywordout.="</tr><tr>\n";
                     $colcount=0;
                 }
-                $colcount++;
+		else {
+		    $colcount++;
+		}
             } sort keys %keywords;
             $keywordout.='</tr></table>';
 
         }         
-        
 	$scrout.=$keywordout;
 
         $scrout.=&textfield('Additional Keywords','addkey','');
@@ -481,6 +551,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);
@@ -796,6 +873,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'};
@@ -827,7 +918,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');