summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-10-08 18:26:36 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-10-08 18:30:50 -0400
commit32cd5f0b798c41b2320a4165c5b6ecc18a4e6e3e (patch)
tree075201f42ccd0c71e427ddd27212244d55c909ea
parent65d57902ca9f05b7958ea0a47b3fa3c651da89f5 (diff)
inline: switch to use_pagespec
Taking advantage of every single one of its features, of course. Even had to add one more..
-rw-r--r--IkiWiki/Plugin/inline.pm49
-rw-r--r--doc/plugins/write.mdwn2
2 files changed, 23 insertions, 28 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index be1781520..748e02df4 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -196,45 +196,37 @@ sub preprocess_inline (@) {
@list = map { bestlink($params{page}, $_) }
split ' ', $params{pagenames};
+ if (yesno($params{reverse})) {
+ @list=reverse(@list);
+ }
+
foreach my $p (@list) {
add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
}
}
else {
- add_depends($params{page}, $params{pages},
- deptype($quick ? "presence" : "content"));
-
- @list = pagespec_match_list(
- [ grep { $_ ne $params{page} } keys %pagesources ],
- $params{pages}, location => $params{page});
-
- if (exists $params{sort} && $params{sort} eq 'title') {
- @list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;
+ my $num=0;
+ if ($params{show}) {
+ $num=$params{show};
}
- elsif (exists $params{sort} && $params{sort} eq 'title_natural') {
- eval q{use Sort::Naturally};
- if ($@) {
- error(gettext("Sort::Naturally needed for title_natural sort"));
- }
- @list=sort { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) } @list;
+ if ($params{feedshow} && $num < $params{feedshow}) {
+ $num=$params{feedshow};
}
- elsif (exists $params{sort} && $params{sort} eq 'mtime') {
- @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
+ if ($params{skip}) {
+ $num+=$params{skip};
}
- elsif (! exists $params{sort} || $params{sort} eq 'age') {
- @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
- }
- else {
- error sprintf(gettext("unknown sort type %s"), $params{sort});
- }
- }
- if (yesno($params{reverse})) {
- @list=reverse(@list);
+ @list = use_pagespec($params{page}, $params{pages},
+ deptype => deptype($quick ? "presence" : "content"),
+ limit => sub { $_[0] ne $params{page} },
+ sort => exists $params{sort} ? $params{sort} : "age",
+ reverse => yesno($params{reverse}),
+ num => $num,
+ );
}
if (exists $params{skip}) {
- @list=@list[$params{skip} .. scalar @list - 1];
+ @list=@list[$params{skip} .. $#list];
}
my @feedlist;
@@ -253,7 +245,8 @@ sub preprocess_inline (@) {
}
if ($feeds && exists $params{feedpages}) {
- @feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});
+ @feedlist = use_pagespec($params{page}, $params{feedpages},
+ list => \@feedlist);
}
my ($feedbase, $feednum);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3d5650758..62bebbeed 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -647,6 +647,8 @@ Additional named parameters can be specified:
* `reverse` if true, sorts in reverse.
* `num` if nonzero, specifies the maximum number of matching pages that
will be returned.
+* `list` makes it only match amoung the specified list of pages.
+ Default is to match amoung all pages in the wiki.
#### `add_depends($$;$)`