implement support for DEPEND_EXISTS

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 85d8eea68419cb350e530c322958796186e05b1f..67149bc8bda67ba83a3225273236aceb0156607e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -28,6 +28,10 @@ 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
 
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 

+# Page dependency types.
+our $DEPEND_EXISTS=1;
+our $DEPEND_CONTENT=2;
+

 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 # Optimisation.
 use Memoize;
 memoize("abs2rel");


@@ -544,12 +548,12 @@ sub loadplugins () {
        }
        
        if ($config{rcs}) {
        }
        
        if ($config{rcs}) {

-               if (exists $IkiWiki::hooks{rcs}) {
+               if (exists $hooks{rcs}) {

                        error(gettext("cannot use multiple rcs plugins"));
                }
                loadplugin($config{rcs});
        }
                        error(gettext("cannot use multiple rcs plugins"));
                }
                loadplugin($config{rcs});
        }

-       if (! exists $IkiWiki::hooks{rcs}) {
+       if (! exists $hooks{rcs}) {

                loadplugin("norcs");
        }
 
                loadplugin("norcs");
        }
 


@@ -1524,18 +1528,28 @@ sub loadindex () {
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }
                                $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}}
                                };
                        }
                                $depends_simple{$page}={
                                        map { $_ => 1 } @{$d->{depends_simple}}
                                };
                        }

+                       elsif (exists $d->{depends_simple}) {
+                               $depends{$page}=$d->{depends_simple};
+                       }

                        if (exists $d->{dependslist}) {
                        if (exists $d->{dependslist}) {

+                               # old format

                                $depends{$page}={
                                $depends{$page}={

-                                       map { $_ => 1 } @{$d->{dependslist}}
+                                       map { $_ => $DEPEND_CONTENT | $DEPEND_EXISTS }
+                                               @{$d->{dependslist}}

                                };
                        }
                                };
                        }

+                       elsif (exists $d->{depends} && ! ref $d->{depends}) {
+                               # old format
+                               $depends{$page}={$d->{depends} => $DEPEND_CONTENT | $DEPEND_EXISTS};
+                       }

                        elsif (exists $d->{depends}) {
                        elsif (exists $d->{depends}) {

-                               $depends{$page}={$d->{depends} => 1};
+                               $depends{$page}=$d->{depends};

                        }
                        if (exists $d->{state}) {
                                $pagestate{$page}=$d->{state};
                        }
                        if (exists $d->{state}) {
                                $pagestate{$page}=$d->{state};


@@ -1581,11 +1595,11 @@ sub saveindex () {
                };
 
                if (exists $depends{$page}) {
                };
 
                if (exists $depends{$page}) {

-                       $index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
+                       $index{page}{$src}{depends} = $depends{$page};

                }
 
                if (exists $depends_simple{$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}) {
                }
 
                if (exists $pagestate{$page}) {


@@ -1753,20 +1767,28 @@ sub rcs_receive () {
        $hooks{rcs}{rcs_receive}{call}->();
 }
 
        $hooks{rcs}{rcs_receive}{call}->();
 }
 

-sub add_depends ($$) {
+sub add_depends ($$;@) {

        my $page=shift;
        my $pagespec=shift;
 
        my $page=shift;
        my $pagespec=shift;
 

+       my $deptype=$DEPEND_CONTENT | $DEPEND_EXISTS;
+       if (@_) {
+               my %params=@_;
+               if (defined $params{content} && $params{content} == 0) {
+                       $deptype=$deptype & ~$DEPEND_CONTENT;
+               }
+       }
+

        if ($pagespec =~ /$config{wiki_file_regexp}/ &&
                $pagespec !~ /[\s*?()!]/) {
                # a simple dependency, which can be matched by string eq
        if ($pagespec =~ /$config{wiki_file_regexp}/ &&
                $pagespec !~ /[\s*?()!]/) {
                # a simple dependency, which can be matched by string eq

-               $depends_simple{$page}{lc $pagespec} = 1;
+               $depends_simple{$page}{lc $pagespec} |= $deptype;

                return 1;
        }
 
        return unless pagespec_valid($pagespec);
 
                return 1;
        }
 
        return unless pagespec_valid($pagespec);
 

-       $depends{$page}{$pagespec} = 1;
+       $depends{$page}{$pagespec} |= $deptype;

        return 1;
 }
 
        return 1;
 }
 


@@ -2052,10 +2074,10 @@ sub match_link ($$;@) {
                else {
                        return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
                                if match_glob($p, $link, %params);
                else {
                        return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
                                if match_glob($p, $link, %params);

-                       $p=~s/^\///;
+                       my ($p_rel)=$p=~/^\/?(.*)/;

                        $link=~s/^\///;
                        $link=~s/^\///;

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
-                               if match_glob($p, $link, %params);
+                       return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link")
+                               if match_glob($p_rel, $link, %params);

                }
        }
        return IkiWiki::FailReason->new("$page does not link to $link");
                }
        }
        return IkiWiki::FailReason->new("$page does not link to $link");