openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1264 - website/preview/includes
by svnadmin＠urchin.earth.li 15 Mar '09

15 Mar '09

Author: dom Date: 2009-03-15 22:21:55 +0000 (Sun, 15 Mar 2009) New Revision: 1264 Modified: website/preview/includes/footer.inc Log: more efficient lines Modified: website/preview/includes/footer.inc =================================================================== --- website/preview/includes/footer.inc 2009-03-15 22:21:07 UTC (rev 1263) +++ website/preview/includes/footer.inc 2009-03-15 22:21:55 UTC (rev 1264) @@ -18,7 +18,7 @@ to...</em> and <em>the guides made by you</em> are trademarks of The OpenGuides Project, copyright ©2002-2009. All rights reserved.<br> - Trademarks used on member sites of the OpenGuides network by permission.<br> + Trademarks used on member sites of the OpenGuides network by permission. Contact: <a href="mailto:contact@openguides.org">contact(a)openguides.org</a> </div>

1 0

r1263 - website/preview/includes
by svnadmin＠urchin.earth.li 15 Mar '09

15 Mar '09

Author: dom Date: 2009-03-15 22:21:07 +0000 (Sun, 15 Mar 2009) New Revision: 1263 Modified: website/preview/includes/footer.inc Log: update copyright year, add contact address Modified: website/preview/includes/footer.inc =================================================================== --- website/preview/includes/footer.inc 2009-03-15 22:17:46 UTC (rev 1262) +++ website/preview/includes/footer.inc 2009-03-15 22:21:07 UTC (rev 1263) @@ -16,9 +16,10 @@ <div id="trademarks"> <em>OpenGuides</em>, <em>[The] Open Guide to...</em> and <em>the guides made by you</em> are - trademarks of The OpenGuides Project, copyright ©2002-2006. All rights + trademarks of The OpenGuides Project, copyright ©2002-2009. All rights reserved.<br> - Trademarks used on member sites of the OpenGuides network by permission. + Trademarks used on member sites of the OpenGuides network by permission.<br> + Contact: <a href="mailto:contact@openguides.org">contact(a)openguides.org</a> </div>

1 0

r1262 - in sites: . london.openguides.org london.openguides.org/templates
by svnadmin＠urchin.earth.li 15 Mar '09

15 Mar '09

Author: dom Date: 2009-03-15 22:17:46 +0000 (Sun, 15 Mar 2009) New Revision: 1262 Added: sites/london.openguides.org/ sites/london.openguides.org/templates/ sites/london.openguides.org/templates/custom_banner.tt sites/london.openguides.org/templates/userstats.tt Log: add templates for london Added: sites/london.openguides.org/templates/custom_banner.tt =================================================================== --- sites/london.openguides.org/templates/custom_banner.tt (rev 0) +++ sites/london.openguides.org/templates/custom_banner.tt 2009-03-15 22:17:46 UTC (rev 1262) @@ -0,0 +1,4 @@ +<div id="banner" onclick="location.href='http://london.openguides.org/'" +onmouseover="window.status='http://london.openguides.org/'; return true" onmouseout="window.status=''; return true"> +<h1>The Open Guide to London</h1> +</div> Added: sites/london.openguides.org/templates/userstats.tt =================================================================== --- sites/london.openguides.org/templates/userstats.tt (rev 0) +++ sites/london.openguides.org/templates/userstats.tt 2009-03-15 22:17:46 UTC (rev 1262) @@ -0,0 +1,49 @@ +[% USE CGI %] +[% INCLUDE header.tt page_title = "User stats for $username - $site_name" %] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> +<h2> + User Stats for + [% IF username %] + [% username %] + [% ELSE %] + [% host %] + [% END %] +</h2> + +[% content %] + +<h2> + Last five edits made by + [% IF username AND 0 %] + <a href="[% full_cgi_url %]?[% username_param %]">[% username %]</a>: + [% ELSE %] + [% host %]: + [% END %] +</h2> + +<ul> +[% FOREACH node = last_five_nodes %] + <li>[% node.last_modified %] + <a href="[% node.url %]">[% node.name %]</a> + [% IF node.comment %] + <b>[[% node.comment %]]</b> + [% END %] + </li> +[% END %] +</ul> + +[% IF username %] + <h2>Personalised RSS feeds:</h2> + <ul> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=10">Last ten edits made by [% username %]</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=20">Last twenty edits made by [% username %]</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=10;ignore_minor_edits=1">Last ten edits made by [% username %], ignoring minor edits</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=20;ignore_minor_edits=1">Last twenty edits made by [% username %], ignoring minor edits</a></li> + </ul> +[% END %] + +</div> +[% INCLUDE footer.tt %]

1 0

r1261 - in trunk: . lib lib/OpenGuides t
by svnadmin＠urchin.earth.li 26 Feb '09

26 Feb '09

Author: dom Date: 2009-02-26 00:00:10 +0000 (Thu, 26 Feb 2009) New Revision: 1261 Added: trunk/t/02_pod.t Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm trunk/lib/OpenGuides/JSON.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Template.pm trunk/lib/OpenGuides/Test.pm Log: Fix some more broken POD and add POD unit test (fixes #268) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/Build.PL 2009-02-26 00:00:10 UTC (rev 1261) @@ -329,7 +329,7 @@ 'Test::HTML::Content' => 0, # for testing, oddly enough 'Wiki::Toolkit::Plugin::Ping' => 0, # for pinging external services 'Geo::HelmertTransform' => 0, # for correct WGS84 lat/long - # when using grid systems + 'Test::Pod' => 0, }, dynamic_config => 1, Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/Changes 2009-02-26 00:00:10 UTC (rev 1261) @@ -3,6 +3,9 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. +0.65 + Fix some more broken POD and add POD unit test (#268) + 0.64 23 February 2009 Correctly specify all build_requires (#245) Fix some broken POD (#246) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/MANIFEST 2009-02-26 00:00:10 UTC (rev 1261) @@ -78,6 +78,7 @@ templates/userstats.tt templates/wanted_pages.tt t/01_load.t +t/02_pod.t t/11_utils.t t/12_macros.t t/13_cookies.t Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/lib/OpenGuides/Feed.pm 2009-02-26 00:00:10 UTC (rev 1261) @@ -63,13 +63,17 @@ $self; } +=over 4 + =item B<set_feed_name_and_url_params> Overrides the default feed name and default feed http equivalent url. Useful on custom feeds, where the defaults are incorrect. $feed->set_feed_name_and_url("Search Results", "search=pub"); $feed->build_mini_feed_for_nodes("rss", @search_results); + =cut + sub set_feed_name_and_url_params { my ($self, $name, $url) = @_; @@ -85,6 +89,7 @@ } =item B<make_feed> + Produce one of the standard feeds, in the requested format. @@ -94,7 +99,9 @@ ); Passes additional arguments through to the underlying Wiki::Toolkit::Feed + =cut + sub make_feed { my ($self, %args) = @_; @@ -133,18 +140,23 @@ } =item B<build_feed_for_nodes> + For the given feed type, build a feed from the supplied list of nodes. Will figure out the feed timestamp from the newest node, and output a last modified header based on this. my @nodes = $wiki->fetch_me_nodes_I_like(); my $feed_contents = $feed->build_feed_for_nodes("rss", @nodes); + =cut + sub build_feed_for_nodes { my ($self, $format, @nodes) = @_; return $self->render_feed_for_nodes($format, undef, 1, @nodes); } + =item B<build_mini_feed_for_nodes> + For the given feed type, build a mini feed (name and distance) from the supplied list of nodes. Will figure out the feed timestamp from the newest node, and output a @@ -152,16 +164,21 @@ my @nodes = $wiki->search_near_here(); my $feed_contents = $feed->build_mini_feed_for_nodes("rss", @nodes); + =cut + sub build_mini_feed_for_nodes { my ($self, $format, @nodes) = @_; return $self->render_feed_for_nodes($format, undef, 0, @nodes); } =item B<render_feed_for_nodes> + Normally internal method to perform the appropriate building of a feed - based on a list of nodes. +based on a list of nodes. + =cut + sub render_feed_for_nodes { my ($self, $format, $html_url, $is_full, @nodes) = @_; @@ -194,10 +211,13 @@ } =item B<default_content_type> + For the given feed type, return the default content type for that feed. my $content_type = $feed->default_content_type("rss"); + =cut + sub default_content_type { my ($self,$feed_type) = @_; @@ -217,6 +237,7 @@ } =item B<fetch_maker> + For the given feed type, identify and return the maker routine for feeds of that type. @@ -224,7 +245,9 @@ my $feed_contents = maker->node_all_versions(%options); Will always return something of type Wiki::Toolkit::Feed::Listing + =cut + sub fetch_maker { my ($self,$feed_type) = @_; @@ -291,6 +314,8 @@ $self->rss_maker->rss_timestamp(%args); } +=back + =head1 NAME OpenGuides::Feed - generate data feeds for OpenGuides in various formats. @@ -407,7 +432,7 @@ =head1 COPYRIGHT -Copyright (C) 2003-2007 The OpenGuides Project. All Rights Reserved. +Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/JSON.pm =================================================================== --- trunk/lib/OpenGuides/JSON.pm 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/lib/OpenGuides/JSON.pm 2009-02-26 00:00:10 UTC (rev 1261) @@ -60,9 +60,14 @@ $self; } +=over 4 + =item B<emit_json> + Renders the given node as JSON + =cut + sub emit_json { my ( $self, %args ) = @_; @@ -107,8 +112,11 @@ } =item B<output_as_json> + Renders the given arbitary data as JSON + =cut + sub output_as_json { my ( $self, %args ) = @_; return $self->json_maker->make_json(\%args); @@ -148,6 +156,8 @@ $self->json_maker->rss_timestamp(%args); } +=back + =head1 NAME OpenGuides::JSON - An OpenGuides plugin to output JSON. @@ -284,7 +294,7 @@ =head1 COPYRIGHT -Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. +Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/lib/OpenGuides/RDF.pm 2009-02-26 00:00:10 UTC (rev 1261) @@ -267,6 +267,8 @@ =back +=back + =head1 SEE ALSO =over 4 @@ -285,7 +287,7 @@ =head1 COPYRIGHT -Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. +Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/lib/OpenGuides/Template.pm 2009-02-26 00:00:10 UTC (rev 1261) @@ -100,10 +100,10 @@ =back +If C<node> is supplied: + =over -If C<node> is supplied: - =item * C<node_name> =item * C<node_param> (the node name escaped for use in URLs) @@ -597,7 +597,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/lib/OpenGuides/Test.pm 2009-02-26 00:00:10 UTC (rev 1261) @@ -161,8 +161,6 @@ } } -=over 4 - =item B<make_cgi_object> my $q = OpenGuides::Test->make_cgi_object; @@ -211,7 +209,7 @@ =head1 COPYRIGHT - Copyright (C) 2004-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2004-2009 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2009-02-25 18:11:39 UTC (rev 1260) +++ trunk/lib/OpenGuides.pm 2009-02-26 00:00:10 UTC (rev 1261) @@ -2291,6 +2291,7 @@ return $cookie_data{$pref_name}; } +=back =head1 BUGS AND CAVEATS @@ -2325,7 +2326,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. The OpenGuides distribution is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Added: trunk/t/02_pod.t =================================================================== --- trunk/t/02_pod.t (rev 0) +++ trunk/t/02_pod.t 2009-02-26 00:00:10 UTC (rev 1261) @@ -0,0 +1,6 @@ +use strict; +use Test::More; +eval "use Test::Pod 1.00"; +plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; +my @poddirs = qw( blib blib/script ); +all_pod_files_ok( all_pod_files( @poddirs ) );

1 0

r1260 - in website/publish: . includes
by svnadmin＠urchin.earth.li 25 Feb '09

25 Feb '09

Author: kake Date: 2009-02-25 18:11:39 +0000 (Wed, 25 Feb 2009) New Revision: 1260 Modified: website/publish/includes/latest_news.inc website/publish/news.shtml Log: Merged news item addition to publish. Modified: website/publish/includes/latest_news.inc =================================================================== --- website/publish/includes/latest_news.inc 2009-02-25 18:07:15 UTC (rev 1259) +++ website/publish/includes/latest_news.inc 2009-02-25 18:11:39 UTC (rev 1260) @@ -1,15 +1,12 @@  <div class="news_date"> -November 11, 2008 +February 25, 2009 </div> -<p>We had <a -href="http://dev.openguides.org/wiki/OxfordHackfest2008">a hackfest in -Oxford</a>, and it was good!</p> +<p>Version 0.64 of OpenGuides was released this week, with various +small bugfixes and improvements including slightly simpler +installation, plus metadata discovery, JSON support, an optional admin +navbar, and host whitelisting for editing moderated nodes.</p> -<p>Release manager Dom reports that 22 Trac tickets were closed and 6 -were opened during the weekend. We also saw a few new faces, which -is excellent.</p> -  Modified: website/publish/news.shtml =================================================================== --- website/publish/news.shtml 2009-02-25 18:07:15 UTC (rev 1259) +++ website/publish/news.shtml 2009-02-25 18:11:39 UTC (rev 1260) @@ -32,6 +32,18 @@  <div class="news_date"> +November 11, 2008 +</div> + +<p>We had <a +href="http://dev.openguides.org/wiki/OxfordHackfest2008">a hackfest in +Oxford</a>, and it was good!</p> + +<p>Release manager Dom reports that 22 Trac tickets were closed and 6 +were opened during the weekend. We also saw a few new faces, which +is excellent.</p> + +<div class="news_date"> August 19, 2008 </div>

1 0

r1259 - in website/preview: . includes
by svnadmin＠urchin.earth.li 25 Feb '09

25 Feb '09

Author: kake Date: 2009-02-25 18:07:15 +0000 (Wed, 25 Feb 2009) New Revision: 1259 Modified: website/preview/includes/latest_news.inc website/preview/news.shtml Log: Added news about new release. Modified: website/preview/includes/latest_news.inc =================================================================== --- website/preview/includes/latest_news.inc 2009-02-23 13:18:17 UTC (rev 1258) +++ website/preview/includes/latest_news.inc 2009-02-25 18:07:15 UTC (rev 1259) @@ -1,15 +1,12 @@  <div class="news_date"> -November 11, 2008 +February 25, 2009 </div> -<p>We had <a -href="http://dev.openguides.org/wiki/OxfordHackfest2008">a hackfest in -Oxford</a>, and it was good!</p> +<p>Version 0.64 of OpenGuides was released this week, with various +small bugfixes and improvements including slightly simpler +installation, plus metadata discovery, JSON support, an optional admin +navbar, and host whitelisting for editing moderated nodes.</p> -<p>Release manager Dom reports that 22 Trac tickets were closed and 6 -were opened during the weekend. We also saw a few new faces, which -is excellent.</p> -  Modified: website/preview/news.shtml =================================================================== --- website/preview/news.shtml 2009-02-23 13:18:17 UTC (rev 1258) +++ website/preview/news.shtml 2009-02-25 18:07:15 UTC (rev 1259) @@ -32,6 +32,18 @@  <div class="news_date"> +November 11, 2008 +</div> + +<p>We had <a +href="http://dev.openguides.org/wiki/OxfordHackfest2008">a hackfest in +Oxford</a>, and it was good!</p> + +<p>Release manager Dom reports that 22 Trac tickets were closed and 6 +were opened during the weekend. We also saw a few new faces, which +is excellent.</p> + +<div class="news_date"> August 19, 2008 </div>

1 0

r1258 - tags
by svnadmin＠urchin.earth.li 23 Feb '09

23 Feb '09

Author: dom Date: 2009-02-23 13:18:17 +0000 (Mon, 23 Feb 2009) New Revision: 1258 Added: tags/rel0_64/ Log: new release Copied: tags/rel0_64 (from rev 1257, trunk)

1 0

r1257 - trunk
by svnadmin＠urchin.earth.li 23 Feb '09

23 Feb '09

Author: dom Date: 2009-02-23 13:17:53 +0000 (Mon, 23 Feb 2009) New Revision: 1257 Modified: trunk/Changes Log: release date Modified: trunk/Changes =================================================================== --- trunk/Changes 2009-02-23 13:14:20 UTC (rev 1256) +++ trunk/Changes 2009-02-23 13:17:53 UTC (rev 1257) @@ -3,7 +3,7 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. -0.64 +0.64 23 February 2009 Correctly specify all build_requires (#245) Fix some broken POD (#246) Metadata discovery features (action=metadata)

1 0

r1256 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 23 Feb '09

23 Feb '09

Author: dom Date: 2009-02-23 13:14:20 +0000 (Mon, 23 Feb 2009) New Revision: 1256 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/CGI.pm trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/JSON.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Template.pm trunk/lib/OpenGuides/Test.pm trunk/lib/OpenGuides/Utils.pm trunk/wiki.cgi Log: Bump version numbers and copyright years for release Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/CGI.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -1,7 +1,7 @@ package OpenGuides::CGI; use strict; use vars qw( $VERSION ); -$VERSION = '0.08'; +$VERSION = '0.09'; use Carp qw( croak ); use CGI::Cookie; @@ -307,7 +307,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2007 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/Config.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -3,7 +3,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.04'; +$VERSION = '0.05'; use Carp qw( croak ); use Config::Tiny; Modified: trunk/lib/OpenGuides/JSON.pm =================================================================== --- trunk/lib/OpenGuides/JSON.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/JSON.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -284,7 +284,7 @@ =head1 COPYRIGHT -Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved. +Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/RDF.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -5,7 +5,7 @@ use OpenGuides::Utils; use vars qw( $VERSION ); -$VERSION = '0.12'; +$VERSION = '0.13'; use Time::Piece; use URI::Escape; Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/Template.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.13'; +$VERSION = '0.14'; use Carp qw( croak ); use CGI; # want to get rid of this and put the burden on the templates Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/Test.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -4,7 +4,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.04'; +$VERSION = '0.05'; use CGI; Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides/Utils.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.11'; +$VERSION = '0.12'; use Carp qw( croak ); use Wiki::Toolkit; Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/lib/OpenGuides.pm 2009-02-23 13:14:20 UTC (rev 1256) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.63'; +$VERSION = '0.64'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2009-02-21 18:19:00 UTC (rev 1255) +++ trunk/wiki.cgi 2009-02-23 13:14:20 UTC (rev 1256) @@ -5,7 +5,7 @@ use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.63'; +$VERSION = '0.64'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r1255 - in trunk: . t templates
by svnadmin＠urchin.earth.li 21 Feb '09

21 Feb '09

Author: dom Date: 2009-02-21 18:19:00 +0000 (Sat, 21 Feb 2009) New Revision: 1255 Modified: trunk/Changes trunk/t/34_search_paging.t trunk/templates/search.tt Log: Correctly paginate search when geodata is supplied (fixes #267) - thanks bob Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-12-21 18:30:45 UTC (rev 1254) +++ trunk/Changes 2009-02-21 18:19:00 UTC (rev 1255) @@ -24,6 +24,7 @@ generating the page content (#228) Work around Wiki::Toolkit bug #41 by displaying minor edits by default + Correctly paginate search when geodata is supplied (#267) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/t/34_search_paging.t =================================================================== --- trunk/t/34_search_paging.t 2008-12-21 18:30:45 UTC (rev 1254) +++ trunk/t/34_search_paging.t 2009-02-21 18:19:00 UTC (rev 1255) @@ -16,7 +16,7 @@ plan skip_all => "Plucene not installed"; } -plan tests => 9; +plan tests => 18; # Clear out the database from any previous runs. unlink "t/node.db"; @@ -34,7 +34,7 @@ skip "Geography::NationalGrid::GB not installed", 3 if $@; $config->geo_handler( 1 ); - foreach my $i ( 1 .. 30 ) { + foreach my $i ( 1 .. 50 ) { OpenGuides::Test->write_data( guide => $guide, node => "Crabtree Tavern $i", @@ -50,6 +50,7 @@ os_dist => 1500, os_x => 523500, os_y => 177500, + next => 21, }, ); like( $output, qr/search.cgi\?.*os_x=523500.*Next.*results/s, @@ -58,6 +59,12 @@ "os_y retained in next page link" ); like( $output, qr/search.cgi\?.*os_dist=1500.*Next.*results/s, "os_dist retained in next page link" ); + like( $output, qr/search.cgi\?.*os_x=523500.*Previous.*results/s, + "os_x retained in previous page link" ); + like( $output, qr/search.cgi\?.*os_y=177500.*Previous.*results/s, + "os_y retained in previous page link" ); + like( $output, qr/search.cgi\?.*os_dist=1500.*Previous.*results/s, + "os_dist retained in previous page link" ); } # Test with OSIE co-ords. @@ -70,7 +77,7 @@ $config->geo_handler( 2 ); my $search = OpenGuides::Search->new( config => $config ); - foreach my $i ( 1 .. 30 ) { + foreach my $i ( 1 .. 50 ) { OpenGuides::Test->write_data( guide => $guide, node => "I Made This Place Up $i", @@ -85,6 +92,7 @@ osie_dist => 1500, osie_x => 100000, osie_y => 200000, + next => 21, }, ); like( $output, qr/search.cgi\?.*osie_x=100000.*Next.*results/s, @@ -93,6 +101,12 @@ "osie_y retained in next page link" ); like( $output, qr/search.cgi\?.*osie_dist=1500.*Next.*results/s, "osie_dist retained in next page link" ); + like( $output, qr/search.cgi\?.*osie_x=100000.*Previous.*results/s, + "osie_x retained in previous page link" ); + like( $output, qr/search.cgi\?.*osie_y=200000.*Previous.*results/s, + "osie_y retained in previous page link" ); + like( $output, qr/search.cgi\?.*osie_dist=1500.*Previous.*results/s, + "osie_dist retained in previous page link" ); } # Test with UTM. @@ -105,7 +119,7 @@ $config->geo_handler( 3 ); my $search = OpenGuides::Search->new( config => $config ); - foreach my $i ( 1 .. 30 ) { + foreach my $i ( 1 .. 50 ) { OpenGuides::Test->write_data( guide => $guide, node => "London Aquarium $i", @@ -120,6 +134,7 @@ latlong_dist => 1500, latitude => 51.5, longitude => -0.12, + next => 21, }, ); like( $output, qr/search.cgi\?.*latitude=51.5.*Next.*results/s, @@ -128,4 +143,10 @@ "longitude retained in next page link" ); like( $output, qr/search.cgi\?.*latlong_dist=1500.*Next.*results/s, "latlong_dist retained in next page link" ); + like( $output, qr/search.cgi\?.*latitude=51.5.*Previous.*results/s, + "latitude retained in previous page link" ); + like( $output, qr/search.cgi\?.*longitude=-0.12.*Previous.*results/s, + "longitude retained in previous page link" ); + like( $output, qr/search.cgi\?.*latlong_dist=1500.*Previous.*results/s, + "latlong_dist retained in previous page link" ); } Modified: trunk/templates/search.tt =================================================================== --- trunk/templates/search.tt 2008-12-21 18:30:45 UTC (rev 1254) +++ trunk/templates/search.tt 2009-02-21 18:19:00 UTC (rev 1255) @@ -80,7 +80,7 @@ <p> Matches [% first_num %] - [% last_num %] of [% total_num %]. [% IF (first_num > 20) %] - <a href="search.cgi?search=[% search_terms %];next=[% first_num - 21 %]">Previous 20 results</a> + <a href="search.cgi?search=[% search_terms %];[% dist_field %]=[% dist %];[% coord_field_1 %]=[% coord_field_1_value %];[% coord_field_2 %]=[% coord_field_2_value %];next=[% first_num - 21 %]">Previous 20 results</a> [% END %] [% IF ((first_num > 20) and next_page_startpos) %] /

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits