X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ffa73790b5c381df6e0385995b720dd24188969b..fd7b5767d3d377185838895d04f51288f0889a59:/IkiWiki.pm?ds=inline

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2637f6017..b895e12fc 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -28,6 +28,11 @@ our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 
+# Page dependency types.
+our $DEPEND_CONTENT=1;
+our $DEPEND_PRESENCE=2;
+our $DEPEND_LINKS=4;
+
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
@@ -1524,18 +1529,28 @@ sub loadindex () {
 				$links{$page}=$d->{links};
 				$oldlinks{$page}=[@{$d->{links}}];
 			}
-			if (exists $d->{depends_simple}) {
+			if (ref $d->{depends_simple} eq 'ARRAY') {
+				# old format
 				$depends_simple{$page}={
 					map { $_ => 1 } @{$d->{depends_simple}}
 				};
 			}
+			elsif (exists $d->{depends_simple}) {
+				$depends{$page}=$d->{depends_simple};
+			}
 			if (exists $d->{dependslist}) {
+				# old format
 				$depends{$page}={
-					map { $_ => 1 } @{$d->{dependslist}}
+					map { $_ => $DEPEND_CONTENT }
+						@{$d->{dependslist}}
 				};
 			}
+			elsif (exists $d->{depends} && ! ref $d->{depends}) {
+				# old format
+				$depends{$page}={$d->{depends} => $DEPEND_CONTENT };
+			}
 			elsif (exists $d->{depends}) {
-				$depends{$page}={$d->{depends} => 1};
+				$depends{$page}=$d->{depends};
 			}
 			if (exists $d->{state}) {
 				$pagestate{$page}=$d->{state};
@@ -1581,11 +1596,11 @@ sub saveindex () {
 		};
 
 		if (exists $depends{$page}) {
-			$index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
+			$index{page}{$src}{depends} = $depends{$page};
 		}
 
 		if (exists $depends_simple{$page}) {
-			$index{page}{$src}{depends_simple} = [ keys %{$depends_simple{$page}} ];
+			$index{page}{$src}{depends_simple} = $depends_simple{$page};
 		}
 
 		if (exists $pagestate{$page}) {
@@ -1753,20 +1768,39 @@ sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
 
-sub add_depends ($$) {
+sub add_depends ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
 
-	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
-		$pagespec !~ /[\s*?()!]/) {
-		# a simple dependency, which can be matched by string eq
-		$depends_simple{$page}{lc $pagespec} = 1;
+	# Is the pagespec a simple page name?
+	my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
+		$pagespec !~ /[\s*?()!]/;
+
+	my $deptype=$DEPEND_CONTENT;
+	if (@_) {
+		my %params=@_;
+		
+		# Is the pagespec limited to terms that will continue
+		# to match pages as long as those pages exist?
+		my $limited=1;
+		while ($limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
+			$limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
+		}
+
+		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_PRESENCE
+			if $params{presence} && $limited;
+		$deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_LINKS
+			if $params{links} && $limited;
+	}
+
+	if ($simple) {
+		$depends_simple{$page}{lc $pagespec} |= $deptype;
 		return 1;
 	}
 
 	return unless pagespec_valid($pagespec);
 
-	$depends{$page}{$pagespec} = 1;
+	$depends{$page}{$pagespec} |= $deptype;
 	return 1;
 }
 
@@ -1870,7 +1904,7 @@ sub pagespec_translate ($) {
 			[^\s()]+	# any other text
 		)
 		\s*		# ignore whitespace
-	}igx) {
+	}gx) {
 		my $word=$1;
 		if (lc $word eq 'and') {
 			$code.=' &&';