* Add toc (table of contents) plugin.

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 23428cb0e7a3d3e59d32931248ec3d97d9654e50..4bc919526f3c74de2be20b54e7ffa795186e2273 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -35,14 +35,14 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

+       IkiWiki::lockwiki();
+       loadstate();

        if ($IkiWiki::config{aggregate}) {
        if ($IkiWiki::config{aggregate}) {

-               IkiWiki::lockwiki();
-               loadstate();

                IkiWiki::loadindex();
                aggregate();
                savestate();
                IkiWiki::loadindex();
                aggregate();
                savestate();

-               IkiWiki::unlockwiki();

        }
        }

+       IkiWiki::unlockwiki();

 } #}}}
 
 sub filter (@) { #{{{
 } #}}}
 
 sub filter (@) { #{{{


@@ -267,7 +267,7 @@ sub add_page (@) { #{{{
                        $page=$feed->{dir}."/item";
                }
                my $c="";
                        $page=$feed->{dir}."/item";
                }
                my $c="";

-               while (exists $IkiWiki::pagecase{lc $page} ||
+               while (exists $IkiWiki::pagecase{lc $page.$c} ||

                       -e pagefile($page.$c)) {
                        $c++
                }
                       -e pagefile($page.$c)) {
                        $c++
                }


@@ -323,7 +323,7 @@ sub htmlabs ($$) { #{{{
        # Convert links in html from relative to absolute.
        # Note that this is a heuristic, which is not specified by the rss
        # spec and may not be right for all feeds. Also, see Debian
        # Convert links in html from relative to absolute.
        # Note that this is a heuristic, which is not specified by the rss
        # spec and may not be right for all feeds. Also, see Debian

-       # bug #XXXX TODO: get bug.
+       # bug #381359.

        my $html=shift;
        my $urlbase=shift;
 
        my $html=shift;
        my $urlbase=shift;