--- loncom/publisher/lonpublisher.pm	2001/08/11 18:06:25	1.34
+++ loncom/publisher/lonpublisher.pm	2001/08/13 12:53:06	1.37
@@ -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 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -133,11 +133,21 @@ sub selectbox {
 
 # -------------------------------------------------------- Publication Step One
 
-sub makeallowed {
-}
-
 sub urlfixup {
-    return shift;
+    my ($url,$target)=@_;
+    my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
+    map {
+	if ($_ eq $host) {
+	    $url=~s/^http\:\/\///;
+            $url=~s/^$host//;
+        }
+    } values %Apache::lonnet::hostname;
+    $url=~s/\~$cuname/res\/$cudom\/$cuname/;
+    if ($target) {
+	$target=~s/\/[^\/]+$//;
+       $url=&Apache::lonnet::hreflocation($target,$url);
+    }
+    return $url;
 }
 
 sub publish {
@@ -147,6 +157,8 @@ sub publish {
     my $scrout='';
     my $allmeta='';
     my $content='';
+    my %allow=();
+    undef %allow;
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -236,13 +248,13 @@ sub publish {
                   map {
                       if (defined($parms{$_})) {
 			  my $oldurl=$parms{$_};
-                          my $newurl=&urlfixup($oldurl);
+                          my $newurl=&urlfixup($oldurl,$target);
                           if ($newurl ne $oldurl) {
 			      $parms{$_}=$newurl;
                               print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
 				  $newurl."\n";
 			  }
-                          &makeallowed($newurl);
+                          $allow{$newurl}=1;
                       }
                   } ('src','href','codebase');
 
@@ -258,7 +270,9 @@ sub publish {
                   } keys %parms;
   
 		  $outstring.='<'.$tag.$newparmstring.$endtag.'>';
-	        }
+	         } else {
+		   $allow{$token->[2]->{'src'}}=1;
+		 }
               } elsif ($token->[0] eq 'E') {
                   unless ($token->[1] eq 'allow') {
                      $outstring.=$token->[2];
@@ -267,6 +281,16 @@ sub publish {
                   $outstring.=$token->[1];
               }
           }
+# ------------------------------------------------------------ Construct Allows
+     unless ($style eq 'rat') {
+	my $allowstr="\n";
+        map {
+           $allowstr.='<allow src="'.$_.'" />'."\n";
+        } keys %allow;
+        $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
+    }
+# ------------------------------------------------------------- Write modified
+
         {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
@@ -285,7 +309,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
@@ -343,11 +367,11 @@ sub publish {
     }
 
 # -------------------------------------------------- Parse content for metadata
-
+    if ($style eq 'ssi') {
         $allmeta=Apache::lonxml::xmlparse('meta',$content);
 
         &metaeval($allmeta);
-
+    }
 # ---------------- Find and document discrepancies in the parameters and stores
 
         my $chparms='';
@@ -380,7 +404,7 @@ sub publish {
 	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
                      $chparms;
         }
-    }
+
 # ------------------------------------------------------- Now have all metadata
 
         $scrout.=