X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0bfc364a7df124509855b8ed0b1b33ab5bc9ebbb..a97964688b73d0a3237c798dce3fb064ff29ff11:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 74d452c50..a5f83ac7a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -355,7 +355,7 @@ sub getsetup () {
 	},
 	wiki_file_prune_regexps => {
 		type => "internal",
-		default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
+		default => [qr/(^|\/)\.\.(\/|$)/, qr/^\//, qr/^\./, qr/\/\./,
 			qr/\.x?html?$/, qr/\.ikiwiki-new$/,
 			qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
 			qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
@@ -440,10 +440,9 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
-	getctime => {
+	gettime => {
 		type => "internal",
-		default => 0,
-		description => "running in getctime mode",
+		description => "running in gettime mode",
 		safe => 0,
 		rebuild => 0,
 	},
@@ -1512,6 +1511,7 @@ sub loadindex () {
 			open ($in, "<", "$config{wikistatedir}/indexdb") || return;
 		}
 		else {
+			$config{gettime}=1; # first build
 			return;
 		}
 	}
@@ -1790,6 +1790,10 @@ sub rcs_getctime ($) {
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 }
 
+sub rcs_getmtime ($) {
+	$hooks{rcs}{rcs_getmtime}{call}->(@_);
+}
+
 sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
@@ -2102,6 +2106,8 @@ sub pagespec_match_list ($$;@) {
 	my $sub=pagespec_translate($pagespec);
 	error "syntax error in pagespec \"$pagespec\""
 		if ! defined $sub;
+	my $sort=sortspec_translate($params{sort}, $params{reverse})
+		if defined $params{sort};
 
 	my @candidates;
 	if (exists $params{list}) {
@@ -2115,21 +2121,18 @@ sub pagespec_match_list ($$;@) {
 			: keys %pagesources;
 	}
 	
+	# clear params, remainder is passed to pagespec
+	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
 	my $num=$params{num};
-	my $sort=$params{sort};
-	my $reverse=$params{reverse};
+	delete @params{qw{num deptype reverse sort filter list}};
+	
 	# when only the top matches will be returned, it's efficient to
 	# sort before matching to pagespec,
 	if (defined $num && defined $sort) {
 		@candidates=IkiWiki::SortSpec::sort_pages(
-			$sort, $reverse, @candidates);
+			$sort, @candidates);
 	}
 	
-	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
-	
-	# clear params, remainder is passed to pagespec
-	delete @params{qw{num deptype reverse sort filter list}};
-	
 	my @matches;
 	my $firstfail;
 	my $count=0;
@@ -2155,7 +2158,7 @@ sub pagespec_match_list ($$;@) {
 	# sort after matching
 	if (! defined $num && defined $sort) {
 		return IkiWiki::SortSpec::sort_pages(
-			$sort, $reverse, @matches);
+			$sort, @matches);
 	}
 	else {
 		return @matches;
@@ -2452,7 +2455,7 @@ package IkiWiki::SortSpec;
 # This is in the SortSpec namespace so that the $a and $b that sort() uses
 # are easily available in this namespace, for cmp functions to use them.
 sub sort_pages {
-	my $f=IkiWiki::sortspec_translate(shift, shift);
+	my $f=shift;
 	sort $f @_
 }