--- publish.orig	Fri Jan 17 11:33:47 2003
+++ publish	Fri Jan 17 11:35:09 2003
@@ -261,7 +261,7 @@
 		return 0;
 	}
 
-	if ($noWebDir) {
+	if (!$noWebDir) {
 		print "mkdir $publishDir/web\n" if ($debug);
 		mkdir "$publishDir/$web", 0777;
 
@@ -378,7 +378,7 @@
 
 	print "  Copy files $blah\n" if ($debug);
 
-	$tmpl =~ s((?<==\")$webPubUrlPath\/([^\"]+)(?=\"))(&copyResource($web, $1, $copied))geo;
+	$tmpl =~ s((?<==\")(?:http://localhost)?$webPubUrlPath\/([^\"]+)(?=\"))(&copyResource($web, $1, $copied))geo;
 
 	# Modify internal links.
 
@@ -393,6 +393,12 @@
 
 	$tmpl =~ s(<nopublish>.*?<\/nopublish>)()gos;
 
+	# Remove base tag  - DZA
+	$tmpl =~ s/<base[^>]+\/>//;
+	# Fix some links - DZA
+	$tmpl =~ s!<a href=\"(?:http://localhost)?/bin/view/$web/!<a href=\"!go;
+	$tmpl =~ s!<a href=\"(?:http://localhost)?/bin/view/([/A-Za-z0-9_]+)((\#[^\"]+)?)\"!<a href=\"../$1.html$2\"!go;
+	
 	# Insert .html in internal links.
 
 	print "  Insert .html in internal links $blah\n" if ($debug);