[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm

[www]

www		Thu Oct 10 11:05:37 2002 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  With recent changes this had lots of double slashes - looks ugly and confusing
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.101 loncom/publisher/lonpublisher.pm:1.102
--- loncom/publisher/lonpublisher.pm:1.101	Tue Oct  8 09:24:36 2002
+++ loncom/publisher/lonpublisher.pm	Thu Oct 10 11:05:36 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.101 2002/10/08 13:24:36 www Exp $
+# $Id: lonpublisher.pm,v 1.102 2002/10/10 15:05:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1226,6 +1226,9 @@
 sub phasetwo {
 
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
+    $source=~s/\/+/\//g;
+    $target=~s/\/+/\//g;
+    $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -1469,6 +1472,8 @@
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
+    $srcfile=~s/\/+/\//g;
+    $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
     $thisdisfn=~s/\/home\/korte\/public_html\///;
     $srcfile=~s/\/+/\//g;
@@ -1506,6 +1511,8 @@
 
 sub publishdirectory {
     my ($r,$fn,$thisdisfn)=@_;
+    $fn=~s/\/+/\//g;
+    $thisdisfn=~s/\/+/\//g;
     my $resdir=
     $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
       $thisdisfn;