Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 54146dc467bdcb513e426257a6fd0879005cd35a..4a9bf58dbc1a446ae72f37f13089af05fdc7b221 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -21,6 +21,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -28,12 +29,16 @@ sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        

+       # Needs to update whenever a page is added or removed (or in some
+       # cases, when its content changes, if show= is specified).
+       my $deptype=deptype(exists $params{show} ? "content" : "presence");
+       

        my $common_prefix;
 
        # Get all the items to map.
        my %mapitems;
        my $common_prefix;
 
        # Get all the items to map.
        my %mapitems;

-       foreach my $page (pagespec_match_list([keys %pagesources],
-                               $params{pages}, location => $params{page})) {
+       foreach my $page (pagespec_match_list($params{page}, $params{pages},
+                                       deptype => $deptype)) {

                if (exists $params{show} && 
                    exists $pagestate{$page} &&
                    exists $pagestate{$page}{meta}{$params{show}}) {
                if (exists $params{show} && 
                    exists $pagestate{$page} &&
                    exists $pagestate{$page}{meta}{$params{show}}) {


@@ -67,15 +72,8 @@ sub preprocess (@) {
                $common_prefix=IkiWiki::dirname($common_prefix);
        }
 
                $common_prefix=IkiWiki::dirname($common_prefix);
        }
 

-       # 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});
-       # Explicitly add all currently shown pages, to detect when pages
-       # are removed.
-       foreach my $item (keys %mapitems) {
-               add_depends($params{page}, $item);
-       }
+       # Set this to 1 or more spaces to pretty-print maps for debugging
+       my $spaces = "";

 
        # Create the map.
        my $parent="";
 
        # Create the map.
        my $parent="";


@@ -84,12 +82,12 @@ sub preprocess (@) {
        my $addparent="";
        my $map = "<div class='map'>\n";
 
        my $addparent="";
        my $map = "<div class='map'>\n";
 

-       # Return empty div if %mapitems is empty
-       if (!scalar(keys %mapitems)) {
+       if (! keys %mapitems) {
+               # return empty div for empty map

                $map .= "</div>\n";
                return $map; 
        } 
                $map .= "</div>\n";
                return $map; 
        } 

-       else { # continue populating $map
+       else {

                $map .= "<ul>\n";
        }
 
                $map .= "<ul>\n";
        }
 


@@ -103,18 +101,18 @@ sub preprocess (@) {
                        $parent=IkiWiki::dirname($parent);
                        last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
                        $addparent="";
                        $parent=IkiWiki::dirname($parent);
                        last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
                        $addparent="";

-                       $indent--;
-                       $map .= "</li>\n";
-                       if ($indent > 0) {
-                               $map .= "</ul>\n";
+                       $map .= ($spaces x $indent) . "</li>\n";
+                       if ($indent > 1) {
+                               $map .= ($spaces x $indent) . "</ul><map:collapse>\n";

                        }
                        }

+                       $indent--;

                }
                while ($depth < $indent) {
                }
                while ($depth < $indent) {

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

                        }
                        }

+                       $indent--;

                }
                my @bits=split("/", $item);
                my $p="";
                }
                my @bits=split("/", $item);
                my $p="";


@@ -122,13 +120,14 @@ sub preprocess (@) {
                while ($depth > $indent) {
                        $indent++;
                        if ($indent > 1) {
                while ($depth > $indent) {
                        $indent++;
                        if ($indent > 1) {

-                               $map .= "<ul>\n";
+                               $map .= ($spaces x $indent) . "<ul><map:collapse>\n";

                        }
                        if ($depth > $indent) {
                                $p.="/".shift(@bits);
                                $addparent=$p;
                                $addparent=~s/^\///;
                        }
                        if ($depth > $indent) {
                                $p.="/".shift(@bits);
                                $addparent=$p;
                                $addparent=~s/^\///;

-                               $map .= "<li>"
+                               $map .= ($spaces x $indent) . "<li>\n";
+                               $map .= ($spaces x $indent)

                                        .htmllink($params{page}, $params{destpage},
                                                 "/".$common_prefix.$p, class => "mapparent",
                                                 noimageinline => 1)
                                        .htmllink($params{page}, $params{destpage},
                                                 "/".$common_prefix.$p, class => "mapparent",
                                                 noimageinline => 1)


@@ -139,8 +138,9 @@ sub preprocess (@) {
                                $openli=0;
                        }
                }
                                $openli=0;
                        }
                }

-               $map .= "</li>\n" if $openli;
-               $map .= "<li>"
+               $map .= ($spaces x $indent) . "</li>\n" if $openli;
+               $map .= ($spaces x $indent) . "<li>\n";
+               $map .= ($spaces x $indent)

                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item,
                                @linktext,
                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item,
                                @linktext,


@@ -150,9 +150,12 @@ sub preprocess (@) {
                $parent=$item;
        }
        while ($indent > 0) {
                $parent=$item;
        }
        while ($indent > 0) {

+               $map .= ($spaces x $indent) . "</li>\n";

                $indent--;
                $indent--;

-               $map .= "</li>\n</ul>\n";
+               $map .= ($spaces x $indent) . "</ul>\n";

        }
        }

+       $map =~ s{\n *</ul><map:collapse>\n *<ul><map:collapse>\n}{\n}gs;
+       $map =~ s{<map:collapse>}{}g;

        $map .= "</div>\n";
        return $map;
 }
        $map .= "</div>\n";
        return $map;
 }