X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3a95b4b13254dbdbd94074d6da9fbeba99d08349..e36f6b6a99c0472d3ca79762305d690c494d483c:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 57c7d8f58..1a5cf52dd 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -10,6 +10,7 @@ use open qw{:utf8 :std};
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
+memoize("pagespec_translate");
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks %forcerebuild};
@@ -271,7 +272,9 @@ sub pagetitle ($) { #{{{
 sub titlepage ($) { #{{{
 	my $title=shift;
 	$title=~y/ /_/;
-	$title=~s/([^-[:alnum:]_:+\/.])/"__".ord($1)."__"/eg;
+	# Note: [:alnum:] is not used here, on purpose; unicode
+	# not allowed in urls.
+	$title=~s/([^-A-Za-z0-9_:+\/.])/"__".ord($1)."__"/eg;
 	return $title;
 } #}}}
 
@@ -529,8 +532,9 @@ sub pagespec_merge ($$) { #{{{
 	return "($a) or ($b)";
 } #}}}
 
-sub pagespec_match ($$) { #{{{
-	my $page=shift;
+sub pagespec_translate ($) { #{{{
+	# This assumes that $page is in scope in the function
+	# that evalulates the translated pagespec code.
 	my $spec=shift;
 
 	# Support for old-style GlobLists.
@@ -551,7 +555,7 @@ sub pagespec_match ($$) { #{{{
 		elsif ($word eq "(" || $word eq ")" || $word eq "!") {
 			$code.=" ".$word;
 		}
-		elsif ($word =~ /^(link|backlink|creation_month|creation_year|creation_day)\((.+)\)$/) {
+		elsif ($word =~ /^(link|backlink|created_before|created_after|creation_month|creation_year|creation_day)\((.+)\)$/) {
 			$code.=" match_$1(\$page, ".safequote($2).")";
 		}
 		else {
@@ -559,7 +563,14 @@ sub pagespec_match ($$) { #{{{
 		}
 	}
 
-	return eval $code;
+	return $code;
+} #}}}
+
+sub pagespec_match ($$) { #{{{
+	my $page=shift;
+	my $spec=shift;
+
+	return eval pagespec_translate($spec);
 } #}}}
 
 sub match_glob ($$) { #{{{
@@ -589,17 +600,40 @@ sub match_backlink ($$) { #{{{
 	match_link(pop, pop);
 } #}}}
 
+sub match_created_before ($$) { #{{{
+	my $page=shift;
+	my $testpage=shift;
+
+	if (exists $pagectime{$testpage}) {
+		return $pagectime{$page} < $pagectime{$testpage};
+	}
+	else {
+		return 0;
+	}
+} #}}}
+
+sub match_created_after ($$) { #{{{
+	my $page=shift;
+	my $testpage=shift;
+
+	if (exists $pagectime{$testpage}) {
+		return $pagectime{$page} > $pagectime{$testpage};
+	}
+	else {
+		return 0;
+	}
+} #}}}
+
 sub match_creation_day ($$) { #{{{
-	return if (gmtime($pagectime{shift()}))[3] == shift;
+	return ((gmtime($pagectime{shift()}))[3] == shift);
 } #}}}
 
 sub match_creation_month ($$) { #{{{
-	return if (gmtime($pagectime{shift()}))[4] + 1 == shift;
+	return ((gmtime($pagectime{shift()}))[4] + 1 == shift);
 } #}}}
 
 sub match_creation_year ($$) { #{{{
-	return if (gmtime($pagectime{shift()}))[5] + 1900 == shift;
+	return ((gmtime($pagectime{shift()}))[5] + 1900 == shift);
 } #}}}
 
-
 1