From c19de362ce052930403d3477598e54f7937a2ec5 Mon Sep 17 00:00:00 2001
From: Alex Schroeder <alex@gnu.org>
Date: Thu, 4 Aug 2005 18:41:26 +0000
Subject: [PATCH] Don't put files in unclustered, and exclude RssExclude

---
 modules/clustermap.pl | 6 ++++--
 modules/markdown.pl   | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/clustermap.pl b/modules/clustermap.pl
index 5e6efb7b..a9fe037d 100755
--- a/modules/clustermap.pl
+++ b/modules/clustermap.pl
@@ -16,7 +16,7 @@
 #    59 Temple Place, Suite 330
 #    Boston, MA 02111-1307 USA
 
-$ModulesDescription .= '<p>$Id: clustermap.pl,v 1.5 2005/07/31 22:57:35 fletcherpenney Exp $</p>';
+$ModulesDescription .= '<p>$Id: clustermap.pl,v 1.6 2005/08/04 18:41:26 fletcherpenney Exp $</p>';
 
 use vars qw($ClusterMapPage $ClusterMapTOC $FilterUnclusteredRegExp @ClusterMapAdminPages);
 
@@ -31,7 +31,7 @@ $FilterUnclusteredRegExp = '\d\d\d\d-\d\d-\d\d|\d* *Comments on .*'
 # are not classified as unclustered.
 # They are also added to the Important Pages list on the administration page
 @ClusterMapAdminPages = ( $HomePage, $DeletedPage, $BannedContent,
-	$BannedHosts, $InterMap, $NearMap, $RCName)
+	$BannedHosts, $InterMap, $NearMap, $RCName, $RssExclude)
 	
 	unless defined @ClusterMapAdminPages;
 	
@@ -156,6 +156,8 @@ sub CreateClusterMap {
 		
 		next if ($cluster eq $DeletedPage);		# Don't map Deleted Pages
 		
+		next if (TextIsFile($Page{text}));		# Don't map files
+		
 		if ($cluster eq "") {					# Grab Unclustered Pages
 			$Unclustered{$page} = 1;
 			next;
diff --git a/modules/markdown.pl b/modules/markdown.pl
index 3c26412a..c7c8fd29 100644
--- a/modules/markdown.pl
+++ b/modules/markdown.pl
@@ -25,7 +25,7 @@
 #	MultiMarkdown <http://fletcher.freeshell.org/wiki/MultiMarkdown>
 
 
-$ModulesDescription .= '<p>$Id: markdown.pl,v 1.12 2005/08/03 23:50:22 fletcherpenney Exp $</p>';
+$ModulesDescription .= '<p>$Id: markdown.pl,v 1.13 2005/08/04 18:41:26 fletcherpenney Exp $</p>';
 
 @MyRules = (\&MarkdownRule);
 
@@ -59,7 +59,7 @@ sub MarkdownRule {
 	*Markdown::_DoAutoLinks = *NewDoAutoLinks;
 
     # Set the base url for local links
-    $Markdown::g_metadata{'Base Wiki Url'} = $FullUrl;
+    $Markdown::g_metadata{'Base Wiki Url'} = $ScriptName;
     
     # Do not allow raw HTML
     $source = SanitizeSource($source);
@@ -178,7 +178,7 @@ sub DoWikiWords {
 		$1 . CreateWikiLink($2)
 	}xsge;
 	
-	# Catch WikiWords at beginning of page
+	# Catch WikiWords at beginning of page (ie PageCluster)
 	$text =~ s{^($WikiWord)
 	}{
 		CreateWikiLink($1)