web commit by http://alcopop.org/me/openid/: formatting, tagging

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index f4a20e48967954910f2fd19d281146c1ec379e04..c734bd9a69ecada131dbf3d4ea411bc1cfe58b5f 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -10,6 +10,7 @@ use URI;
 
 my %knownfeeds;
 my %page_numfeeds;
 
 my %knownfeeds;
 my %page_numfeeds;

+my @inline;

 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);


@@ -19,6 +20,7 @@ sub import { #{{{
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);

+       hook(type => "format", id => "inline", call => \&format);

        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.
        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.


@@ -51,6 +53,17 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub format (@) { #{{{
+        my %params=@_;
+
+       # Fill in the inline content generated earlier. This is actually an
+       # optimisation.
+       $params{content}=~s{<div class="inline" id="([^"]+)"></div>}{
+               delete @inline[$1,]
+       }eg;
+       return $params{content};
+} #}}}
+

 sub sessioncgi () { #{{{
        my $q=shift;
        my $session=shift;
 sub sessioncgi () { #{{{
        my $q=shift;
        my $session=shift;


@@ -101,10 +114,14 @@ sub preprocess_inline (@) { #{{{
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }

+       if (! exists $params{feedshow} && exists $params{show}) {
+               $params{feedshow}=$params{show};
+       }

        my $desc;
        if (exists $params{description}) {
                $desc = $params{description} 
        my $desc;
        if (exists $params{description}) {
                $desc = $params{description} 

-       } else {
+       }
+       else {

                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});
                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});


@@ -144,6 +161,17 @@ sub preprocess_inline (@) { #{{{
                @list=@list[$params{skip} .. scalar @list - 1];
        }
        
                @list=@list[$params{skip} .. scalar @list - 1];
        }
        

+       my @feedlist;
+       if ($feeds) {
+               if (exists $params{feedshow} &&
+                   $params{feedshow} && @list > $params{feedshow}) {
+                       @feedlist=@list[0..$params{feedshow} - 1];
+               }
+               else {
+                       @feedlist=@list;
+               }
+       }
+       

        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }
        if ($params{show} && @list > $params{show}) {
                @list=@list[0..$params{show} - 1];
        }


@@ -152,7 +180,7 @@ sub preprocess_inline (@) { #{{{
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.

-       add_depends($params{page}, join(" or ", @list));
+       add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));

 
        my $feednum="";
 
 
        my $feednum="";
 


@@ -274,11 +302,8 @@ sub preprocess_inline (@) { #{{{
        }
        
        if ($feeds) {
        }
        
        if ($feeds) {

-               if (exists $params{feedshow} && @list > $params{feedshow}) {
-                       @list=@list[0..$params{feedshow} - 1];
-               }

                if (exists $params{feedpages}) {
                if (exists $params{feedpages}) {

-                       @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
+                       @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;

                }
        
                if ($rss) {
                }
        
                if ($rss) {


@@ -286,7 +311,8 @@ sub preprocess_inline (@) { #{{{
                        will_render($params{destpage}, $rssp);
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},
                        will_render($params{destpage}, $rssp);
                        if (! $params{preview}) {
                                writefile($rssp, $config{destdir},

-                                       genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
+                                       genfeed("rss",
+                                               $config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));

                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
                        }
                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
                        }


@@ -296,14 +322,16 @@ sub preprocess_inline (@) { #{{{
                        will_render($params{destpage}, $atomp);
                        if (! $params{preview}) {
                                writefile($atomp, $config{destdir},
                        will_render($params{destpage}, $atomp);
                        if (! $params{preview}) {
                                writefile($atomp, $config{destdir},

-                                       genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
+                                       genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @feedlist));

                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
                        }
                }
        }
        
                                $toping{$params{destpage}}=1 unless $config{rebuild};
                                $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
                        }
                }
        }
        

-       return $ret;
+       return $ret if $raw;
+       push @inline, $ret;
+       return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";

 } #}}}
 
 sub pagetemplate_inline (@) { #{{{
 } #}}}
 
 sub pagetemplate_inline (@) { #{{{