note that this old bug affects more stuff now

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 5b6a843e7ae2680d654317fc35368190c2d9d087..625cfdfcaaa723a80f7c15e155d70d0583d2b9b7 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,13 +9,22 @@ package IkiWiki::Plugin::map;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "map", call => \&getsetup);

        hook(type => "preprocess", id => "map", call => \&preprocess);
        hook(type => "preprocess", id => "map", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        


@@ -23,32 +32,31 @@ sub preprocess (@) { #{{{
 
        # Get all the items to map.
        my %mapitems;
 
        # Get all the items to map.
        my %mapitems;

-       foreach my $page (keys %pagesources) {
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       if (exists $params{show} && 
-                           exists $pagestate{$page} &&
-                           exists $pagestate{$page}{meta}{$params{show}}) {
-                               $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
-                       }
-                       else {
-                               $mapitems{$page}='';
-                       }
-                       # Check for a common prefix.
-                       if (! defined $common_prefix) {
-                               $common_prefix=$page;
-                       }
-                       elsif (length $common_prefix &&
-                              $page !~ /^\Q$common_prefix\E(\/|$)/) {
-                               my @a=split(/\//, $page);
-                               my @b=split(/\//, $common_prefix);
-                               $common_prefix="";
-                               while (@a && @b && $a[0] eq $b[0]) {
-                                       if (length $common_prefix) {
-                                               $common_prefix.="/";
-                                       }
-                                       $common_prefix.=shift(@a);
-                                       shift @b;
+       foreach my $page (pagespec_match_list([keys %pagesources],
+                               $params{pages}, location => $params{page})) {
+               if (exists $params{show} && 
+                   exists $pagestate{$page} &&
+                   exists $pagestate{$page}{meta}{$params{show}}) {
+                       $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
+               }
+               else {
+                       $mapitems{$page}='';
+               }
+               # Check for a common prefix.
+               if (! defined $common_prefix) {
+                       $common_prefix=$page;
+               }
+               elsif (length $common_prefix &&
+                      $page !~ /^\Q$common_prefix\E(\/|$)/) {
+                       my @a=split(/\//, $page);
+                       my @b=split(/\//, $common_prefix);
+                       $common_prefix="";
+                       while (@a && @b && $a[0] eq $b[0]) {
+                               if (length $common_prefix) {
+                                       $common_prefix.="/";

                                }
                                }

+                               $common_prefix.=shift(@a);
+                               shift @b;

                        }
                }
        }
                        }
                }
        }


@@ -60,19 +68,31 @@ sub preprocess (@) { #{{{
        }
 
        # Needs to update whenever a page is added or removed (or in some
        }
 
        # Needs to update whenever a page is added or removed (or in some

-       # cases, when its content changes, if show=title), so register a
-       # dependency.
-       add_depends($params{page}, $params{pages});
+       # cases, when its content changes, if show= is specified), so
+       # register a dependency.
+       add_depends($params{page}, $params{pages}, presence => ! exists $params{show});

        # Explicitly add all currently shown pages, to detect when pages
        # are removed.
        # Explicitly add all currently shown pages, to detect when pages
        # are removed.

-       add_depends($params{page}, join(" or ", keys %mapitems));
+       foreach my $item (keys %mapitems) {
+               add_depends($params{page}, $item, presence => ! exists $params{show});
+       }

 
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;
 
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;

-       my $dummy=0;
-       my $map = "<div class='map'>\n<ul>\n";
+       my $addparent="";
+       my $map = "<div class='map'>\n";
+
+       # Return empty div if %mapitems is empty
+       if (!scalar(keys %mapitems)) {
+               $map .= "</div>\n";
+               return $map; 
+       } 
+       else { # continue populating $map
+               $map .= "<ul>\n";
+       }
+

        foreach my $item (sort keys %mapitems) {
                my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
                $item=~s/^\Q$common_prefix\E\///
        foreach my $item (sort keys %mapitems) {
                my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
                $item=~s/^\Q$common_prefix\E\///


@@ -81,14 +101,14 @@ sub preprocess (@) { #{{{
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);

-                       last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
+                       last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
+                       $addparent="";

                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }
                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }

-               $dummy=0;

                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";
                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";


@@ -105,11 +125,12 @@ sub preprocess (@) { #{{{
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {

-                               $dummy=1;

                                $p.="/".shift(@bits);
                                $p.="/".shift(@bits);

+                               $addparent=$p;
+                               $addparent=~s/^\///;

                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage},
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage},

-                                                $p, class => "mapparent",
+                                                "/".$common_prefix.$p, class => "mapparent",

                                                 noimageinline => 1)
                                        ."\n";
                                $openli=1;
                                                 noimageinline => 1)
                                        ."\n";
                                $openli=1;


@@ -134,6 +155,6 @@ sub preprocess (@) { #{{{
        }
        $map .= "</div>\n";
        return $map;
        }
        $map .= "</div>\n";
        return $map;

-} # }}}
+}

 
 1
 
 1