Optimize the dependencies list

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a11b330f2126a038f69678512e1a1ba2f2c238fb..3e94c8a257ce2670089916942c2a542a27fd37a3 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -220,6 +220,13 @@ sub getsetup () {
                safe => 1,
                rebuild => 1,
        },
+       discussionpage => {
+               type => "string",
+               default => gettext("Discussion"),
+               description => "name of Discussion pages",
+               safe => 1,
+               rebuild => 1,
+       },
        sslcookie => {
                type => "boolean",
                default => 0,
@@ -1248,9 +1255,10 @@ sub preprocess ($$$;$$) {
                                        );
                                };
                                if ($@) {
-                                       chomp $@;
+                                       my $error=$@;
+                                       chomp $error;
                                        $ret="[[!$command <span class=\"error\">".
-                                               gettext("Error").": $@"."</span>]]";
+                                               gettext("Error").": $error"."</span>]]";
                                }
                        }
                        else {
@@ -1499,8 +1507,11 @@ sub loadindex () {
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }
-                       if (exists $d->{depends}) {
-                               $depends{$page}=$d->{depends};
+                       if (exists $d->{dependslist}) {
+                               $depends{$page}=$d->{dependslist};
+                       }
+                       elsif (exists $d->{depends}) {
+                               $depends{$page}=[$d->{depends}];
                        }
                        if (exists $d->{state}) {
                                $pagestate{$page}=$d->{state};
@@ -1546,7 +1557,8 @@ sub saveindex () {
                };
 
                if (exists $depends{$page}) {
-                       $index{page}{$src}{depends} = $depends{$page};
+                       $index{page}{$src}{depends} = join(" or ", @{$depends{$page}});
+                       $index{page}{$src}{dependslist} = $depends{$page};
                }
 
                if (exists $pagestate{$page}) {
@@ -1716,14 +1728,17 @@ sub rcs_receive () {
 sub add_depends ($$) {
        my $page=shift;
        my $pagespec=shift;
-       
+
        return unless pagespec_valid($pagespec);
 
        if (! exists $depends{$page}) {
-               $depends{$page}=$pagespec;
+               $depends{$page}=[$pagespec];
        }
        else {
-               $depends{$page}=pagespec_merge($depends{$page}, $pagespec);
+               foreach my $p (@{$depends{$page}}) {
+                       return 1 if $p eq $pagespec;
+               }
+               push @{$depends{$page}}, $pagespec;
        }
 
        return 1;
@@ -2048,7 +2063,7 @@ sub match_created_before ($$;@) {
                }
        }
        else {
-               return IkiWiki::FailReason->new("$testpage has no ctime");
+               return IkiWiki::ErrorReason->new("$testpage does not exist");
        }
 }
 
@@ -2068,7 +2083,7 @@ sub match_created_after ($$;@) {
                }
        }
        else {
-               return IkiWiki::FailReason->new("$testpage has no ctime");
+               return IkiWiki::ErrorReason->new("$testpage does not exist");
        }
 }