openguides-commits April 2006

openguides-commits@lists.openguides.org

1 participants
33 discussions

r763 - in branches/move-to-wiki-toolkit: . lib lib/OpenGuides lib/OpenGuides/UK t
by svnadmin＠urchin.earth.li 10 Apr '06

10 Apr '06

Author: dom Date: 2006-04-10 18:36:16 +0100 (Mon, 10 Apr 2006) New Revision: 763 Modified: branches/move-to-wiki-toolkit/Build.PL branches/move-to-wiki-toolkit/Changes branches/move-to-wiki-toolkit/INSTALL branches/move-to-wiki-toolkit/PREREQUISITES branches/move-to-wiki-toolkit/README branches/move-to-wiki-toolkit/lib/OpenGuides.pm branches/move-to-wiki-toolkit/lib/OpenGuides/Build.pm branches/move-to-wiki-toolkit/lib/OpenGuides/Feed.pm branches/move-to-wiki-toolkit/lib/OpenGuides/RDF.pm branches/move-to-wiki-toolkit/lib/OpenGuides/Search.pm branches/move-to-wiki-toolkit/lib/OpenGuides/Template.pm branches/move-to-wiki-toolkit/lib/OpenGuides/Test.pm branches/move-to-wiki-toolkit/lib/OpenGuides/UK/PubCrawl.pm branches/move-to-wiki-toolkit/lib/OpenGuides/Utils.pm branches/move-to-wiki-toolkit/t/11_utils.t branches/move-to-wiki-toolkit/t/12_macros.t branches/move-to-wiki-toolkit/t/14_recent_changes_cookies.t branches/move-to-wiki-toolkit/t/15_template.t branches/move-to-wiki-toolkit/t/16_test_tester.t branches/move-to-wiki-toolkit/t/21_rdf.t branches/move-to-wiki-toolkit/t/22_rss_modwiki.t branches/move-to-wiki-toolkit/t/25_write_geo_data.t branches/move-to-wiki-toolkit/t/26_geo_data_search_form.t branches/move-to-wiki-toolkit/t/27_geo_data_edit_form.t branches/move-to-wiki-toolkit/t/28_wgs84_coords.t branches/move-to-wiki-toolkit/t/31_search.t branches/move-to-wiki-toolkit/t/32_search_simple_metadata.t branches/move-to-wiki-toolkit/t/33_search_advanced_search.t branches/move-to-wiki-toolkit/t/33_search_advanced_search_utm.t branches/move-to-wiki-toolkit/t/34_search_paging.t branches/move-to-wiki-toolkit/t/35_search_two_searches.t branches/move-to-wiki-toolkit/t/36_search_order.t branches/move-to-wiki-toolkit/t/37_search_summaries.t branches/move-to-wiki-toolkit/t/38_search_params.t branches/move-to-wiki-toolkit/t/39_search_form.t branches/move-to-wiki-toolkit/t/41_deletion.t branches/move-to-wiki-toolkit/t/51_display_node.t branches/move-to-wiki-toolkit/t/52_display_diffs.t branches/move-to-wiki-toolkit/t/53_show_index.t branches/move-to-wiki-toolkit/t/54_redirect.t branches/move-to-wiki-toolkit/t/55_node_history.t branches/move-to-wiki-toolkit/t/56_diffs_with_macros.t branches/move-to-wiki-toolkit/t/61_bug_textareas.t branches/move-to-wiki-toolkit/t/62_bug_trailing_whitespace.t branches/move-to-wiki-toolkit/t/63_bug_map_link_no_address.t branches/move-to-wiki-toolkit/t/64_bug_node_history.t branches/move-to-wiki-toolkit/t/65_bug_metadata_escape.t branches/move-to-wiki-toolkit/t/66_bug_latlong_representation.t branches/move-to-wiki-toolkit/t/67_bug_first_version.t branches/move-to-wiki-toolkit/wiki.cgi Log: Simple search and replace, should cover most things. Modified: branches/move-to-wiki-toolkit/Build.PL =================================================================== --- branches/move-to-wiki-toolkit/Build.PL 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/Build.PL 2006-04-10 17:36:16 UTC (rev 763) @@ -218,14 +218,14 @@ 'CGI' => '2.92', # avoid escapeHTML bug 'CGI::Carp' => 0, 'CGI::Cookie' => 0, - 'CGI::Wiki' => '0.62', # fixed delete version - 'CGI::Wiki::Formatter::UseMod' => '0.16', # macros - 'CGI::Wiki::Plugin::Atom' => 0, - 'CGI::Wiki::Plugin::Categoriser' => 0, - 'CGI::Wiki::Plugin::Diff' => '0.08', # earlier buggy - 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 - 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.09', # fixes date formatting bug - 'CGI::Wiki::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 + 'Wiki::Toolkit' => '0.62', # fixed delete version + 'Wiki::Toolkit::Formatter::UseMod' => '0.16', # macros + 'Wiki::Toolkit::Plugin::Atom' => 0, + 'Wiki::Toolkit::Plugin::Categoriser' => 0, + 'Wiki::Toolkit::Plugin::Diff' => '0.08', # earlier buggy + 'Wiki::Toolkit::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 + 'Wiki::Toolkit::Plugin::RSS::ModWiki' => '0.09', # fixes date formatting bug + 'Wiki::Toolkit::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 'Class::Accessor' => 0, 'Config::Tiny' => 0, 'Data::Dumper' => 0, Modified: branches/move-to-wiki-toolkit/Changes =================================================================== --- branches/move-to-wiki-toolkit/Changes 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/Changes 2006-04-10 17:36:16 UTC (rev 763) @@ -74,7 +74,7 @@ Remove rogue ampersand that had crept into the RSS feed. 0.49 24 July 2005 - Add updated prerequisite on CGI::Wiki::Plugin::RSS::ModWiki (fixes + Add updated prerequisite on Wiki::Toolkit::Plugin::RSS::ModWiki (fixes a test failure) 0.48 24 July 2005 @@ -111,7 +111,7 @@ 0.47 15 January 2005 Fixed bug with list_all_versions for nodes with only one version. Extended config changes to examples/reindex.pl (thanks jimbo). - Now require CGI::Wiki 0.62 to fix bug with deleting versions. + Now require Wiki::Toolkit 0.62 to fix bug with deleting versions. Try to ensure that a .htaccess file protecting wiki.conf is installed. Allow for external URLs for Text Formatting help. Home node recent changes box now flags new entries. @@ -174,7 +174,7 @@ user-definable path, and their names are prefixed with custom_. This only affects you if you have used the custom template support introduced in 0.41. - Replace use of CGI::Wiki::Plugin::Geocache with improved node.tt. + Replace use of Wiki::Toolkit::Plugin::Geocache with improved node.tt. 0.41 21 September 2004 Added backlinks link to navbar. @@ -227,7 +227,7 @@ Fixed bug with node history comments not being HTML-escaped. 0.35 25 June 2004 - Forgot to add version prerequisite on CGI::Wiki. Don't use 0.34, + Forgot to add version prerequisite on Wiki::Toolkit. Don't use 0.34, use this. 0.34 25 June 2004 @@ -267,7 +267,7 @@ 0.31 09 May 2004 Created a new macro to allow the embedding of RSS feeds into - pages, using CGI::Wiki::Plugin::RSS::Reader. This allows you + pages, using Wiki::Toolkit::Plugin::RSS::Reader. This allows you to do this to produce a list of up to ten hyperlinks: @RSS [http://example.com/example.rss] @@ -316,7 +316,7 @@ Removed newlines from output of search box macro. - Reimplemented diffing using CGI::Wiki::Plugin::Diff as it seems the + Reimplemented diffing using Wiki::Toolkit::Plugin::Diff as it seems the change in 0.30 got lost. Removed OpenGuides::Diff.pm as we should not be distributing it. @@ -350,7 +350,7 @@ Removed pubcrawl stuff from distro for now - it doesn't really work. - Changed to use CGI::Wiki::Plugin::Diff instead of OpenGuides::Diff. + Changed to use Wiki::Toolkit::Plugin::Diff instead of OpenGuides::Diff. 0.29 8 November 2003 Expanded section in TROUBLESHOOTING about permissions problems. @@ -539,7 +539,7 @@ hardcoded). Also is now called as wiki.cgi?id=Node_Name;format=rdf 0.07 3 May 2003 - Require CGI::Wiki 0.32 to avoid bug (again a Bob find!) where + Require Wiki::Toolkit 0.32 to avoid bug (again a Bob find!) where committing a node with metadata but no content would die. Auto-created category/locale stub pages now added to Category Category Modified: branches/move-to-wiki-toolkit/INSTALL =================================================================== --- branches/move-to-wiki-toolkit/INSTALL 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/INSTALL 2006-04-10 17:36:16 UTC (rev 763) @@ -104,7 +104,7 @@ From version 0.39 of OpenGuides, you have the option of using Plucene to index your wiki instead of Search::InvertedIndex. If you answer yes to this question, you will need to make sure you have installed -both Plucene, and CGI::Wiki version 0.56 or later. +both Plucene, and Wiki::Toolkit version 0.56 or later. If you are changing to Plucene from Search::InvertedIndex, you will need to do two things: @@ -333,7 +333,7 @@ above; however since we only want one copy of the modules and CGI programs, it isn't appropriate to run them again. So we will make use of the utility program "cgi-wiki-setupdb" which is included with the -CGI::Wiki distribution. Documentation for this command can be found in +Wiki::Toolkit distribution. Documentation for this command can be found in its man page; run this with the appropriate arguments to create the new database. Modified: branches/move-to-wiki-toolkit/PREREQUISITES =================================================================== --- branches/move-to-wiki-toolkit/PREREQUISITES 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/PREREQUISITES 2006-04-10 17:36:16 UTC (rev 763) @@ -6,14 +6,14 @@ CGI (version 2.92 or later) CGI::Carp CGI::Cookie -CGI::Wiki (version 0.62 or later) -CGI::Wiki::Formatter::UseMod (version 0.16 or later) -CGI::Wiki::Plugin::Atom -CGI::Wiki::Plugin::Categoriser -CGI::Wiki::Plugin::Diff (version 0.08 or later) -CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) -CGI::Wiki::Plugin::RSS::ModWiki (version 0.09 or later) -CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later) +Wiki::Toolkit (version 0.62 or later) +Wiki::Toolkit::Formatter::UseMod (version 0.16 or later) +Wiki::Toolkit::Plugin::Atom +Wiki::Toolkit::Plugin::Categoriser +Wiki::Toolkit::Plugin::Diff (version 0.08 or later) +Wiki::Toolkit::Plugin::Locator::Grid (version 0.02 or later) +Wiki::Toolkit::Plugin::RSS::ModWiki (version 0.09 or later) +Wiki::Toolkit::Plugin::RSS::Reader (version 1.3 or later) Class::Accessor Config::Tiny Data::Dumper Modified: branches/move-to-wiki-toolkit/README =================================================================== --- branches/move-to-wiki-toolkit/README 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/README 2006-04-10 17:36:16 UTC (rev 763) @@ -22,7 +22,7 @@ SEE ALSO * http://london.openguides.org/, the first and biggest OpenGuides site. * http://openguides.org/, with a list of all live OpenGuides installs. - * CGI::Wiki, the Wiki toolkit which does the heavy lifting for + * Wiki::Toolkit, the Wiki toolkit which does the heavy lifting for OpenGuides FEEDBACK Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/Build.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/Build.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/Build.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -26,7 +26,7 @@ mysql => "MySQL", sqlite => "SQLite" ); - my $cgi_wiki_module = "CGI::Wiki::Setup::" . $cgi_wiki_exts{$dbtype}; + my $cgi_wiki_module = "Wiki::Toolkit::Setup::" . $cgi_wiki_exts{$dbtype}; eval "require $cgi_wiki_module"; die "There was a problem: $@" if $@; Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/Feed.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/Feed.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/Feed.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -5,8 +5,8 @@ use vars qw( $VERSION ); $VERSION = '0.01'; -use CGI::Wiki::Plugin::Atom; -use CGI::Wiki::Plugin::RSS::ModWiki; +use Wiki::Toolkit::Plugin::Atom; +use Wiki::Toolkit::Plugin::RSS::ModWiki; use Time::Piece; use URI::Escape; use Carp 'croak'; @@ -23,8 +23,8 @@ my $wiki = $args{wiki}; - unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) { - croak "No CGI::Wiki object supplied."; + unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { + croak "No Wiki::Toolkit object supplied."; } $self->{wiki} = $wiki; @@ -81,7 +81,7 @@ my $self = shift; unless ($self->{atom_maker}) { - $self->{atom_maker} = CGI::Wiki::Plugin::Atom->new( + $self->{atom_maker} = Wiki::Toolkit::Plugin::Atom->new( wiki => $self->{wiki}, site_name => $self->{site_name}, site_url => $self->{config}->script_url, @@ -102,7 +102,7 @@ my $self = shift; unless ($self->{rss_maker}) { - $self->{rss_maker} = CGI::Wiki::Plugin::RSS::ModWiki->new( + $self->{rss_maker} = Wiki::Toolkit::Plugin::RSS::ModWiki->new( wiki => $self->{wiki}, site_name => $self->{site_name}, site_url => $self->{config}->script_url, @@ -139,11 +139,11 @@ =head1 SYNOPSIS - use CGI::Wiki; + use Wiki::Toolkit; use OpenGuides::Config; use OpenGuides::Feed; - my $wiki = CGI::Wiki->new( ... ); + my $wiki = Wiki::Toolkit->new( ... ); my $config = OpenGuides::Config->new( file => "wiki.conf" ); my $feed = OpenGuides::Feed->new( wiki => $wiki, config => $config, @@ -166,19 +166,19 @@ config => $config, og_version => '1.0', ); -C<wiki> must be a L<CGI::Wiki> object and C<config> must be an +C<wiki> must be a L<Wiki::Toolkit> object and C<config> must be an L<OpenGuides::Config> object. Both of these arguments are mandatory. C<og_version> is an optional argument specifying the version of OpenGuides for inclusion in the feed. =item B<rss_maker> -Returns a raw L<CGI::Wiki::Plugin::RSS::ModWiki> object created with the values you +Returns a raw L<Wiki::Toolkit::Plugin::RSS::ModWiki> object created with the values you invoked this module with. =item B<atom_maker> -Returns a raw L<CGI::Wiki::Plugin::Atom> object created with the values you +Returns a raw L<Wiki::Toolkit::Plugin::Atom> object created with the values you invoked this module with. =item B<make_feed> @@ -215,7 +215,7 @@ =over 4 -=item * L<CGI::Wiki>, L<CGI::Wiki::Plugin::RSS::ModWiki> and L<CGI::Wiki::Plugin::Atom> +=item * L<Wiki::Toolkit>, L<Wiki::Toolkit::Plugin::RSS::ModWiki> and L<Wiki::Toolkit::Plugin::Atom> =item * L<http://openguides.org/> Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/RDF.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/RDF.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/RDF.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -5,7 +5,7 @@ use vars qw( $VERSION ); $VERSION = '0.09'; -use CGI::Wiki::Plugin::RSS::ModWiki; +use Wiki::Toolkit::Plugin::RSS::ModWiki; use Time::Piece; use URI::Escape; use Carp 'croak'; @@ -22,8 +22,8 @@ my $wiki = $args{wiki}; - unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) { - croak "No CGI::Wiki object supplied."; + unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { + croak "No Wiki::Toolkit object supplied."; } $self->{wiki} = $wiki; @@ -105,7 +105,7 @@ my $timestamp = $node_data{last_modified}; # Make a Time::Piece object. - my $timestamp_fmt = $CGI::Wiki::Store::Database::timestamp_fmt; + my $timestamp_fmt = $Wiki::Toolkit::Store::Database::timestamp_fmt; if ( $timestamp ) { my $time = Time::Piece->strptime($timestamp, $timestamp_fmt); @@ -212,11 +212,11 @@ =head1 SYNOPSIS - use CGI::Wiki; + use Wiki::Toolkit; use OpenGuides::Config; use OpenGuides::RDF; - my $wiki = CGI::Wiki->new( ... ); + my $wiki = Wiki::Toolkit->new( ... ); my $config = OpenGuides::Config->new( file => "wiki.conf" ); my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, config => $config ); @@ -234,7 +234,7 @@ my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, config => $config ); -C<wiki> must be a L<CGI::Wiki> object and C<config> must be an +C<wiki> must be a L<Wiki::Toolkit> object and C<config> must be an L<OpenGuides::Config> object. Both arguments mandatory. @@ -253,7 +253,7 @@ B<Note:> Some of the fields emitted by the RDF/XML generator are taken from the node metadata. The form of this metadata is I<not> mandated -by L<CGI::Wiki>. Your wiki application should make sure to store some or +by L<Wiki::Toolkit>. Your wiki application should make sure to store some or all of the following metadata when calling C<write_node>: =over 4 @@ -280,7 +280,7 @@ =over 4 -=item * L<CGI::Wiki> +=item * L<Wiki::Toolkit> =item * L<http://openguides.org/> Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/Search.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/Search.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/Search.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -3,7 +3,7 @@ our $VERSION = '0.10'; use CGI qw( :standard ); -use CGI::Wiki::Plugin::Locator::Grid; +use Wiki::Toolkit::Plugin::Locator::Grid; use File::Spec::Functions qw(:ALL); use OpenGuides::Template; use OpenGuides::Utils; @@ -64,7 +64,7 @@ %locator_params = ( x => "easting", y => "northing" ); } - my $locator = CGI::Wiki::Plugin::Locator::Grid->new( %locator_params ); + my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( %locator_params ); $wiki->register_plugin( plugin => $locator ); $self->{locator} = $locator; @@ -75,7 +75,7 @@ my $wiki = $search->wiki; -An accessor; returns the underlying L<CGI::Wiki> object. +An accessor; returns the underlying L<Wiki::Toolkit> object. =cut @@ -429,7 +429,7 @@ my %contents_res = $wiki->search_nodes( $phrase ); # Rationalise the scores a little. The scores returned by - # CGI::Wiki::Search::Plucene are simply a ranking. + # Wiki::Toolkit::Search::Plucene are simply a ranking. my $num_results = scalar keys %contents_res; foreach my $node ( keys %contents_res ) { $contents_res{$node} = int( $contents_res{$node} / $num_results ) + 1; Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/Template.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/Template.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/Template.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -228,9 +228,9 @@ ); Picks out things like categories, locales, phone number etc from -EITHER the metadata hash returned by L<CGI::Wiki> OR the query +EITHER the metadata hash returned by L<Wiki::Toolkit> OR the query parameters in a L<CGI> object, and packages them nicely for passing to -templates or storing in L<CGI::Wiki> datastore. If you supply both +templates or storing in L<Wiki::Toolkit> datastore. If you supply both C<metadata> and C<cgi_obj> then C<metadata> will take precedence, but don't do that. Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/Test.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/Test.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/Test.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -67,7 +67,7 @@ } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; return $config; Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/UK/PubCrawl.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/UK/PubCrawl.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/UK/PubCrawl.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -5,10 +5,10 @@ $VERSION = '0.02'; use Carp qw( croak ); -use CGI::Wiki::Plugin; -use CGI::Wiki::Plugin::Locator::UK; +use Wiki::Toolkit::Plugin; +use Wiki::Toolkit::Plugin::Locator::UK; -@ISA = qw( CGI::Wiki::Plugin ); +@ISA = qw( Wiki::Toolkit::Plugin ); =head1 NAME @@ -23,14 +23,14 @@ =head1 SYNOPSIS - use CGI::Wiki; - use CGI::Wiki::Plugin::Locator::UK; + use Wiki::Toolkit; + use Wiki::Toolkit::Plugin::Locator::UK; use OpenGuides::UK::PubCrawl; - my $wiki = CGI::Wiki->new( ... ); - my $locator = CGI::Wiki::Plugin::Locator::UK->new; + my $wiki = Wiki::Toolkit->new( ... ); + my $locator = Wiki::Toolkit::Plugin::Locator::UK->new; $wiki->register_plugin( plugin => $locator ); - my $categoriser = CGI::Wiki::Plugin::Categoriser->new; + my $categoriser = Wiki::Toolkit::Plugin::Categoriser->new; $wiki->register_plugin( plugin => $categoriser ); my $crawler = OpenGuides::UK::PubCrawl->new( @@ -50,8 +50,8 @@ my $crawler = OpenGuides::UK::PubCrawl->new( locator => $locator ); -Croaks unless a C<CGI::Wiki::Plugin::Locator::UK> object and a -C<CGI::Wiki::Plugin::Categoriser> object are supplied. +Croaks unless a C<Wiki::Toolkit::Plugin::Locator::UK> object and a +C<Wiki::Toolkit::Plugin::Categoriser> object are supplied. =cut @@ -59,12 +59,12 @@ my ($class, %args) = @_; my $locator = $args{locator} or croak "No locator parameter supplied"; - croak "Locator parameter is not a CGI::Wiki::Plugin::Locator::UK" - unless UNIVERSAL::isa( $locator, "CGI::Wiki::Plugin::Locator::UK" ); + croak "Locator parameter is not a Wiki::Toolkit::Plugin::Locator::UK" + unless UNIVERSAL::isa( $locator, "Wiki::Toolkit::Plugin::Locator::UK" ); my $categoriser = $args{categoriser} or croak "No categoriser parameter supplied"; - croak "Categoriser parameter is not a CGI::Wiki::Plugin::Categoriser" - unless UNIVERSAL::isa( $categoriser, "CGI::Wiki::Plugin::Categoriser" ); + croak "Categoriser parameter is not a Wiki::Toolkit::Plugin::Categoriser" + unless UNIVERSAL::isa( $categoriser, "Wiki::Toolkit::Plugin::Categoriser" ); my $self = { _locator => $locator, _categoriser => $categoriser }; bless $self, $class; Modified: branches/move-to-wiki-toolkit/lib/OpenGuides/Utils.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides/Utils.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides/Utils.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -5,9 +5,9 @@ $VERSION = '0.09'; use Carp qw( croak ); -use CGI::Wiki; -use CGI::Wiki::Formatter::UseMod; -use CGI::Wiki::Plugin::RSS::Reader; +use Wiki::Toolkit; +use Wiki::Toolkit::Formatter::UseMod; +use Wiki::Toolkit::Plugin::RSS::Reader; use URI::Escape; =head1 NAME @@ -39,7 +39,7 @@ my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); Croaks unless an C<OpenGuides::Config> object is supplied. Returns a -C<CGI::Wiki> object made from the given config file on success, +C<Wiki::Toolkit> object made from the given config file on success, croaks if any other error occurs. The config file needs to define at least the following variables: @@ -77,7 +77,7 @@ sqlite => "SQLite", ); - my $cgi_wiki_module = "CGI::Wiki::Store::" . $cgi_wiki_exts{$dbtype}; + my $cgi_wiki_module = "Wiki::Toolkit::Store::" . $cgi_wiki_exts{$dbtype}; eval "require $cgi_wiki_module"; croak "Can't 'require' $cgi_wiki_module.\n" if $@; @@ -95,18 +95,18 @@ && ( lc($config->use_plucene) eq "y" || $config->use_plucene == 1 ) ) { - require CGI::Wiki::Search::Plucene; - $search = CGI::Wiki::Search::Plucene->new( + require Wiki::Toolkit::Search::Plucene; + $search = Wiki::Toolkit::Search::Plucene->new( path => $config->indexing_directory, ); } else { - require CGI::Wiki::Search::SII; + require Wiki::Toolkit::Search::SII; require Search::InvertedIndex::DB::DB_File_SplitHash; my $indexdb = Search::InvertedIndex::DB::DB_File_SplitHash->new( -map_name => $config->indexing_directory, -lock_mode => "EX" ); - $search = CGI::Wiki::Search::SII->new( indexdb => $indexdb ); + $search = Wiki::Toolkit::Search::SII->new( indexdb => $indexdb ); } # Make formatter. @@ -118,10 +118,10 @@ qq(<form action="$search_url" method="get"><input type="text" size="20" name="search"><input type="submit" name="Go" value="Search"></form>), qr/\@INDEX_LINK\s+\[\[(Category|Locale)\s+([^\]|]+)\|?([^\]]+)?\]\]/ => sub { - # We may be being called by CGI::Wiki::Plugin::Diff, + # We may be being called by Wiki::Toolkit::Plugin::Diff, # which doesn't know it has to pass us $wiki - and # we don't use it anyway. - if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) { + if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) { shift; # just throw it away } my $link_title = $_[2] || "View all pages in $_[0] $_[1]"; @@ -131,9 +131,9 @@ sub { my ($wiki, $type, $value) = @_; - # We may be being called by CGI::Wiki::Plugin::Diff, + # We may be being called by Wiki::Toolkit::Plugin::Diff, # which doesn't know it has to pass us $wiki - unless ( UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) { + unless ( UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { return "(unprocessed INDEX_LIST macro)"; } @@ -158,10 +158,10 @@ return $return; }, qr/\(a)RSS\s+(.+)/ => sub { - # We may be being called by CGI::Wiki::Plugin::Diff, + # We may be being called by Wiki::Toolkit::Plugin::Diff, # which doesn't know it has to pass us $wiki - and # we don't use it anyway. - if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) { + if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) { shift; # just throw it away } @@ -173,7 +173,7 @@ $url = $1; } - my $rss = CGI::Wiki::Plugin::RSS::Reader->new(url => $url); + my $rss = Wiki::Toolkit::Plugin::RSS::Reader->new(url => $url); my @items = $rss->retrieve; # Ten items only at this till. @@ -195,7 +195,7 @@ }, ); - my $formatter = CGI::Wiki::Formatter::UseMod->new( + my $formatter = Wiki::Toolkit::Formatter::UseMod->new( extended_links => 1, implicit_links => 0, allowed_tags => [qw(a p b strong i em pre small img table td @@ -212,7 +212,7 @@ search => $search, formatter => $formatter ); - my $wiki = CGI::Wiki->new( %conf ); + my $wiki = Wiki::Toolkit->new( %conf ); return $wiki; } Modified: branches/move-to-wiki-toolkit/lib/OpenGuides.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides.pm 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/lib/OpenGuides.pm 2006-04-10 17:36:16 UTC (rev 763) @@ -3,8 +3,8 @@ use Carp "croak"; use CGI; -use CGI::Wiki::Plugin::Diff; -use CGI::Wiki::Plugin::Locator::Grid; +use Wiki::Toolkit::Plugin::Diff; +use Wiki::Toolkit::Plugin::Locator::Grid; use OpenGuides::CGI; use OpenGuides::Feed; use OpenGuides::Template; @@ -50,18 +50,18 @@ my $geo_handler = $self->config->geo_handler; my $locator; if ( $geo_handler == 1 ) { - $locator = CGI::Wiki::Plugin::Locator::Grid->new( + $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( x => "os_x", y => "os_y" ); } elsif ( $geo_handler == 2 ) { - $locator = CGI::Wiki::Plugin::Locator::Grid->new( + $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( x => "osie_x", y => "osie_y" ); } else { - $locator = CGI::Wiki::Plugin::Locator::Grid->new( + $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( x => "easting", y => "northing" ); } $wiki->register_plugin( plugin => $locator ); $self->{locator} = $locator; - my $differ = CGI::Wiki::Plugin::Diff->new; + my $differ = Wiki::Toolkit::Plugin::Diff->new; $wiki->register_plugin( plugin => $differ ); $self->{differ} = $differ; return $self; @@ -69,7 +69,7 @@ =item B<wiki> -An accessor, returns the underlying L<CGI::Wiki> object. +An accessor, returns the underlying L<Wiki::Toolkit> object. =cut @@ -91,7 +91,7 @@ =item B<locator> -An accessor, returns the underlying L<CGI::Wiki::Plugin::Locator::UK> object. +An accessor, returns the underlying L<Wiki::Toolkit::Plugin::Locator::UK> object. =cut @@ -102,7 +102,7 @@ =item B<differ> -An accessor, returns the underlying L<CGI::Wiki::Plugin::Diff> object. +An accessor, returns the underlying L<Wiki::Toolkit::Plugin::Diff> object. =cut @@ -957,7 +957,7 @@ } $metadata{host} = $ENV{REMOTE_ADDR}; - # CGI::Wiki::Plugin::RSS::ModWiki wants "major_change" to be set. + # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set. $metadata{major_change} = ( $metadata{edit_type} eq "Normal edit" ) ? 1 : 0; @@ -1135,7 +1135,7 @@ =item * L<http://openguides.org/|The OpenGuides website>, with a list of all live OpenGuides installs. -=item * L<CGI::Wiki>, the Wiki toolkit which does the heavy lifting for OpenGuides +=item * L<Wiki::Toolkit>, the Wiki toolkit which does the heavy lifting for OpenGuides =back Modified: branches/move-to-wiki-toolkit/t/11_utils.t =================================================================== --- branches/move-to-wiki-toolkit/t/11_utils.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/11_utils.t 2006-04-10 17:36:16 UTC (rev 763) @@ -26,7 +26,7 @@ } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $wiki = eval { @@ -34,7 +34,7 @@ }; is( $@, "", "...but not with an OpenGuides::Config object with suitable data" ); - isa_ok( $wiki, "CGI::Wiki" ); + isa_ok( $wiki, "Wiki::Toolkit" ); ok( $wiki->store, "...and store defined" ); ok( $wiki->search_obj, "...and search defined" ); Modified: branches/move-to-wiki-toolkit/t/12_macros.t =================================================================== --- branches/move-to-wiki-toolkit/t/12_macros.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/12_macros.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 6; @@ -14,7 +14,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/14_recent_changes_cookies.t =================================================================== --- branches/move-to-wiki-toolkit/t/14_recent_changes_cookies.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/14_recent_changes_cookies.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::CGI; @@ -57,7 +57,7 @@ skip "DBD::SQLite not installed - no database to test with", 2 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -70,7 +70,7 @@ home_name => "Home", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/15_template.t =================================================================== --- branches/move-to-wiki-toolkit/t/15_template.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/15_template.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,7 +1,7 @@ use strict; use Cwd; use CGI::Cookie; -use CGI::Wiki::Formatter::UseMod; +use Wiki::Toolkit::Formatter::UseMod; use OpenGuides::Config; use OpenGuides::Template; use Test::MockObject; @@ -10,7 +10,7 @@ my $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com/', script_name => 'mywiki.cgi', default_country => 'United Kingdom', @@ -28,7 +28,7 @@ # object passed in, and I CBA to make a proper wiki object here. my $fake_wiki = Test::MockObject->new; $fake_wiki->mock("formatter", - sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } ); + sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); eval { OpenGuides::Template->output( wiki => $fake_wiki, config => $config ); }; @@ -74,7 +74,7 @@ template => "15_test.tt" ); -like( $output, qr/SITE NAME: CGI::Wiki Test Site/, "site_name var set" ); +like( $output, qr/SITE NAME: Wiki::Toolkit Test Site/, "site_name var set" ); like( $output, qr/CGI URL: mywiki.cgi/, "cgi_url var set" ); like( $output, qr/FULL CGI URL: http:\/\/wiki.example.com\/mywiki.cgi/, "full_cgi_url var set" ); @@ -116,7 +116,7 @@ $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com/', script_name => 'mywiki.cgi', formatting_rules_node => 'Some External Help', @@ -135,7 +135,7 @@ $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com/', script_name => '', } @@ -153,7 +153,7 @@ $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com', script_name => 'wiki.cgi', } Modified: branches/move-to-wiki-toolkit/t/16_test_tester.t =================================================================== --- branches/move-to-wiki-toolkit/t/16_test_tester.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/16_test_tester.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -20,7 +20,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->site_name( "Test Site" ); my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/21_rdf.t =================================================================== --- branches/move-to-wiki-toolkit/t/21_rdf.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/21_rdf.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Config; use OpenGuides::RDF; @@ -14,7 +14,7 @@ skip "DBD::SQLite not installed - no database to test with", 24 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -22,12 +22,12 @@ indexing_directory => "t/indexes", script_url => "http://wiki.example.com/", script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", + site_name => "Wiki::Toolkit Test Site", default_city => "London", default_country => "United Kingdom", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; @@ -80,7 +80,7 @@ like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" ); like( $rdfxml, - qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, + qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); like( $rdfxml, qr|<dc:contributor foaf:nick="Kake" />|, Modified: branches/move-to-wiki-toolkit/t/22_rss_modwiki.t =================================================================== --- branches/move-to-wiki-toolkit/t/22_rss_modwiki.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/22_rss_modwiki.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::RDF; @@ -12,7 +12,7 @@ exit 0; } -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { plan skip_all => "Plucene not installed"; exit 0; @@ -24,7 +24,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: branches/move-to-wiki-toolkit/t/25_write_geo_data.t =================================================================== --- branches/move-to-wiki-toolkit/t/25_write_geo_data.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/25_write_geo_data.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::Test; @@ -35,7 +35,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: branches/move-to-wiki-toolkit/t/26_geo_data_search_form.t =================================================================== --- branches/move-to-wiki-toolkit/t/26_geo_data_search_form.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/26_geo_data_search_form.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -40,7 +40,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: branches/move-to-wiki-toolkit/t/27_geo_data_edit_form.t =================================================================== --- branches/move-to-wiki-toolkit/t/27_geo_data_edit_form.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/27_geo_data_edit_form.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -41,7 +41,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: branches/move-to-wiki-toolkit/t/28_wgs84_coords.t =================================================================== --- branches/move-to-wiki-toolkit/t/28_wgs84_coords.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/28_wgs84_coords.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; Modified: branches/move-to-wiki-toolkit/t/31_search.t =================================================================== --- branches/move-to-wiki-toolkit/t/31_search.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/31_search.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -14,13 +14,13 @@ unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); # Plucene is the recommended searcher now. - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/32_search_simple_metadata.t =================================================================== --- branches/move-to-wiki-toolkit/t/32_search_simple_metadata.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/32_search_simple_metadata.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More tests => 10; @@ -15,7 +15,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -29,7 +29,7 @@ ); # Plucene is the recommended searcher now. - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/33_search_advanced_search.t =================================================================== --- branches/move-to-wiki-toolkit/t/33_search_advanced_search.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/33_search_advanced_search.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,6 +1,6 @@ use strict; -use CGI::Wiki::Plugin::Locator::Grid; # use directly to help debug -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Plugin::Locator::Grid; # use directly to help debug +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use OpenGuides::Test; @@ -26,7 +26,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { @@ -78,7 +78,7 @@ # Sanity check. print "# Distances should be:\n"; -my $locator = CGI::Wiki::Plugin::Locator::Grid->new(x => "os_x", y => "os_y"); +my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(x => "os_x", y => "os_y"); my $wiki = $guide->wiki; $wiki->register_plugin( plugin => $locator ); foreach my $node ( "Blue Anchor", "Crabtree Tavern", "Hammersmith Bridge"){ Modified: branches/move-to-wiki-toolkit/t/33_search_advanced_search_utm.t =================================================================== --- branches/move-to-wiki-toolkit/t/33_search_advanced_search_utm.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/33_search_advanced_search_utm.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use OpenGuides::Test; @@ -25,7 +25,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { Modified: branches/move-to-wiki-toolkit/t/34_search_paging.t =================================================================== --- branches/move-to-wiki-toolkit/t/34_search_paging.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/34_search_paging.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use OpenGuides::Test; @@ -20,7 +20,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: branches/move-to-wiki-toolkit/t/35_search_two_searches.t =================================================================== --- branches/move-to-wiki-toolkit/t/35_search_two_searches.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/35_search_two_searches.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -34,7 +34,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -49,7 +49,7 @@ ); # Plucene is the recommended searcher now. -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/36_search_order.t =================================================================== --- branches/move-to-wiki-toolkit/t/36_search_order.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/36_search_order.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -10,7 +10,7 @@ exit 0; } -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { plan skip_all => "Plucene not installed"; exit 0; @@ -22,7 +22,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: branches/move-to-wiki-toolkit/t/37_search_summaries.t =================================================================== --- branches/move-to-wiki-toolkit/t/37_search_summaries.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/37_search_summaries.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -14,7 +14,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -28,7 +28,7 @@ ); # Plucene is the recommended searcher now. - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/38_search_params.t =================================================================== --- branches/move-to-wiki-toolkit/t/38_search_params.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/38_search_params.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,6 +1,6 @@ use strict; use CGI; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -11,7 +11,7 @@ exit 0; } -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { plan skip_all => "Plucene not installed"; exit 0; @@ -36,7 +36,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: branches/move-to-wiki-toolkit/t/39_search_form.t =================================================================== --- branches/move-to-wiki-toolkit/t/39_search_form.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/39_search_form.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -40,7 +40,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: branches/move-to-wiki-toolkit/t/41_deletion.t =================================================================== --- branches/move-to-wiki-toolkit/t/41_deletion.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/41_deletion.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Formatter::UseMod; +use Wiki::Toolkit::Formatter::UseMod; use OpenGuides::Template; use OpenGuides::Test; use Test::MockObject; @@ -15,7 +15,7 @@ # info to make a proper wiki object here. my $fake_wiki = Test::MockObject->new; $fake_wiki->mock("formatter", - sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } ); + sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); my $output = OpenGuides::Template->output( wiki => $fake_wiki, Modified: branches/move-to-wiki-toolkit/t/51_display_node.t =================================================================== --- branches/move-to-wiki-toolkit/t/51_display_node.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/51_display_node.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use Test::More tests => 7; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 5 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -24,13 +24,13 @@ home_name => "Home", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); isa_ok( $guide, "OpenGuides" ); my $wiki = $guide->wiki; - isa_ok( $wiki, "CGI::Wiki" ); + isa_ok( $wiki, "Wiki::Toolkit" ); $wiki->write_node( "Test Page", "foo", undef, { source => "alternate.cgi?Test_Page" } ); my $output = eval { $guide->display_node( id => "Test Page", return_output => 1 ); Modified: branches/move-to-wiki-toolkit/t/52_display_diffs.t =================================================================== --- branches/move-to-wiki-toolkit/t/52_display_diffs.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/52_display_diffs.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 5; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 5 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; Modified: branches/move-to-wiki-toolkit/t/53_show_index.t =================================================================== --- branches/move-to-wiki-toolkit/t/53_show_index.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/53_show_index.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 6; @@ -11,14 +11,14 @@ skip "DBD::SQLite not installed - no database to test with", 6 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); $config->script_url( "http://example.com/" ); my $guide = OpenGuides->new( config => $config ); isa_ok( $guide, "OpenGuides" ); my $wiki = $guide->wiki; - isa_ok( $wiki, "CGI::Wiki" ); + isa_ok( $wiki, "Wiki::Toolkit" ); # Clear out the database from any previous runs. foreach my $del_node ( $wiki->list_all_nodes ) { Modified: branches/move-to-wiki-toolkit/t/54_redirect.t =================================================================== --- branches/move-to-wiki-toolkit/t/54_redirect.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/54_redirect.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use Test::More tests => 2; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 2 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -23,7 +23,7 @@ template_path => "./templates", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/55_node_history.t =================================================================== --- branches/move-to-wiki-toolkit/t/55_node_history.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/55_node_history.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 2; @@ -10,8 +10,8 @@ skip "DBD::SQLite not installed - no database to test with", 2 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "mywiki.cgi" ); $config->script_url( "http://example.com/" ); Modified: branches/move-to-wiki-toolkit/t/56_diffs_with_macros.t =================================================================== --- branches/move-to-wiki-toolkit/t/56_diffs_with_macros.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/56_diffs_with_macros.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use File::Temp qw( tempfile ); use OpenGuides; use OpenGuides::Test; @@ -16,7 +16,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/61_bug_textareas.t =================================================================== --- branches/move-to-wiki-toolkit/t/61_bug_textareas.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/61_bug_textareas.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Template; use OpenGuides::Test; use OpenGuides::Utils; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); Modified: branches/move-to-wiki-toolkit/t/62_bug_trailing_whitespace.t =================================================================== --- branches/move-to-wiki-toolkit/t/62_bug_trailing_whitespace.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/62_bug_trailing_whitespace.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::Template; @@ -16,7 +16,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/63_bug_map_link_no_address.t =================================================================== --- branches/move-to-wiki-toolkit/t/63_bug_map_link_no_address.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/63_bug_map_link_no_address.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 1; @@ -10,8 +10,8 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/64_bug_node_history.t =================================================================== --- branches/move-to-wiki-toolkit/t/64_bug_node_history.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/64_bug_node_history.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; use OpenGuides; @@ -11,8 +11,8 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -20,11 +20,11 @@ indexing_directory => "t/indexes", script_url => "http://wiki.example.com/", script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", + site_name => "Wiki::Toolkit Test Site", template_path => cwd . "/templates", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/65_bug_metadata_escape.t =================================================================== --- branches/move-to-wiki-toolkit/t/65_bug_metadata_escape.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/65_bug_metadata_escape.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; use OpenGuides; @@ -10,8 +10,8 @@ } else { plan tests => 1; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -19,11 +19,11 @@ indexing_directory => "t/indexes", script_url => "http://wiki.example.com/", script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", + site_name => "Wiki::Toolkit Test Site", template_path => cwd . "/templates", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/66_bug_latlong_representation.t =================================================================== --- branches/move-to-wiki-toolkit/t/66_bug_latlong_representation.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/66_bug_latlong_representation.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,6 +1,6 @@ use strict; use CGI; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::CGI; use OpenGuides; @@ -23,7 +23,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -40,7 +40,7 @@ ); # Plucene is the recommended searcher now. -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/t/67_bug_first_version.t =================================================================== --- branches/move-to-wiki-toolkit/t/67_bug_first_version.t 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/t/67_bug_first_version.t 2006-04-10 17:36:16 UTC (rev 763) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::Template; @@ -16,7 +16,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: branches/move-to-wiki-toolkit/wiki.cgi =================================================================== --- branches/move-to-wiki-toolkit/wiki.cgi 2006-04-10 17:31:28 UTC (rev 762) +++ branches/move-to-wiki-toolkit/wiki.cgi 2006-04-10 17:36:16 UTC (rev 763) @@ -8,7 +8,7 @@ use CGI qw/:standard/; use CGI::Carp qw(croak); -use CGI::Wiki; +use Wiki::Toolkit; use Geography::NationalGrid; use Geography::NationalGrid::GB; use OpenGuides;

1 0

r762 - branches
by svnadmin＠urchin.earth.li 10 Apr '06

10 Apr '06

Author: dom Date: 2006-04-10 18:31:28 +0100 (Mon, 10 Apr 2006) New Revision: 762 Added: branches/move-to-wiki-toolkit/ Log: Create testing branch. Copied: branches/move-to-wiki-toolkit (from rev 761, trunk)

1 0

r761 - trunk/lib
by svnadmin＠urchin.earth.li 08 Apr '06

08 Apr '06

Author: dom Date: 2006-04-08 10:14:26 +0100 (Sat, 08 Apr 2006) New Revision: 761 Modified: trunk/lib/OpenGuides.pm Log: Use -svn marker in version text for unreleased versions. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-08 09:03:14 UTC (rev 760) +++ trunk/lib/OpenGuides.pm 2006-04-08 09:14:26 UTC (rev 761) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.53'; +$VERSION = '0.53-svn'; =head1 NAME

1 0

r760 - utils
by svnadmin＠urchin.earth.li 08 Apr '06

08 Apr '06

Author: dom Date: 2006-04-08 10:03:14 +0100 (Sat, 08 Apr 2006) New Revision: 760 Modified: utils/get-guide-versions Log: Support DOAP Modified: utils/get-guide-versions =================================================================== --- utils/get-guide-versions 2006-04-08 03:50:54 UTC (rev 759) +++ utils/get-guide-versions 2006-04-08 09:03:14 UTC (rev 760) @@ -4,7 +4,8 @@ use strict; use warnings; -use WWW::Mechanize; +use XML::Simple; +use LWP::UserAgent; my $out = "/srv/www/dev.openguides.org/html/static/versions.html"; @@ -25,28 +26,51 @@ 'Victoria, BC' => 'http://victoria.openguides.org/', 'Boston, MA' => 'http://boston.openguides.org/', 'Saint Paul, MN' => 'http://saintpaul.openguides.org/', - 'The Tourist Engineer' => 'http://engineer.openguides.org/' + 'The Tourist Engineer' => 'http://engineer.openguides.org/', + "Earle's testing" => 'http://openguides.org/testing/' ); -my $mech = WWW::Mechanize->new(agent => "OpenGuides get-guide-versions", - autocheck => 1); +my $ua = LWP::UserAgent->new(agent => "OpenGuides get-guide-versions"); open OUT, ">$out" or die $!; print OUT "<html><head><title>Versions of OpenGuides in use</title></head>\n"; -print OUT "<body><table>\n"; +print OUT "<body>\n"; +print OUT "Last updated: " . scalar(localtime(time)) . "\n"; +print OUT "<table>\n"; -foreach my $guide (keys %guides) { +foreach my $guide (sort keys %guides) { print OUT "<tr><td><a href=\"$guides{$guide}\">$guide</td><td>"; - $mech->add_header( Referer => undef ); - $mech->get($guides{$guide}); - my $content = $mech->content; - if ($content =~ /version.(0\.\d+)/s) { - print OUT $1; - } else { - print OUT "Not found"; + + # Try DOAP + my $success = 0; + my $response = $ua->get("$guides{$guide}?action=about;format=rdf"); + if ($response->is_success) { + my $doap = eval { XMLin($response->content)} ; + if ($@) { + # fall through + } else { + if (my $version = eval { $doap->{Project}->{release}->{Version}->{revision} }) { + print OUT "$version (DOAP)"; + $success++; + } + } } - print OUT "</td></tr>\n"; + if ($success == 0) { + $response = $ua->get($guides{$guide}); + if ($response->is_success) { + my $content = $response->content; + if ($content =~ /version.(0\.\d+)/s) { + print OUT $1; + } else { + print OUT "Not found"; + } + print OUT " (HTML)"; + } else { + print "No methods worked"; + } + print OUT "</td></tr>\n"; + } } print OUT "</table></body></html>\n";

1 0

r759 - trunk
by svnadmin＠urchin.earth.li 08 Apr '06

08 Apr '06

Author: earle Date: 2006-04-08 04:50:54 +0100 (Sat, 08 Apr 2006) New Revision: 759 Modified: trunk/Changes Log: Add pointer to dev.openguides.org Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-08 03:40:52 UTC (rev 758) +++ trunk/Changes 2006-04-08 03:50:54 UTC (rev 759) @@ -1,3 +1,5 @@ +"#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. + 0.53 Miscellanous fixes for mod_perl. #42 New "About" screen. Try action=about and action=about;format=rdf.

1 0

r758 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 08 Apr '06

08 Apr '06

Author: earle Date: 2006-04-08 04:40:52 +0100 (Sat, 08 Apr 2006) New Revision: 758 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/templates/footer.tt Log: New about screen (action=about) and DOAP data screen (action=about;format=rdf). Link to same in footer template. Closes #42. Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-08 02:04:44 UTC (rev 757) +++ trunk/Changes 2006-04-08 03:40:52 UTC (rev 758) @@ -1,5 +1,6 @@ 0.53 Miscellanous fixes for mod_perl. + #42 New "About" screen. Try action=about and action=about;format=rdf. #97 Use "summary" metadata to generate HTML meta descriptions. Support for Atom feeds for RecentChanges; new OpenGuides::Feed module to handle feed generation (code was previously in Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-08 02:04:44 UTC (rev 757) +++ trunk/lib/OpenGuides.pm 2006-04-08 03:40:52 UTC (rev 758) @@ -720,6 +720,148 @@ print $output; } +sub display_about { + my ($self, %args) = @_; + + my $output; + + if ($args{format} && $args{format} =~ /^rdf$/i) { + $output = qq{Content-Type: application/rdf+xml + +<?xml version="1.0" encoding="UTF-8"?> +<rdf:RDF xmlns = "http://usefulinc.com/ns/doap#" + xmlns:rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:foaf = "http://xmlns.com/foaf/0.1/"> +<Project rdf:ID="OpenGuides"> + <name>OpenGuides</name> + + <created>2003-04-29</created> + + <shortdesc xml:lang="en"> + A wiki engine for collaborative description of places with specialised + geodata metadata features. + </shortdesc> + + <description xml:lang="en"> + OpenGuides is a collaborative wiki environment, written in Perl, for + building guides and sharing information, as both human-readable text + and RDF. The engine contains a number of geodata-specific metadata + mechanisms such as locale search, node classification and integration + with Google Maps. + </description> + + <homepage rdf:resource="http://openguides.org/" /> + <mailing-list rdf:resource="http://openguides.org/mm/listinfo/openguides-dev/" /> + <mailing-list rdf:resource="http://urchin.earth.li/mailman/listinfo/openguides-commits/" /> + + <maintainer> + <foaf:Person> + <foaf:name>Dominic Hargreaves</foaf:name> + <foaf:homepage rdf:resource="http://www.larted.org.uk/~dom/" /> + </foaf:Person> + </maintainer> + + <repository> + <SVNRepository> + <location rdf:resource="https://urchin.earth.li/svn/openguides/" /> + <browse rdf:resource="http://dev.openguides.org/browser" /> + </SVNRepository> + </repository> + + <release> + <Version> + <revision>$VERSION</revision> + </Version> + </release> + + <download-page rdf:resource="http://search.cpan.org/dist/OpenGuides/" /> + +  + <category rdf:resource="http://freshmeat.net/browse/92/" /> + + <license rdf:resource="http://www.opensource.org/licenses/gpl-license.php" /> + <license rdf:resource="http://www.opensource.org/licenses/artistic-license.php" /> + +</Project> + +</rdf:RDF>}; + } + else { + my $site_name = $self->config->{site_name}; + my $script_url = $self->config->{script_url}; + $output = qq{Content-Type: text/html; charset=utf-8 + +<html> +<head> + <title>About $site_name</title> +<style type="text/css"> +body { margin: 0px; } +#content { padding: 50px; margin: auto; width: 50%; } +h1 { margin-bottom: 0px; font-style: italic; } +h2 { margin-top: 0px; } +#logo { text-align: center; } +#logo a img { border: 1px solid #000; } +#about { margin: 0em 0em 1em 0em; border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; } +#meta { font-size: small; text-align: center;} +</style> +<link rel="alternate" + type="application/rdf+xml" + title="DOAP (Description Of A Project) profile for this site's software" + href="$script_url?action=about;format=rdf" /> +</head> +<body> +<div id="content"> +<div id="logo"> +<a href="http://openguides.org/"><img +src="http://openguides.org/img/logo.jpg" alt="OpenGuides.org"></a> +<h1><a href="$script_url">$site_name</a></h1> +<h2>is powered by <a href="http://openguides.org/">OpenGuides</a> -<br> +the guides built by you.</h2> +<h3>version <a href="http://search.cpan.org/~dom/OpenGuides-$VERSION">$VERSION</a></h3> +</div> +<div id="about"> +<p> +<a href="http://www.w3.org/RDF/"><img +src="http://openguides.org/img/rdf_icon.png" width="44" height="48" +style="float: right; margin-left: 10px; border: 0px"></a> OpenGuides is a +web-based collaborative <a href="http://wiki.org/wiki.cgi?WhatIsWiki">wiki</a> +environment for building guides and sharing information, as both +human-readable text and <a href="http://www.w3.org/RDF/"><acronym +title="Resource Description Framework">RDF</acronym></a>. The engine contains +a number of geodata-specific metadata mechanisms such as locale search, node +classification and integration with <a href="http://maps.google.com/">Google +Maps</a>. +</p> +<p> +OpenGuides is written in <a href="http://www.perl.org/">Perl</a>, and is +made available under the same license as Perl itself (dual <a +href="http://dev.perl.org/licenses/artistic.html" title='The "Artistic Licence"'>Artistic</a> and <a +href="http://www.opensource.org/licenses/gpl-license.php"><acronym +title="GNU Public Licence">GPL</acronym></a>). Developer information for the +project is available from the <a href="http://dev.openguides.org/">OpenGuides +development site</a>. +</p> +<p> +Copyright ©2003-2006, <a href="http://openguides.org/">The OpenGuides +Project</a>. "OpenGuides", "[The] Open Guide To..." and "The guides built by +you" are trademarks of The OpenGuides Project. Any uses on this site are made +with permission. +</p> +</div> +<div id="meta"> +<a href="$script_url?action=about;format=rdf"><acronym +title="Description Of A Project">DOAP</acronym> RDF version of this +information</a> +</div> +</div> +</body> +</html>}; + } + + return $output if $args{return_output}; + print $output; +} + =item B<commit_node> $guide->commit_node( @@ -977,7 +1119,6 @@ return $cookie_data{$pref_name}; } -=back =head1 BUGS AND CAVEATS Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2006-04-08 02:04:44 UTC (rev 757) +++ trunk/templates/footer.tt 2006-04-08 03:40:52 UTC (rev 758) @@ -21,7 +21,7 @@ [% INCLUDE delete_link %] </p> <p> - This wiki powered by <a href="http://openguides.org/">OpenGuides</a> (version [% openguides_version %]). + Powered by <a href="[% full_cgi_url%]?action=about">OpenGuides [% openguides_version %]</a>. </p> [% END %]

1 0

r757 - trunk
by svnadmin＠urchin.earth.li 08 Apr '06

08 Apr '06

Author: earle Date: 2006-04-08 03:04:44 +0100 (Sat, 08 Apr 2006) New Revision: 757 Modified: trunk/Changes Log: Mention OpenGuides::Feed [753] and HTML meta description [97] changes. Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-07 13:06:16 UTC (rev 756) +++ trunk/Changes 2006-04-08 02:04:44 UTC (rev 757) @@ -1,5 +1,9 @@ 0.53 Miscellanous fixes for mod_perl. + #97 Use "summary" metadata to generate HTML meta descriptions. + Support for Atom feeds for RecentChanges; new OpenGuides::Feed + module to handle feed generation (code was previously in + OpenGuides::RDF). 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you

1 0

r756 - trunk/templates
by svnadmin＠urchin.earth.li 07 Apr '06

07 Apr '06

Author: earle Date: 2006-04-07 14:06:16 +0100 (Fri, 07 Apr 2006) New Revision: 756 Modified: trunk/templates/header.tt trunk/templates/home_node.tt Log: Use summary metadata field to populate 'description' HTML metadata element. Also remove unused template logic for 'keywords' metadata for now. Closes #97. Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2006-04-06 19:51:57 UTC (rev 755) +++ trunk/templates/header.tt 2006-04-07 13:06:16 UTC (rev 756) @@ -11,12 +11,9 @@ [% IF contact_email %] <link rev="made" href="mailto:[% contact_email %]" /> [% END %] - [% IF description %] - <meta name="description" content="[% description %]" /> + [% IF summary %] + <meta name="description" content="[% summary %]" /> [% END %] - [% IF keywords %] - <meta name="keywords" content="[% keywords %]" /> - [% END %] [% IF stylesheet %] <link rel="stylesheet" href="[% stylesheet %]" type="text/css" title="Stylesheet for [% site_name %]" /> [% END %] Modified: trunk/templates/home_node.tt =================================================================== --- trunk/templates/home_node.tt 2006-04-06 19:51:57 UTC (rev 755) +++ trunk/templates/home_node.tt 2006-04-07 13:06:16 UTC (rev 756) @@ -6,12 +6,9 @@ [% IF contact_email %] <link rev=made href="mailto:[% contact_email %]"> [% END %] - [% IF description %] - <meta name="description" content="[% description %]"> + [% IF summary %] + <meta name="description" content="[% summary %]"> [% END %] - [% IF keywords %] - <meta name="keywords" content="[% keywords %]"> - [% END %] [% IF stylesheet %] <link rel="stylesheet" href="[% stylesheet %]" type="text/css"> [% END %]

1 0

r755 - utils
by svnadmin＠urchin.earth.li 06 Apr '06

06 Apr '06

Author: dom Date: 2006-04-06 20:51:57 +0100 (Thu, 06 Apr 2006) New Revision: 755 Modified: utils/get-guide-versions Log: don't give out bogus referer headers. Modified: utils/get-guide-versions =================================================================== --- utils/get-guide-versions 2006-04-06 19:49:14 UTC (rev 754) +++ utils/get-guide-versions 2006-04-06 19:51:57 UTC (rev 755) @@ -38,6 +38,7 @@ foreach my $guide (keys %guides) { print OUT "<tr><td><a href=\"$guides{$guide}\">$guide</td><td>"; + $mech->add_header( Referer => undef ); $mech->get($guides{$guide}); my $content = $mech->content; if ($content =~ /version.(0\.\d+)/s) {

1 0

r754 - / utils
by svnadmin＠urchin.earth.li 06 Apr '06

06 Apr '06

Author: dom Date: 2006-04-06 20:49:14 +0100 (Thu, 06 Apr 2006) New Revision: 754 Added: utils/ utils/README utils/get-guide-versions Log: Add utils dir, with get-guide-versions in it. Added: utils/README =================================================================== --- utils/README 2006-04-05 01:26:00 UTC (rev 753) +++ utils/README 2006-04-06 19:49:14 UTC (rev 754) @@ -0,0 +1,2 @@ +This directory is for small bits and pieces that don't have anywhere else to +go. Use anything you find here at your own risk! Added: utils/get-guide-versions =================================================================== --- utils/get-guide-versions 2006-04-05 01:26:00 UTC (rev 753) +++ utils/get-guide-versions 2006-04-06 19:49:14 UTC (rev 754) @@ -0,0 +1,53 @@ +#!/usr/bin/perl +# +# Prints out a list of guides and the software versions they're using. + +use strict; +use warnings; +use WWW::Mechanize; + +my $out = "/srv/www/dev.openguides.org/html/static/versions.html"; + +my %guides = ( Birmingham => 'http://birmingham.openguides.org/', + Chester => 'http://chesterguide.org.uk/', + Cotswolds => 'http://cotswolds.openguides.org/', + Glasgow => 'http://glasgow.openguides.org/', + Lancaster => 'http://lancaster.openguides.org/', + London => 'http://london.openguides.org/', + Manchester => 'http://manchester.openguides.org/', + 'Milton Keynes' => 'http://miltonkeynes.openguides.org/', + Norwich => 'http://norwich.openguides.org/', + Nottingham => 'http://nottingham.openguides.org/', + Oxford => 'http://oxford.openguides.org/', + 'Vegan Oxford' => 'http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi', + Southampton => 'http://southampton.openguides.org/', + Vienna => 'http://vienna.openguides.org/', + 'Victoria, BC' => 'http://victoria.openguides.org/', + 'Boston, MA' => 'http://boston.openguides.org/', + 'Saint Paul, MN' => 'http://saintpaul.openguides.org/', + 'The Tourist Engineer' => 'http://engineer.openguides.org/' + ); + +my $mech = WWW::Mechanize->new(agent => "OpenGuides get-guide-versions", + autocheck => 1); + +open OUT, ">$out" or die $!; + +print OUT "<html><head><title>Versions of OpenGuides in use</title></head>\n"; +print OUT "<body><table>\n"; + +foreach my $guide (keys %guides) { + print OUT "<tr><td><a href=\"$guides{$guide}\">$guide</td><td>"; + $mech->get($guides{$guide}); + my $content = $mech->content; + if ($content =~ /version.(0\.\d+)/s) { + print OUT $1; + } else { + print OUT "Not found"; + } + print OUT "</td></tr>\n"; +} + +print OUT "</table></body></html>\n"; + +close OUT; Property changes on: utils/get-guide-versions ___________________________________________________________________ Name: svn:executable + *

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 2006