add will's git repo

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8a86957684e1b7600b47ed5aee07b79d506e3995..b8e89b73fb00db7df6d019d07895376b0932cd8f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,8 +13,8 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles
-           %pagesources %destsources %depends %hooks %forcerebuild
-           %loaded_plugins};
+           %pagesources %destsources %depends %depends_simple %hooks
+           %forcerebuild %loaded_plugins};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
@@ -1475,7 +1475,8 @@ sub loadindex () {
        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
-               %destsources=%renderedfiles=%pagecase=%pagestate=();
+               %destsources=%renderedfiles=%pagecase=%pagestate=
+               %depends_simple=();
        }
        my $in;
        if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
@@ -1515,6 +1516,11 @@ sub loadindex () {
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }
+                       if (exists $d->{depends_simple}) {
+                               $depends_simple{$page}={
+                                       map { $_ => 1 } @{$d->{depends_simple}}
+                               };
+                       }
                        if (exists $d->{dependslist}) {
                                $depends{$page}={
                                        map { $_ => 1 } @{$d->{dependslist}}
@@ -1570,6 +1576,10 @@ sub saveindex () {
                        $index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
                }
 
+               if (exists $depends_simple{$page}) {
+                       $index{page}{$src}{depends_simple} = [ keys %{$depends_simple{$page}} ];
+               }
+
                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {
@@ -1738,13 +1748,11 @@ 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;
+       if ($pagespec =~ /$config{wiki_file_regexp}/ &&
+               $pagespec !~ /[\s*?()!]/) {
+               # a simple dependency, which can be matched by string eq
+               $depends_simple{$page}{lc $pagespec} = 1;
+               return 1;
        }
 
        return unless pagespec_valid($pagespec);
@@ -1833,14 +1841,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;