Merge branch 'master' into dependency-types

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b895e12fc0a924fac01a6ef1b10d58e02dbdb003..7b1d24c6a2214d14543aadcbbadde9767a15af52 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,7 +1536,7 @@ sub loadindex () {
                                };
                        }
                        elsif (exists $d->{depends_simple}) {
-                               $depends{$page}=$d->{depends_simple};
+                               $depends_simple{$page}=$d->{depends_simple};
                        }
                        if (exists $d->{dependslist}) {
                                # old format
@@ -1776,22 +1776,41 @@ sub add_depends ($$;@) {
        my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
                $pagespec !~ /[\s*?()!]/;
 
-       my $deptype=$DEPEND_CONTENT;
+       my $deptype=0;
        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)$/;
+               if ($params{presence}) {
+                       # Is the pagespec limited to terms that will continue
+                       # to match pages as long as those pages exist?
+                       my $presence_limited=1;
+                       while ($presence_limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
+                               $presence_limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
+                       }
+                       if ($presence_limited) {
+                               $deptype=$deptype | $DEPEND_PRESENCE;
+                       }
+                       else {
+                               $deptype=$deptype | $DEPEND_CONTENT;
+                       }
+               }
+               if ($params{links}) {
+                       # Is the pagespec limited to terms that will continue
+                       # to match pages as long as those pages exist and
+                       # link to the same places?
+                       my $links_limited=1;
+                       while ($links_limited && $pagespec=~m/(\w+)\([^\)]*\)/g) {
+                               $links_limited = $1 =~ /^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after|backlink)$/;
+                       }
+                       if ($links_limited) {
+                               $deptype=$deptype | $DEPEND_LINKS;
+                       }
+                       else {
+                               $deptype=$deptype | $DEPEND_CONTENT;
+                       }
                }
-
-               $deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_PRESENCE
-                       if $params{presence} && $limited;
-               $deptype=$deptype & ~$DEPEND_CONTENT | $DEPEND_LINKS
-                       if $params{links} && $limited;
        }
+       $deptype=$DEPEND_CONTENT unless $deptype;
 
        if ($simple) {
                $depends_simple{$page}{lc $pagespec} |= $deptype;