Your message dated Wed, 02 Aug 2006 03:50:31 -0700 with message-id <[EMAIL PROTECTED]> and subject line Bug#380743: fixed in ikiwiki 1.13 has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database)
--- Begin Message ---Package: ikiwiki Version: 1.12 Severity: wishlist Tags: patch A new feature I'd like to request: [[inline pages=... rss="no"]], so that you can include a generated page without creating an RSS feed for the including page. Also, allows to have several sets of inlined pages and choose which one of them becomes RSS. My blog.mdwn page currently reads: ,----[ blog.mdwn ] | [[inline pages="catlinks"]] | [[inline pages="datelinks"]] | | [[inline pages="articles/* !*/Discussion" show="10" rootpage="blog"]] `---- I had to put the catlinks and datelinks includes above, because the last [[inline]] directive overwrites blog.rss. Patch follows (sorry it's not incremental -- it also includes the date-limiting feature patch mentioned in #380680). Basically, it adds a new parameter named rss, defaulting to "yes", controlling whether to generate a .rss page for the current inlining. --- inline.pm~ 2006-07-29 23:38:19.000000000 +0200 +++ inline.pm 2006-08-01 11:46:17.000000000 +0200 @@ -32,10 +32,25 @@ if (! exists $params{archive}) { $params{archive}="no"; } - if (! exists $params{show} && $params{archive} eq "no") { + if (! exists $params{rss}) { + $params{rss}="yes"; + } + if (! exists $params{show} && ! exists $params{year} && $params{archive} eq "no") { $params{show}=10; } - + if (exists $params{day} && ($params{day} !~ /^\d{2}$/ || ! exists $params{month})) { + return ""; + } + if (exists $params{month} && ($params{month} !~ /^\d{2}$/ || ! exists $params{year})) { + return ""; + } + if ($params{year} && $params{year} !~ /^\d{4}$/) { + return ""; + } + if ($params{year}) { + delete $params{show} ; + } + # Avoid nested inlines, to avoid loops etc. if ($processing_inline) { return ""; @@ -45,6 +60,11 @@ my @list; foreach my $page (keys %pagesources) { next if $page eq $params{page}; + my (undef,undef,undef,$d,$m,$y,undef,undef,undef) = + gmtime($pagectime{$page}) ; + next if $params{year} && $y + 1900 != $params{year} ; + next if $params{month} && $m + 1 != $params{month} ; + next if $params{day} && $d != $params{day} ; if (globlist_match($page, $params{pages})) { push @list, $page; } @@ -63,12 +83,12 @@ my $formtemplate=template("blogpost.tmpl", blind_cache => 1); $formtemplate->param(cgiurl => $config{cgiurl}); $formtemplate->param(rootpage => $params{rootpage}); - if ($config{rss}) { + if ($config{rss} && $params{rss} eq "yes") { $formtemplate->param(rssurl => rsspage(basename($params{page}))); } $ret.=$formtemplate->output; } - elsif ($config{rss}) { + elsif ($config{rss} && $params{rss} eq "yes") { # Add a rss link button. my $linktemplate=template("rsslink.tmpl", blind_cache => 1); $linktemplate->param(rssurl => rsspage(basename($params{page}))); @@ -105,7 +125,7 @@ # TODO: should really add this to renderedfiles and call # check_overwrite, but currently renderedfiles # only supports listing one file per page. - if ($config{rss}) { + if ($config{rss} && $params{rss} eq "yes") { writefile(rsspage($params{page}), $config{destdir}, genrss($params{page}, @list)); $toping{$params{page}}=1 unless $config{rebuild}; -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.17-1-k7 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Versions of packages ikiwiki depends on: ii gcc [c-compiler] 4:4.1.1-5 The GNU C compiler ii gcc-3.3 [c-compiler] 1:3.3.6-13 The GNU C compiler ii gcc-4.0 [c-compiler] 4.0.3-6 The GNU C compiler ii gcc-4.1 [c-compiler] 4.1.1-10 The GNU C compiler ii libc6-dev [libc-dev] 2.3.6-16 GNU C Library: Development Librari ii libcgi-formbuilder-perl 3.03.01-1 Easily generate and process statef ii libcgi-session-perl 4.14-1 Persistent session data in CGI app ii libhtml-scrubber-perl 0.08-3 Perl extension for scrubbing/sanit ii libhtml-template-perl 2.8-1 HTML::Template : A module for usin ii libmail-sendmail-perl 0.79-4 Send email from a perl script ii libtime-duration-perl 1.02-1 Time::Duration -- rounded or exact ii libtimedate-perl 1.1600-5 Time and date functions for Perl ii libxml-simple-perl 2.14-4 Perl module for reading and writin ii markdown 1.0.1-3 Text-to-HTML conversion tool ii perl 5.8.8-6 Larry Wall's Practical Extraction Versions of packages ikiwiki recommends: ii hyperestraier 1.3.5-1 a full-text search system for comm ii subversion 1.3.2-5 Advanced version control system -- no debconf information
--- End Message ---
--- Begin Message ---Source: ikiwiki Source-Version: 1.13 We believe that the bug you reported is fixed in the latest version of ikiwiki, which is due to be installed in the Debian FTP archive: ikiwiki_1.13.dsc to pool/main/i/ikiwiki/ikiwiki_1.13.dsc ikiwiki_1.13.tar.gz to pool/main/i/ikiwiki/ikiwiki_1.13.tar.gz ikiwiki_1.13_all.deb to pool/main/i/ikiwiki/ikiwiki_1.13_all.deb A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [EMAIL PROTECTED], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Joey Hess <[EMAIL PROTECTED]> (supplier of updated ikiwiki package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [EMAIL PROTECTED]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.7 Date: Tue, 1 Aug 2006 21:21:19 -0400 Source: ikiwiki Binary: ikiwiki Architecture: source all Version: 1.13 Distribution: unstable Urgency: low Maintainer: Joey Hess <[EMAIL PROTECTED]> Changed-By: Joey Hess <[EMAIL PROTECTED]> Description: ikiwiki - a wiki compiler Closes: 380680 380743 Changes: ikiwiki (1.13) unstable; urgency=low . * ikiwiki can now download and aggregate feeds with its new aggregate plugin, so it's possible to implement a Planet using ikiwiki! * Add a run_hooks function for the common task of running all hooks of a given type. * Add a savestate hook. * Don't put blog post forms on pages if there's no cgiurl set. * --setup --refresh no longer rebuilds wrappers. Use --setup --refresh --wrappers to do that. * Add %IkiWiki::forcerebuild to provide a way for plugins like aggregate to update pages that haven't changed on disk. * Change meta tags to use html entity-escaped text for values, so that quotes and such can be represented in title tags. * Depend and build-depend on HTML::Parser for HTML::Entities which is used for the above. * Make --rebuild also cause --aggregate to re-download and write aggregated pages. * Avoid outputting duplicate meta info. * Include title metadata on aggregated posts for capitalised and un-munged titles. * Title metadata of inlined pages now shows up in blogs and rss feeds. * Fix issue with unicode filenames and updating the hyper estradier search index. (Aka Please Please Please, let that be the last one.) * Patch from Roland Mas to support an rss=no parameter to inline directives. Closes: #380743 * Renamed GlobLists to PageSpecs. * PageSpecs can now include nested parens, "and", and "or". This remains backwards compatible to the old GlobList format. It's implemented by treating the GlobList as a very limited microlanguage that is transformed to perl code that does the matching. * The old GlobList format is deprecated, and I encourage users to switch to using the new PageSpec format. Compatability with the old format will be removed at some point, possibly by 2.0. * Wiki rebuild needed on upgrade to this version due to PageSpec change. * Add support for creation_month and creation_year to PageSpec. Closes: #380680 * Changes to index file encoding. Files: a36a158459127323084650fd265e76de 649 web optional ikiwiki_1.13.dsc 0abc5dde3af7380bb23ec95cad54d7ba 124728 web optional ikiwiki_1.13.tar.gz 4fbf9eab167d96d3b53ee23eb9c35241 154194 web optional ikiwiki_1.13_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) iD8DBQFE0ABv2tp5zXiKP0wRAsi+AKDDQaEWYGfoLktplkvGTgG1fzk4JACbBDwV /HA8EswD+PiCHG2kRrrj01A= =2zDh -----END PGP SIGNATURE-----
--- End Message ---
