X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki.pm;h=5563a03af7d028a88c184d8f2ac227284c475f52;hb=70c601990b345b03ddf2406c46017da232bef8b9;hp=35fee1aa742aab8fbffb405afa82a7f759df6b9e;hpb=e4cd168ebedd95585290c97ff42234344bfed46c;p=ikiwiki.git

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 35fee1aa7..5563a03af 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -661,9 +661,15 @@ sub pagetype ($) {
 	return;
 }
 
+my %pagename_cache;
+
 sub pagename ($) {
 	my $file=shift;
 
+	if (exists $pagename_cache{$file}) {
+		return $pagename_cache{$file};
+	}
+
 	my $type=pagetype($file);
 	my $page=$file;
  	$page=~s/\Q.$type\E*$//
@@ -672,6 +678,8 @@ sub pagename ($) {
 	if ($config{indexpages} && $page=~/(.*)\/index$/) {
 		$page=$1;
 	}
+
+	$pagename_cache{$file} = $page;
 	return $page;
 }
 
@@ -1730,15 +1738,6 @@ sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
 
-	if (ref $pagespec eq 'ARRAY') {
-		foreach my $ps (@$pagespec) {
-			if (pagespec_valid($ps)) {
-				$depends{$page}{$ps} = 1;
-			}
-		}
-		return;
-	}
-
 	return unless pagespec_valid($pagespec);
 
 	$depends{$page}{$pagespec} = 1;
@@ -1825,14 +1824,6 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
-sub pagespec_merge ($$) {
-	my $a=shift;
-	my $b=shift;
-
-	return $a if $a eq $b;
-	return "($a) or ($b)";
-}
-
 sub pagespec_translate ($) {
 	my $spec=shift;