openguides-commits April 2006

openguides-commits@lists.openguides.org

1 participants
33 discussions

r773 - trunk
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 15:13:20 +0100 (Thu, 20 Apr 2006) New Revision: 773 Modified: trunk/Changes trunk/wiki.cgi Log: Fix RSS redirection (fixes #54) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 10:46:50 UTC (rev 772) +++ trunk/Changes 2006-04-20 14:13:20 UTC (rev 773) @@ -10,6 +10,7 @@ #107 Don't display partial http:// URL in preview. #93 Upgrade to new Google Maps API (for smaller javascript download) #103 Fix empty Category/Locale list bug. + #54 Fix RSS redirection for backwards compatibility. 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-20 10:46:50 UTC (rev 772) +++ trunk/wiki.cgi 2006-04-20 14:13:20 UTC (rev 773) @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl use strict; use warnings; @@ -114,7 +114,16 @@ $guide->display_node( id => 'RecentChanges' ); } } elsif ($action eq 'rss') { - print $q->redirect( $script_url . '?action=rc;format=rss' ); + my $redir_target = $script_url . $script_name . '?action=rc;format=rss'; + my %args = map { $_ => ( $q->param($_) || "" ) } + qw( feed items days ignore_minor_edits username + category locale ); + foreach my $arg (sort keys %args) { + if ($args{$arg} ne "") { + $redir_target .= ";$arg=$args{$arg}"; + } + } + print $q->redirect( $redir_target ); } else { # Default is to display a node. if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node );

1 0

r772 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 11:46:50 +0100 (Thu, 20 Apr 2006) New Revision: 772 Modified: trunk/Changes trunk/lib/OpenGuides/Template.pm Log: Fix empty category/locales (fixes #103) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 10:26:48 UTC (rev 771) +++ trunk/Changes 2006-04-20 10:46:50 UTC (rev 772) @@ -9,6 +9,7 @@ Generate URIs for locales and contributors in RDF output. #107 Don't display partial http:// URL in preview. #93 Upgrade to new Google Maps API (for smaller javascript download) + #103 Fix empty Category/Locale list bug. 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-20 10:26:48 UTC (rev 771) +++ trunk/lib/OpenGuides/Template.pm 2006-04-20 10:46:50 UTC (rev 772) @@ -262,9 +262,9 @@ } else { my $categories_text = $q->param('categories'); my $locales_text = $q->param('locales'); - @catlist = sort map { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space + @catlist = sort grep { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space split("\r\n", $categories_text); - @loclist = sort map { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space + @loclist = sort grep { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space split("\r\n", $locales_text); }

1 0

r771 - in trunk: . templates
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 11:26:48 +0100 (Thu, 20 Apr 2006) New Revision: 771 Modified: trunk/Changes trunk/templates/header.tt Log: Upgrade to new Gmaps API (closes #93) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 10:16:03 UTC (rev 770) +++ trunk/Changes 2006-04-20 10:26:48 UTC (rev 771) @@ -8,6 +8,7 @@ previously in OpenGuides::RDF). Generate URIs for locales and contributors in RDF output. #107 Don't display partial http:// URL in preview. + #93 Upgrade to new Google Maps API (for smaller javascript download) 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2006-04-20 10:16:03 UTC (rev 770) +++ trunk/templates/header.tt 2006-04-20 10:26:48 UTC (rev 771) @@ -26,7 +26,7 @@ <meta name="robots" content="noindex,nofollow" /> [% END %] [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - <script src="http://maps.google.com/maps?file=api&v=1&key=[% gmaps_api_key %]" type="text/javascript"></script> + <script src="http://maps.google.com/maps?file=api&v=2&key=[% gmaps_api_key %]" type="text/javascript"></script> [% END %] </head> <body>

1 0

r770 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 11:16:03 +0100 (Thu, 20 Apr 2006) New Revision: 770 Modified: trunk/Changes trunk/lib/OpenGuides/Template.pm Log: Fix broken URL preview (fixes #107) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 09:42:05 UTC (rev 769) +++ trunk/Changes 2006-04-20 10:16:03 UTC (rev 770) @@ -7,6 +7,7 @@ New OpenGuides::Feed module to handle feed generation (code was previously in OpenGuides::RDF). Generate URIs for locales and contributors in RDF output. + #107 Don't display partial http:// URL in preview. 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-20 09:42:05 UTC (rev 769) +++ trunk/lib/OpenGuides/Template.pm 2006-04-20 10:16:03 UTC (rev 770) @@ -281,7 +281,7 @@ my $website = $args{metadata} ? $metadata{website}[0] : $q->param("website"); my $formatted_website_text = ""; - if ( $website ) { + if ( $website && $website != "http://" ) { $formatted_website_text = $class->format_website_text( formatter => $formatter, text => $website

1 0

r769 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 10:42:05 +0100 (Thu, 20 Apr 2006) New Revision: 769 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm trunk/wiki.cgi Log: Revert changes using CGI::Wiki::Plugin::Atom pending CGI::Wiki/Wiki::Toolkit refactoring. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-04-20 09:38:32 UTC (rev 768) +++ trunk/Build.PL 2006-04-20 09:42:05 UTC (rev 769) @@ -220,7 +220,6 @@ '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 Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 09:38:32 UTC (rev 768) +++ trunk/Changes 2006-04-20 09:42:05 UTC (rev 769) @@ -4,9 +4,8 @@ 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 - OpenGuides::RDF). + New OpenGuides::Feed module to handle feed generation (code was + previously in OpenGuides::RDF). Generate URIs for locales and contributors in RDF output. 0.52 5 March 2006 Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-04-20 09:38:32 UTC (rev 768) +++ trunk/PREREQUISITES 2006-04-20 09:42:05 UTC (rev 769) @@ -8,7 +8,6 @@ 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) Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-04-20 09:38:32 UTC (rev 768) +++ trunk/lib/OpenGuides/Feed.pm 2006-04-20 09:42:05 UTC (rev 769) @@ -5,7 +5,6 @@ use vars qw( $VERSION ); $VERSION = '0.01'; -use CGI::Wiki::Plugin::Atom; use CGI::Wiki::Plugin::RSS::ModWiki; use Time::Piece; use URI::Escape; @@ -63,7 +62,6 @@ my %known_types = ( 'rss' => 1, - 'atom' => 1, ); croak "No feed type specified" unless $feed_type; @@ -72,32 +70,8 @@ if ($feed_type eq 'rss') { return $self->rss_maker->recent_changes(%args); } - elsif ($feed_type eq 'atom') { - return $self->atom_maker->recent_changes(%args); - } } -sub atom_maker { - my $self = shift; - - unless ($self->{atom_maker}) { - $self->{atom_maker} = CGI::Wiki::Plugin::Atom->new( - wiki => $self->{wiki}, - site_name => $self->{site_name}, - site_url => $self->{config}->script_url, - site_description => $self->{site_description}, - make_node_url => $self->{make_node_url}, - recent_changes_link => $self->{config}->script_url . '?action=rc', - atom_link => $self->{config}->script_url . '?action=rc&format=atom', - software_name => 'OpenGuides', - software_homepage => 'http://openguides.org/', - software_version => $self->{og_version}, - ); - } - - $self->{atom_maker}; -} - sub rss_maker { my $self = shift; @@ -132,7 +106,7 @@ =head1 DESCRIPTION -Produces RSS 1.0 and Atom 1.0 feeds for OpenGuides. Distributed and +Produces RSS 1.0 feeds for OpenGuides. Distributed and installed as part of the OpenGuides project, not intended for independent installation. This documentation is probably only useful to OpenGuides developers. @@ -176,11 +150,6 @@ Returns a raw L<CGI::Wiki::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 -invoked this module with. - =item B<make_feed> # Ten most recent changes in RSS format. @@ -190,15 +159,6 @@ feed_type => 'rss', ); print $rdf_writer->make_feed( %args ); - # All the changes made by bob in the past week, ignoring minor edits, in Atom. - $args{days} = 7; - $args{ignore_minor_edits = 1; - $args{filter_on_metadata} => { username => "bob" }; - - print "Content-Type: application/atom+xml\n"; - print "Last-Modified: " . $feed->feed_timestamp( %args ) . "\n\n"; - print $feed->make_feed( %args ); - =item B<feed_timestamp> print "Last-Modified: " . $feed->feed_timestamp( %args ) . "\n\n"; @@ -215,7 +175,7 @@ =over 4 -=item * L<CGI::Wiki>, L<CGI::Wiki::Plugin::RSS::ModWiki> and L<CGI::Wiki::Plugin::Atom> +=item * L<CGI::Wiki> and L<CGI::Wiki::Plugin::RSS::ModWiki> =item * L<http://openguides.org/> Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-20 09:38:32 UTC (rev 768) +++ trunk/lib/OpenGuides.pm 2006-04-20 09:42:05 UTC (rev 769) @@ -156,9 +156,6 @@ $tt_vars{"rss_".lc($type)."_url"} = $config->script_name . "?action=rc;format=rss;" . lc($type) . "=" . lc(CGI->escape($2)); - $tt_vars{"atom_".lc($type)."_url"} = - $config->script_name . "?action=rc;format=atom;" - . lc($type) . "=" . lc(CGI->escape($2)); } my %current_data = $wiki->retrieve_node( $id ); @@ -650,16 +647,8 @@ locale => "Hammersmith", ); - # All edits bob has made to pub pages in the last week in Atom format - $guide->display_feed( - feed_type => 'atom', - days => 7, - username => "bob", - category => "Pubs", - ); - C<feed_type> is a mandatory parameter. Supported values at present are -"rss" and "atom". +"rss". As with other methods, the C<return_output> parameter can be used to return the output instead of printing it to STDOUT. @@ -704,11 +693,7 @@ if ($feed_type eq 'rss') { $output = "Content-Type: application/rdf+xml\n"; - } - elsif ($feed_type eq 'atom') { - $output = "Content-Type: application/atom+xml\n"; - } - else { + } else { croak "Unknown feed type given: $feed_type"; } Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-20 09:38:32 UTC (rev 768) +++ trunk/wiki.cgi 2006-04-20 09:42:05 UTC (rev 769) @@ -110,12 +110,6 @@ } else { croak "Unknown RSS feed type '$feed'"; } - } elsif ($format && $format eq 'atom') { - my %args = map { $_ => ( $q->param($_) || "" ) } - qw( feed items days ignore_minor_edits username - category locale ); - $args{feed_type} = 'atom'; - $guide->display_feed( %args ); } else { $guide->display_node( id => 'RecentChanges' ); }

1 0

r768 - trunk/t
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 10:38:32 +0100 (Thu, 20 Apr 2006) New Revision: 768 Modified: trunk/t/21_rdf.t Log: Fix test broken by recent RDF changes. Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2006-04-11 02:22:18 UTC (rev 767) +++ trunk/t/21_rdf.t 2006-04-20 09:38:32 UTC (rev 768) @@ -83,7 +83,7 @@ qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); - like( $rdfxml, qr|<dc:contributor foaf:nick="Kake" />|, + like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" ); like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" );

1 0

r767 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 11 Apr '06

11 Apr '06

Author: earle Date: 2006-04-11 03:22:18 +0100 (Tue, 11 Apr 2006) New Revision: 767 Modified: trunk/lib/OpenGuides/RDF.pm Log: crschmidt pointed out that spaces in usernames would create invalid IDs Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2006-04-11 02:12:46 UTC (rev 766) +++ trunk/lib/OpenGuides/RDF.pm 2006-04-11 02:22:18 UTC (rev 767) @@ -112,6 +112,9 @@ $timestamp = $time->strftime("%Y-%m-%dT%H:%M:%S"); } + my $user_id = $username; + $user_id =~ s/ /_/g; + my $url = $self->{make_node_url}->( $node_name, $version ); my $version_indpt_url = $self->{make_node_url}->( $node_name ); my $rdf = qq{<?xml version="1.0"?> @@ -135,7 +138,7 @@ <dcterms:modified>$timestamp</dcterms:modified> <dc:contributor> - <foaf:Person rdf:ID="$username"> + <foaf:Person rdf:ID="$user_id"> <foaf:nick>$username</foaf:nick> </foaf:Person> </dc:contributor>

1 0

r766 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 11 Apr '06

11 Apr '06

Author: earle Date: 2006-04-11 03:12:46 +0100 (Tue, 11 Apr 2006) New Revision: 766 Modified: trunk/lib/OpenGuides/RDF.pm Log: Actually apply changes to this module that were alluded to in [765] Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2006-04-11 01:13:59 UTC (rev 765) +++ trunk/lib/OpenGuides/RDF.pm 2006-04-11 02:12:46 UTC (rev 766) @@ -133,7 +133,13 @@ <dc:title>} . $self->{site_name} . qq{: $node_name</dc:title> <dc:date>$timestamp</dc:date> <dcterms:modified>$timestamp</dcterms:modified> - <dc:contributor foaf:nick="$username" /> + + <dc:contributor> + <foaf:Person rdf:ID="$username"> + <foaf:nick>$username</foaf:nick> + </foaf:Person> + </dc:contributor> + <dc:source rdf:resource="$version_indpt_url" /> <wiki:version>$version</wiki:version> <foaf:topic rdf:resource="#obj" /> @@ -154,13 +160,19 @@ $rdf .= " <postalCode>$postcode</postalCode>\n" if $postcode; $rdf .= " <country>$country</country>\n" if $country; + foreach (@locales) + { + my $locale_id = $_; + $locale_id =~ s/ /_/g; + $rdf .= qq{ <foaf:based_near> - <wn:Neighborhood> + <wn:Neighborhood rdf:ID="$locale_id"> <dc:title>$_</dc:title> </wn:Neighborhood> - </foaf:based_near>\n} foreach @locales; - + </foaf:based_near>\n}; + } + if ( $latitude && $longitude ) { $rdf .= qq{ <geo:lat>$latitude</geo:lat>

1 0

r765 - in trunk: . lib
by svnadmin＠urchin.earth.li 11 Apr '06

11 Apr '06

Author: earle Date: 2006-04-11 02:13:59 +0100 (Tue, 11 Apr 2006) New Revision: 765 Modified: trunk/Changes trunk/lib/OpenGuides.pm Log: Generate URIs (rdf:IDs) for categories and contributors in RDF output Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-10 17:58:31 UTC (rev 764) +++ trunk/Changes 2006-04-11 01:13:59 UTC (rev 765) @@ -7,6 +7,7 @@ Support for Atom feeds for RecentChanges; new OpenGuides::Feed module to handle feed generation (code was previously in OpenGuides::RDF). + Generate URIs for locales and contributors in RDF output. 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-10 17:58:31 UTC (rev 764) +++ trunk/lib/OpenGuides.pm 2006-04-11 01:13:59 UTC (rev 765) @@ -755,21 +755,21 @@ <mailing-list rdf:resource="http://urchin.earth.li/mailman/listinfo/openguides-commits/" /> <maintainer> - <foaf:Person> + <foaf:Person rdf:ID="OpenGuidesMaintainer"> <foaf:name>Dominic Hargreaves</foaf:name> <foaf:homepage rdf:resource="http://www.larted.org.uk/~dom/" /> </foaf:Person> </maintainer> <repository> - <SVNRepository> + <SVNRepository rdf:ID="OpenGuidesSVN"> <location rdf:resource="https://urchin.earth.li/svn/openguides/" /> <browse rdf:resource="http://dev.openguides.org/browser" /> </SVNRepository> </repository> <release> - <Version> + <Version rdf:ID="OpenGuidesVersion"> <revision>$VERSION</revision> </Version> </release>

1 0

r764 - branches/move-to-wiki-toolkit/lib
by svnadmin＠urchin.earth.li 10 Apr '06

10 Apr '06

Author: dom Date: 2006-04-10 18:58:31 +0100 (Mon, 10 Apr 2006) New Revision: 764 Modified: branches/move-to-wiki-toolkit/lib/OpenGuides.pm Log: Tag this as a testing release. Modified: branches/move-to-wiki-toolkit/lib/OpenGuides.pm =================================================================== --- branches/move-to-wiki-toolkit/lib/OpenGuides.pm 2006-04-10 17:36:16 UTC (rev 763) +++ branches/move-to-wiki-toolkit/lib/OpenGuides.pm 2006-04-10 17:58:31 UTC (rev 764) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.53-svn'; +$VERSION = '0.53-svn-move-to-wiki-toolkit'; =head1 NAME

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