openguides-commits April 2012

openguides-commits@lists.openguides.org

1 participants
55 discussions

r1321 - branches/rel_0_66
by svnadmin＠urchin.earth.li 03 Apr '12

03 Apr '12

Author: bob Date: 2012-04-03 14:48:52 +0100 (Tue, 03 Apr 2012) New Revision: 1321 Modified: branches/rel_0_66/Build.PL Log: Lots of tests fail if we dont have Geo::Coordinates::OSGB. So adding as an explicit dependency. Modified: branches/rel_0_66/Build.PL =================================================================== --- branches/rel_0_66/Build.PL 2012-04-02 22:52:08 UTC (rev 1320) +++ branches/rel_0_66/Build.PL 2012-04-03 13:48:52 UTC (rev 1321) @@ -297,7 +297,7 @@ $drivers{$dbtype} => 0, 'File::Spec::Functions' => 0, 'File::Temp' => 0, - 'Geo::Coordinates::UTM' => 0, + 'Geo::Coordinates::UTM' => 0, 'HTML::Entities' => 0, 'LWP::Simple' => 0, 'MIME::Lite' => 0, @@ -311,6 +311,7 @@ 'Data::Validate::URI' => 0, 'Net::Netmask' => 0, 'List::Util' => 0, + 'Geo::Coordinates::OSGB' => 0, }, build_requires => { 'Module::Build' => '0.26', # API change for accessing config data

1 0

r1320 - in branches/rel_0_66: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 02 Apr '12

02 Apr '12

Author: bob Date: 2012-04-02 23:52:08 +0100 (Mon, 02 Apr 2012) New Revision: 1320 Modified: branches/rel_0_66/lib/OpenGuides.pm branches/rel_0_66/lib/OpenGuides/CGI.pm branches/rel_0_66/lib/OpenGuides/Search.pm branches/rel_0_66/lib/OpenGuides/Template.pm branches/rel_0_66/wiki.cgi Log: version bumps and copyright changes for a new release. Modified: branches/rel_0_66/lib/OpenGuides/CGI.pm =================================================================== --- branches/rel_0_66/lib/OpenGuides/CGI.pm 2012-04-02 22:28:32 UTC (rev 1319) +++ branches/rel_0_66/lib/OpenGuides/CGI.pm 2012-04-02 22:52:08 UTC (rev 1320) @@ -1,7 +1,7 @@ package OpenGuides::CGI; use strict; use vars qw( $VERSION ); -$VERSION = '0.09'; +$VERSION = '0.10'; use Carp qw( croak ); use CGI::Cookie; @@ -443,7 +443,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2012 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: branches/rel_0_66/lib/OpenGuides/Search.pm =================================================================== --- branches/rel_0_66/lib/OpenGuides/Search.pm 2012-04-02 22:28:32 UTC (rev 1319) +++ branches/rel_0_66/lib/OpenGuides/Search.pm 2012-04-02 22:52:08 UTC (rev 1320) @@ -1,6 +1,6 @@ package OpenGuides::Search; use strict; -our $VERSION = '0.13'; +our $VERSION = '0.14'; use CGI qw( :standard ); use Wiki::Toolkit::Plugin::Locator::Grid; @@ -827,7 +827,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2012 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. Modified: branches/rel_0_66/lib/OpenGuides/Template.pm =================================================================== --- branches/rel_0_66/lib/OpenGuides/Template.pm 2012-04-02 22:28:32 UTC (rev 1319) +++ branches/rel_0_66/lib/OpenGuides/Template.pm 2012-04-02 22:52:08 UTC (rev 1320) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.15'; +$VERSION = '0.16'; use Carp qw( croak ); use CGI; # want to get rid of this and put the burden on the templates @@ -649,7 +649,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2012 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: branches/rel_0_66/lib/OpenGuides.pm =================================================================== --- branches/rel_0_66/lib/OpenGuides.pm 2012-04-02 22:28:32 UTC (rev 1319) +++ branches/rel_0_66/lib/OpenGuides.pm 2012-04-02 22:52:08 UTC (rev 1320) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.65'; +$VERSION = '0.66'; =head1 NAME @@ -2338,7 +2338,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2010 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2012 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. Modified: branches/rel_0_66/wiki.cgi =================================================================== --- branches/rel_0_66/wiki.cgi 2012-04-02 22:28:32 UTC (rev 1319) +++ branches/rel_0_66/wiki.cgi 2012-04-02 22:52:08 UTC (rev 1320) @@ -4,7 +4,7 @@ use warnings; use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.65'; +$VERSION = '0.66'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r1319 - branches
by svnadmin＠urchin.earth.li 02 Apr '12

02 Apr '12

Author: bob Date: 2012-04-02 23:28:32 +0100 (Mon, 02 Apr 2012) New Revision: 1319 Added: branches/rel_0_66/ Log: release branch for 0.66

1 0

r1318 - trunk
by svnadmin＠urchin.earth.li 02 Apr '12

02 Apr '12

Author: kake Date: 2012-04-02 20:13:20 +0100 (Mon, 02 Apr 2012) New Revision: 1318 Modified: trunk/Changes Log: Added documentation of my previous commit to the Changes file. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-02 08:35:16 UTC (rev 1317) +++ trunk/Changes 2012-04-02 19:13:20 UTC (rev 1318) @@ -16,6 +16,7 @@ and locales, to avoid creating undeletable pages. Add an autocreate_content.tt template to include a map link in content for autocreated categories and locales (#275). + Make sure the show_missing_metadata action skips redirects. 0.65 28 February 2010 Fix some more broken POD and add POD unit test (#268)

1 0

r1317 - in trunk: lib t
by svnadmin＠urchin.earth.li 02 Apr '12

02 Apr '12

Author: kake Date: 2012-04-02 09:35:16 +0100 (Mon, 02 Apr 2012) New Revision: 1317 Modified: trunk/lib/OpenGuides.pm trunk/t/71_missing_metadata.t Log: Fixed bug where missing metadata search was picking up redirect pages. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-03-20 12:16:15 UTC (rev 1316) +++ trunk/lib/OpenGuides.pm 2012-04-02 08:35:16 UTC (rev 1317) @@ -2009,8 +2009,8 @@ =item B<show_missing_metadata> -Search for nodes which don't have a certain kind of metadata. Optionally -also excludes Locales and Categories +Search for nodes which don't have a certain kind of metadata. Excludes nodes +which are pure redirects, and optionally also excludes locales and categories. =cut @@ -2032,22 +2032,19 @@ # Only search if they supplied at least a metadata type if($metadata_type) { $done_search = 1; - @nodes = $wiki->list_nodes_by_missing_metadata( + my @all_nodes = $wiki->list_nodes_by_missing_metadata( metadata_type => $metadata_type, metadata_value => $metadata_value, ignore_case => 1, ); - # Do we need to filter some nodes out? - if($exclude_locales || $exclude_categories) { - my @all_nodes = @nodes; - @nodes = (); - - foreach my $node (@all_nodes) { - if($exclude_locales && $node =~ /^Locale /) { next; } - if($exclude_categories && $node =~ /^Category /) { next; } - push @nodes, $node; - } + # Filter out redirects; also filter out locales/categories if required. + foreach my $node ( @all_nodes ) { + next if ( $exclude_locales && $node =~ /^Locale / ); + next if ( $exclude_categories && $node =~ /^Category / ); + my $content = $wiki->retrieve_node( $node ); + next if OpenGuides::Utils->detect_redirect( content => $content ); + push @nodes, $node; } } Modified: trunk/t/71_missing_metadata.t =================================================================== --- trunk/t/71_missing_metadata.t 2012-03-20 12:16:15 UTC (rev 1316) +++ trunk/t/71_missing_metadata.t 2012-04-02 08:35:16 UTC (rev 1317) @@ -24,7 +24,9 @@ -# Add 3 different pages, one of which with two versions +# Add four different pages, one of which with two versions, one of which +# a redirect. The redirect should not show up on any "missing metadata" +# searches, regardless of the condition of the page it points to. $wiki->write_node( "Test Page", "foo", undef, { category => "Alpha", lat=>"" } ) or die "Couldn't write node"; @@ -44,8 +46,13 @@ $wiki->write_node( "Locale Bar", "foo version 2", $data{checksum}, { category => "Locales", lat=>"8.88" } ) or die "Couldn't write locale for the 2nd time"; +OpenGuides::Test->write_data( + guide => $guide, + node => "Redirect Test", + content => "#REDIRECT [[Test Page]]", + return_output => 1, + ); - # Try without search parameters my %ttvars = eval { $guide->show_missing_metadata( return_tt_vars=> 1 ); @@ -112,7 +119,7 @@ my $output = eval { $guide->show_missing_metadata( return_output=>1 ); }; -is( $@, "", "->how_missing_metadata doesn't die" ); +is( $@, "", "->show_missing_metadata doesn't die" ); like( $output, qr|Missing Metadata|, "Right page" ); like( $output, qr|Metadata Type|, "Has prompts" ); @@ -121,6 +128,6 @@ $output = eval { $guide->show_missing_metadata( return_output=>1, metadata_type=>'lat' ); }; -is( $@, "", "->how_missing_metadata doesn't die" ); +is( $@, "", "->show_missing_metadata doesn't die" ); like( $output, qr|<h3>Pages</h3>|, "searched" ); like( $output, qr|Test Page|, "had node" );

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits April 2012