--- loncom/publisher/lonpublisher.pm	2001/08/13 16:12:59	1.38
+++ loncom/publisher/lonpublisher.pm	2001/08/18 21:34:39	1.43
@@ -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 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13,8/17,8/18 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -71,7 +71,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 +136,7 @@ sub selectbox {
 
 sub urlfixup {
     my ($url,$target)=@_;
+    unless ($url) { return ''; }
     my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
     map {
 	if ($_ eq $host) {
@@ -142,6 +144,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/\/[^\/]+$//;
@@ -306,7 +309,7 @@ sub publish {
 		 }
               } elsif ($token->[0] eq 'E') {
                   unless ($token->[1] eq 'allow') {
-                     $outstring.=$token->[2];
+                     $outstring.='</'.$token->[1].'>';
 		  }
               } else {
                   $outstring.=$token->[1];
@@ -399,7 +402,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);
     }
@@ -830,6 +837,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'};
@@ -861,7 +882,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');