openguides-commits October 2005

openguides-commits@lists.openguides.org

1 participants
29 discussions

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 20:24:03 +0100 (Sun, 23 Oct 2005) New Revision: 702 Modified: trunk/Changes Log: make much more readable Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-23 19:09:38 UTC (rev 701) +++ trunk/Changes 2005-10-23 19:24:03 UTC (rev 702) @@ -1,25 +1,40 @@ 0.51 - When trying to view a non-existent node, you will now be presented - with a message asking if you want to create that node, rather than - a blank page. - New "summary" metadata field for one-line summaries of nodes. - Add summary field to RDF as dc:description. - Show node summary in search results. - New "format=raw" option for outputting wiki text of a node. - Add "address" field that was missing from the RDF node view. - Update URL for Dublin Core elements in RDF index view. - Locales, address and summary fields now XML-escaped properly. - Requirement on CGI::Wiki::Plugin::RSS::ModWiki bumped to 0.073 for - associated fix escaping node names in RSS feed. - Fix bug that was breaking coordinate entry fields on search page if lat/lon - was being used. - Replace underscores in node names in redirection message with spaces. - Redirection message now links to a rendered version of the old page - rather than the editing view. - Fix bug in OpenGuides::SuperSearch that wasn't passing "latitude" and - "longitude" values to the search template when a distance search - was being done. + Important changes: + * The preferred way to get RecentChanges is now to pass the CGI the + parameter "action=rc", rather than just using the page name + "RecentChanges". However, this method will still work for the time + being. Similarly, the URL parameter for the RecentChanges RSS feed + has changed from "action=rss" to "action=rc;format=rss". Requests + for the former will be redirected to the latter. + + New features: + * When trying to view a non-existent node, you will now be presented + with a message asking if you want to create that node, rather than + a blank page. + * New "summary" metadata field for one-line summaries of nodes: + - Add summary field to RDF as dc:description. + - Show node summary in search results. + * New "format=raw" option for outputting wiki text of a node. + RDF bugfixes: + * Locales, address and summary fields now XML-escaped properly. + (Requirement on CGI::Wiki::Plugin::RSS::ModWiki bumped to 0.073 for + associated fix escaping node names in RSS feed.) + * Add "address" field that was missing from the RDF node view. + * Update URL for Dublin Core elements in RDF index view. + + Search bugfixes: + * Fix bug that was breaking coordinate entry fields on search page if + lat/lon was being used. + * Fix bug in OpenGuides::SuperSearch that wasn't passing "latitude" and + "longitude" values to the search template when a distance search + was being done. + + Minor improvements: + * Replace underscores in node names in "redirected from" message with spaces. + * "Redirected from" message now links to a rendered version of the old page + rather than the editing view. + 0.50 2 October 2005 Remove rogue ampersand that had crept into the RSS feed. @@ -29,18 +44,18 @@ 0.48 24 July 2005 RDF enhancements: - Removed redundant "id" parameter specification from dc:source in + * Removed redundant "id" parameter specification from dc:source in rdf:Description in RDF node listings. - Fixed bug that was causing all nodes to be flagged as a + * Fixed bug that was causing all nodes to be flagged as a geo:SpatialThing whether they were or not. - Ensured that ampersands and greater/less than symbols were properly + * Ensured that ampersands and greater/less than symbols were properly escaped so as not to be XML-toxic. - Added geo:lat, geo:long and RSS link attributes to items in + * Added geo:lat, geo:long and RSS link attributes to items in category/locale listings to facilitate integration with mapping applications. - Added owl:sameAs property to RDF output for nodes that are redirects + * Added owl:sameAs property to RDF output for nodes that are redirects to other nodes. - RSS feed now has correct timestamp (matching most recent item) and + * RSS feed now has correct timestamp (matching most recent item) and matching Last-Modified HTTP header. Reorder navigation bar to provide more logical groupings. Add "format=plain" option for all-nodes index listing and associated

17 years, 11 months

r701 - trunk/templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 20:09:38 +0100 (Sun, 23 Oct 2005) New Revision: 701 Modified: trunk/templates/header.tt trunk/templates/home_node.tt trunk/templates/navbar.tt trunk/templates/recent_changes.tt Log: replace "?RecentChanges" with "action=rc" Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2005-10-23 19:00:10 UTC (rev 700) +++ trunk/templates/header.tt 2005-10-23 19:09:38 UTC (rev 701) @@ -24,9 +24,7 @@ <meta name="ICBM" content="[% latitude %], [% longitude %]" /> <meta name="DC.title" content="[% site_name %]" /> [% END %] - [% IF (node_name == 'RecentChanges') %] - <link rel="alternate" type="application/rss+xml" title="RSS feed for this page" href="[% full_cgi_url %]?action=rc;format=rss" /> - [% END %] + <link rel="alternate" type="application/rss+xml" title="[% site_name %] - Recent Changes (RSS 1.0)" href="[% full_cgi_url %]?action=rc;format=rss" /> [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %] Modified: trunk/templates/home_node.tt =================================================================== --- trunk/templates/home_node.tt 2005-10-23 19:00:10 UTC (rev 700) +++ trunk/templates/home_node.tt 2005-10-23 19:09:38 UTC (rev 701) @@ -29,7 +29,7 @@ <div id="maincontent"> <div id="recent"> -<h3>Ten most <a href="[% cgi_url %]?RecentChanges">recent changes</a> +<h3>Ten most <a href="[% cgi_url %]?action=rc">recent changes</a> (<a href="[% full_cgi_url %]?action=rc;format=rss">RSS</a>):</h3> <dl> Modified: trunk/templates/navbar.tt =================================================================== --- trunk/templates/navbar.tt 2005-10-23 19:00:10 UTC (rev 700) +++ trunk/templates/navbar.tt 2005-10-23 19:09:38 UTC (rev 701) @@ -7,7 +7,7 @@ <div class="navbar_group_title">Tools:</div> <ul> - <li><a href="[% full_cgi_url %]?RecentChanges">Recent Changes</a></li> + <li><a href="[% full_cgi_url %]?action=rc">Recent Changes</a></li> <li><a href="newpage.cgi">Create New Page</a></li> <li><a href="[% full_cgi_url %]?action=random">Random Page</a></li> <li><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a></li> Modified: trunk/templates/recent_changes.tt =================================================================== --- trunk/templates/recent_changes.tt 2005-10-23 19:00:10 UTC (rev 700) +++ trunk/templates/recent_changes.tt 2005-10-23 19:09:38 UTC (rev 701) @@ -10,9 +10,9 @@ [% END %] [% IF last_viewed %] - <p><a href="[% full_cgi_url %]?id=RecentChanges;since=[% last_viewed %]">View changes since your last visit to Recent Changes</a>.</p> + <p><a href="[% full_cgi_url %]?action=rc;since=[% last_viewed %]">View changes since your last visit to Recent Changes</a>.</p> [% ELSIF since %] - <p><a href="[% full_cgi_url %]?id=RecentChanges">View the regular Recent Changes page</a>.</p> + <p><a href="[% full_cgi_url %]?action=rc">View the regular Recent Changes page</a>.</p> [% END %] [% BLOCK changes %]

17 years, 11 months

r700 - in trunk: . lib templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 20:00:10 +0100 (Sun, 23 Oct 2005) New Revision: 700 Modified: trunk/lib/OpenGuides.pm trunk/templates/header.tt trunk/templates/home_node.tt trunk/templates/userstats.tt trunk/wiki.cgi Log: Change "action=rss" parameter to "action=rc;format=rss". Extract RecentChanges code in OpenGuides.pm to its own sub (display_recent_changes()). Fix references to old params in templates. Put redirect to URL with new parameters into wiki.cgi for old parameter. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-23 17:14:20 UTC (rev 699) +++ trunk/lib/OpenGuides.pm 2005-10-23 19:00:10 UTC (rev 700) @@ -153,7 +153,7 @@ $tt_vars{index_type} = lc($type); $tt_vars{index_value} = $2; $tt_vars{"rss_".lc($type)."_url"} = - $config->script_name . "?action=rss;" + $config->script_name . "?action=rc;format=rss;" . lc($type) . "=" . lc(CGI->escape($2)); } @@ -223,77 +223,7 @@ $tt_vars{current} = 1 unless $version; if ($id eq "RecentChanges") { - my $minor_edits = $self->get_cookie( "show_minor_edits_in_rc" ); - my %recent_changes; - my $q = CGI->new; - my $since = $q->param("since"); - if ( $since ) { - $tt_vars{since} = $since; - my $t = localtime($since); # overloaded by Time::Piece - $tt_vars{since_string} = $t->strftime; - my %criteria = ( since => $since ); - $criteria{metadata_was} = { edit_type => "Normal edit" } - unless $minor_edits; - my @rc = $self->{wiki}->list_recent_changes( %criteria ); - - @rc = map { - { - name => CGI->escapeHTML($_->{name}), - last_modified => CGI->escapeHTML($_->{last_modified}), - version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), - username => CGI->escapeHTML($_->{metadata}{username}[0]), - host => CGI->escapeHTML($_->{metadata}{host}[0]), - username_param => CGI->escape($_->{metadata}{username}[0]), - edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), - url => $config->script_name . "?" - . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), - } - } @rc; - if ( scalar @rc ) { - $recent_changes{since} = \@rc; - } - } else { - for my $days ( [0, 1], [1, 7], [7, 14], [14, 30] ) { - my %criteria = ( between_days => $days ); - $criteria{metadata_was} = { edit_type => "Normal edit" } - unless $minor_edits; - my @rc = $self->{wiki}->list_recent_changes( %criteria ); - - @rc = map { - { - name => CGI->escapeHTML($_->{name}), - last_modified => CGI->escapeHTML($_->{last_modified}), - version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), - username => CGI->escapeHTML($_->{metadata}{username}[0]), - host => CGI->escapeHTML($_->{metadata}{host}[0]), - username_param => CGI->escape($_->{metadata}{username}[0]), - edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), - url => $config->script_name . "?" - . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), - } - } @rc; - if ( scalar @rc ) { - $recent_changes{$days->[1]} = \@rc; - } - } - } - $tt_vars{recent_changes} = \%recent_changes; - my %processing_args = ( - id => $id, - template => "recent_changes.tt", - tt_vars => \%tt_vars, - ); - if ( !$since && $self->get_cookie("track_recent_changes_views") ) { - my $cookie = OpenGuides::CGI->make_recent_changes_cookie(config => $config ); - $processing_args{cookies} = $cookie; - $tt_vars{last_viewed} = OpenGuides::CGI->get_last_recent_changes_visit_from_cookie( config => $config ); - } - return %tt_vars if $args{return_tt_vars}; - my $output = $self->process_template( %processing_args ); - return $output if $return_output; - print $output; + $self->display_recent_changes(%args); } elsif ( $id eq $self->config->home_name ) { my @recent = $wiki->list_recent_changes( last_n_changes => 10, @@ -331,6 +261,95 @@ } } +=item B<display_recent_changes> + + $guide->display_recent_changes; + +As with other methods, the C<return_output> parameter can be used to +return the output instead of printing it to STDOUT. + +=cut + +sub display_recent_changes { + my ($self, %args) = @_; + my $config = $self->config; + my $wiki = $self->wiki; + my $minor_edits = $self->get_cookie( "show_minor_edits_in_rc" ); + my $id = $args{id} || $self->config->home_name; + my $return_output = $args{return_output} || 0; + my (%tt_vars, %recent_changes); + my $q = CGI->new; + my $since = $q->param("since"); + if ( $since ) { + $tt_vars{since} = $since; + my $t = localtime($since); # overloaded by Time::Piece + $tt_vars{since_string} = $t->strftime; + my %criteria = ( since => $since ); + $criteria{metadata_was} = { edit_type => "Normal edit" } + unless $minor_edits; + my @rc = $self->{wiki}->list_recent_changes( %criteria ); + + @rc = map { + { + name => CGI->escapeHTML($_->{name}), + last_modified => CGI->escapeHTML($_->{last_modified}), + version => CGI->escapeHTML($_->{version}), + comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + username => CGI->escapeHTML($_->{metadata}{username}[0]), + host => CGI->escapeHTML($_->{metadata}{host}[0]), + username_param => CGI->escape($_->{metadata}{username}[0]), + edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), + url => $config->script_name . "?" + . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), + } + } @rc; + if ( scalar @rc ) { + $recent_changes{since} = \@rc; + } + } else { + for my $days ( [0, 1], [1, 7], [7, 14], [14, 30] ) { + my %criteria = ( between_days => $days ); + $criteria{metadata_was} = { edit_type => "Normal edit" } + unless $minor_edits; + my @rc = $self->{wiki}->list_recent_changes( %criteria ); + + @rc = map { + { + name => CGI->escapeHTML($_->{name}), + last_modified => CGI->escapeHTML($_->{last_modified}), + version => CGI->escapeHTML($_->{version}), + comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + username => CGI->escapeHTML($_->{metadata}{username}[0]), + host => CGI->escapeHTML($_->{metadata}{host}[0]), + username_param => CGI->escape($_->{metadata}{username}[0]), + edit_type => CGI->escapeHTML($_->{metadata}{edit_type}[0]), + url => $config->script_name . "?" + . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), + } + } @rc; + if ( scalar @rc ) { + $recent_changes{$days->[1]} = \@rc; + } + } + } + $tt_vars{recent_changes} = \%recent_changes; + my %processing_args = ( + id => $id, + template => "recent_changes.tt", + tt_vars => \%tt_vars, + ); + if ( !$since && $self->get_cookie("track_recent_changes_views") ) { + my $cookie = + OpenGuides::CGI->make_recent_changes_cookie(config => $config ); + $processing_args{cookies} = $cookie; + $tt_vars{last_viewed} = OpenGuides::CGI->get_last_recent_changes_visit_from_cookie( config => $config ); + } + return %tt_vars if $args{return_tt_vars}; + my $output = $self->process_template( %processing_args ); + return $output if $return_output; + print $output; +} + =item B<display_diffs> $guide->display_diffs( Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2005-10-23 17:14:20 UTC (rev 699) +++ trunk/templates/header.tt 2005-10-23 19:00:10 UTC (rev 700) @@ -25,11 +25,8 @@ <meta name="DC.title" content="[% site_name %]" /> [% END %] [% IF (node_name == 'RecentChanges') %] - <link rel="alternate" type="application/rss+xml" title="RSS feed for this page" href="[% full_cgi_url %]?action=rss" /> + <link rel="alternate" type="application/rss+xml" title="RSS feed for this page" href="[% full_cgi_url %]?action=rc;format=rss" /> [% END %] - [% IF rss_link %] - <link rel="alternate" type="application/rss+xml" title="RSS feed for this page" href="[% rss_link %]" /> - [% END %] [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %] Modified: trunk/templates/home_node.tt =================================================================== --- trunk/templates/home_node.tt 2005-10-23 17:14:20 UTC (rev 699) +++ trunk/templates/home_node.tt 2005-10-23 19:00:10 UTC (rev 700) @@ -30,7 +30,7 @@ <div id="recent"> <h3>Ten most <a href="[% cgi_url %]?RecentChanges">recent changes</a> - (<a href="[% full_cgi_url %]?action=rss">RSS</a>):</h3> + (<a href="[% full_cgi_url %]?action=rc;format=rss">RSS</a>):</h3> <dl> [% FOREACH node = recent_changes %] Modified: trunk/templates/userstats.tt =================================================================== --- trunk/templates/userstats.tt 2005-10-23 17:14:20 UTC (rev 699) +++ trunk/templates/userstats.tt 2005-10-23 19:00:10 UTC (rev 700) @@ -38,10 +38,10 @@ [% IF username %] <h2>Personalised RSS feeds:</h2> <ul> - <li><a href="[% full_cgi_url %]?action=rss;username=[% CGI.escape(username) %];items=10">Last ten edits made by [% username %]</a></li> - <li><a href="[% full_cgi_url %]?action=rss;username=[% CGI.escape(username) %];items=20">Last twenty edits made by [% username %]</a></li> - <li><a href="[% full_cgi_url %]?action=rss;username=[% CGI.escape(username) %];items=10;ignore_minor_edits=1">Last ten edits made by [% username %], ignoring minor edits</a></li> - <li><a href="[% full_cgi_url %]?action=rss;username=[% CGI.escape(username) %];items=20;ignore_minor_edits=1">Last twenty edits made by [% username %], ignoring minor edits</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=10">Last ten edits made by [% username %]</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=20">Last twenty edits made by [% username %]</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=10;ignore_minor_edits=1">Last ten edits made by [% username %], ignoring minor edits</a></li> + <li><a href="[% full_cgi_url %]?action=rc;format=rss;username=[% CGI.escape(username) %];items=20;ignore_minor_edits=1">Last twenty edits made by [% username %], ignoring minor edits</a></li> </ul> [% END %] Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-10-23 17:14:20 UTC (rev 699) +++ trunk/wiki.cgi 2005-10-23 19:00:10 UTC (rev 700) @@ -1,10 +1,11 @@ #!/usr/local/bin/perl use strict; +use lib qw( /home/earle/openguides.org/testing/lib ); use warnings; use vars qw( $VERSION ); -$VERSION = '0.50'; +$VERSION = '0.51'; use CGI qw/:standard/; use CGI::Carp qw(croak); @@ -97,18 +98,24 @@ ); } elsif ($action eq 'list_all_versions') { $guide->list_all_versions( id => $node ); - } elsif ($action eq 'rss') { - my $feed = $q->param("feed"); - if ( !defined $feed or $feed eq "recent_changes" ) { - my %args = map { $_ => ( $q->param($_) || "" ) } - qw( feed items days ignore_minor_edits username - category locale ); - $guide->display_rss( %args ); - } elsif ( $feed eq "chef_dan" ) { - display_node_rdf( node => $node ); + } elsif ($action eq 'rc') { + if ($format && $format eq 'rss') { + my $feed = $q->param("feed"); + if ( !defined $feed or $feed eq "recent_changes" ) { + my %args = map { $_ => ( $q->param($_) || "" ) } + qw( feed items days ignore_minor_edits username + category locale ); + $guide->display_rss( %args ); + } elsif ( $feed eq "chef_dan" ) { + display_node_rdf( node => $node ); + } else { + croak "Unknown RSS feed type '$feed'"; + } } else { - croak "Unknown RSS feed type '$feed'"; + $guide->display_node( id => 'RecentChanges' ); } + } elsif ($action eq 'rss') { + print $q->redirect( $script_url . '?action=rc;format=rss' ); } else { # Default is to display a node. if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node ); @@ -119,7 +126,7 @@ ); } else { my $version = $q->param("version"); - my $other_ver = $q->param("diffversion"); + my $other_ver = $q->param("diffversion"); if ( $other_ver ) { $guide->display_diffs( id => $node,

17 years, 11 months

r699 - in trunk: . templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 18:14:20 +0100 (Sun, 23 Oct 2005) New Revision: 699 Modified: trunk/Changes trunk/templates/node.tt Log: new "make this node?" message Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-23 16:36:13 UTC (rev 698) +++ trunk/Changes 2005-10-23 17:14:20 UTC (rev 699) @@ -1,9 +1,12 @@ 0.51 - New "format=raw" option for outputting wiki text of a node. + When trying to view a non-existent node, you will now be presented + with a message asking if you want to create that node, rather than + a blank page. New "summary" metadata field for one-line summaries of nodes. Add summary field to RDF as dc:description. Show node summary in search results. - Add "address" field that had got missed out from the RDF. + New "format=raw" option for outputting wiki text of a node. + Add "address" field that was missing from the RDF node view. Update URL for Dublin Core elements in RDF index view. Locales, address and summary fields now XML-escaped properly. Requirement on CGI::Wiki::Plugin::RSS::ModWiki bumped to 0.073 for Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2005-10-23 16:36:13 UTC (rev 698) +++ trunk/templates/node.tt 2005-10-23 17:14:20 UTC (rev 699) @@ -22,6 +22,9 @@ <span class="node_name">[% node_name %]</span></em> </h2> [% END %] +[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] +We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">make +[% ELSE %] [% INCLUDE display_metadata.tt %]  @@ -94,6 +97,6 @@ versions.</a> [% END %] </div> - +[% END %] </div> [% INCLUDE footer.tt %]

17 years, 11 months

r698 - trunk

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 17:36:13 +0100 (Sun, 23 Oct 2005) New Revision: 698 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES Log: bump CGI::Wiki::Plugin::RSS::ModWiki requirement to 0.073 Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-10-23 14:45:00 UTC (rev 697) +++ trunk/Build.PL 2005-10-23 16:36:13 UTC (rev 698) @@ -45,14 +45,14 @@ } else { until ( $dbtype ) { my $def = $existing_config->dbtype; - $dbtype = Module::Build->prompt("\n$dbtype_qu", $def); - $dbtype = lc($dbtype); - $dbtype =~ s/^\s*//; - $dbtype =~ s/\s*$//; - unless ( $dbtype eq "postgres" or $dbtype eq "mysql" + $dbtype = Module::Build->prompt("\n$dbtype_qu", $def); + $dbtype = lc($dbtype); + $dbtype =~ s/^\s*//; + $dbtype =~ s/\s*$//; + unless ( $dbtype eq "postgres" or $dbtype eq "mysql" or $dbtype eq "sqlite" ) { - undef $dbtype; - } + undef $dbtype; + } } } @@ -94,8 +94,8 @@ ) { print "$var not relevant for SQLite... skipping...\n"; push @answers, { question => $qu, - variable => $var, - value => "not-used" }; + variable => $var, + value => "not-used" }; next; } @@ -120,9 +120,9 @@ $def = $def ? "y" : "n"; } $val = Module::Build->y_n("\n$qu ", $def); - } else { + } else { $val = Module::Build->prompt("\n$qu ", $def); - } + } } # Store install_directory so we can use it to suggest template paths. @@ -138,8 +138,8 @@ } push @answers, { question => $qu, - variable => $var, - value => $val }; + variable => $var, + value => $val }; } # Now deal with the geo stuff. @@ -157,12 +157,12 @@ my $choice; until ( $choice ) { my $def = $existing_config->geo_handler; - $choice = Module::Build->prompt("\n".$geo_handler_qu, $def); - $choice =~ s/^\s*//; - $choice =~ s/\s*$//; - unless ( $choice eq "1" or $choice eq "2" or $choice eq "3" ) { + $choice = Module::Build->prompt("\n".$geo_handler_qu, $def); + $choice =~ s/^\s*//; + $choice =~ s/\s*$//; + unless ( $choice eq "1" or $choice eq "2" or $choice eq "3" ) { undef $choice; - } + } } $geo_handler = $choice; } @@ -182,8 +182,8 @@ } else { my $def = $existing_config->ellipsoid; $ellipsoid = Module::Build->prompt("\n".$qu, $def); - $ellipsoid =~ s/^\s*//; - $ellipsoid =~ s/\s*$//; + $ellipsoid =~ s/^\s*//; + $ellipsoid =~ s/\s*$//; } push @answers, { question => $qu, @@ -214,32 +214,32 @@ license => "perl", requires => { 'Algorithm::Diff' => '0.13', # for sdiff - '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' => '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::Categoriser' => 0, - 'CGI::Wiki::Plugin::Diff' => '0.07', # earlier buggy - 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 - 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.072', # provides RSS timestamp + 'CGI::Wiki::Plugin::Diff' => '0.07', # earlier buggy + 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 + 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.073', # earlier doesn't escape XML properly 'CGI::Wiki::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 'Class::Accessor' => 0, - 'Config::Tiny' => 0, - 'Data::Dumper' => 0, + 'Config::Tiny' => 0, + 'Data::Dumper' => 0, $drivers{$dbtype} => 0, - 'File::Spec::Functions' => 0, + 'File::Spec::Functions' => 0, 'File::Temp' => 0, - 'Geography::NationalGrid' => 0, + 'Geography::NationalGrid' => 0, 'LWP::Simple' => 0, - 'Parse::RecDescent' => 0, - $search_module => 0, - 'Template' => 0, + 'Parse::RecDescent' => 0, + $search_module => 0, + 'Template' => 0, 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' - 'Time::Piece' => 0, - 'URI::Escape' => 0, + 'Time::Piece' => 0, + 'URI::Escape' => 0, 'XML::RSS' => 0, - }, + }, build_requires => { 'Module::Build' => '0.18', # earlier doesn't install script files }, @@ -259,13 +259,13 @@ [ "wiki.conf", "preferences.cgi", "supersearch.cgi", "newpage.cgi" ]; $build->{config}{__templates} = [ - "backlink_results.tt", - "banner.tt", + "backlink_results.tt", + "banner.tt", "delete_confirm.tt", "delete_done.tt", "delete_password_wrong.tt", "differences.tt", - "display_metadata.tt", + "display_metadata.tt", "edit_conflict.tt", "edit_form.tt", "error.tt", @@ -277,7 +277,7 @@ "node.tt", "node_history.tt", "openguides_information_boxes.tt", - "preferences.tt", + "preferences.tt", "rdf_index.tt", "recent_changes.tt", "search_results.tt", Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-23 14:45:00 UTC (rev 697) +++ trunk/Changes 2005-10-23 16:36:13 UTC (rev 698) @@ -6,6 +6,8 @@ Add "address" field that had got missed out from the RDF. Update URL for Dublin Core elements in RDF index view. Locales, address and summary fields now XML-escaped properly. + Requirement on CGI::Wiki::Plugin::RSS::ModWiki bumped to 0.073 for + associated fix escaping node names in RSS feed. Fix bug that was breaking coordinate entry fields on search page if lat/lon was being used. Replace underscores in node names in redirection message with spaces. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-10-23 14:45:00 UTC (rev 697) +++ trunk/PREREQUISITES 2005-10-23 16:36:13 UTC (rev 698) @@ -10,7 +10,7 @@ CGI::Wiki::Plugin::Categoriser CGI::Wiki::Plugin::Diff (version 0.07 or later) CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) -CGI::Wiki::Plugin::RSS::ModWiki (version 0.072 or later) +CGI::Wiki::Plugin::RSS::ModWiki (version 0.073 or later) CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later) Class::Accessor Config::Tiny

17 years, 11 months

r697 - in trunk: . lib/OpenGuides

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 15:45:00 +0100 (Sun, 23 Oct 2005) New Revision: 697 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm Log: locales also needed escaping; plus fixed strange mixture of array and reference Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-23 14:13:35 UTC (rev 696) +++ trunk/Changes 2005-10-23 14:45:00 UTC (rev 697) @@ -5,7 +5,7 @@ Show node summary in search results. Add "address" field that had got missed out from the RDF. Update URL for Dublin Core elements in RDF index view. - Address and summary fields now XML-escaped properly. + Locales, address and summary fields now XML-escaped properly. Fix bug that was breaking coordinate entry fields on search page if lat/lon was being used. Replace underscores in node names in redirection message with spaces. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-23 14:13:35 UTC (rev 696) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-23 14:45:00 UTC (rev 697) @@ -3,7 +3,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.08'; +$VERSION = '0.071'; use CGI::Wiki::Plugin::RSS::ModWiki; use Time::Piece; @@ -75,14 +75,14 @@ my $username = $node_data{metadata}{username}[0] || ''; my $os_x = $node_data{metadata}{os_x}[0] || ''; my $os_y = $node_data{metadata}{os_y}[0] || ''; - my $catrefs = $node_data{metadata}{category}; + my @categories = @{ $node_data{metadata}{category} || [] }; my @locales = @{ $node_data{metadata}{locale} || [] }; my $summary = $node_data{metadata}{summary}[0] || ''; # replace any errant characters in data to prevent illegal XML foreach ($phone, $fax, $website, $opening_hours_text, $address, $postcode, $city, $country, $latitude, $longitude, $version, $os_x, $os_y, - $catrefs, @locales, $summary) + @categories, @locales, $summary) { if ($_) { @@ -143,8 +143,8 @@ }; $rdf .= " <dc:description>$summary</dc:description>\n" if $summary; - $rdf .= "\n \n\n" if $catrefs; - $rdf .= " <dc:subject>$_</dc:subject>\n" foreach @{$catrefs}; + $rdf .= "\n \n\n" if @categories; + $rdf .= " <dc:subject>$_</dc:subject>\n" foreach @categories; if ($is_geospatial) {

17 years, 11 months

r696 - trunk

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 15:13:35 +0100 (Sun, 23 Oct 2005) New Revision: 696 Modified: trunk/Changes Log: mention RDF escaping fix Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-23 14:11:34 UTC (rev 695) +++ trunk/Changes 2005-10-23 14:13:35 UTC (rev 696) @@ -5,6 +5,7 @@ Show node summary in search results. Add "address" field that had got missed out from the RDF. Update URL for Dublin Core elements in RDF index view. + Address and summary fields now XML-escaped properly. Fix bug that was breaking coordinate entry fields on search page if lat/lon was being used. Replace underscores in node names in redirection message with spaces.

17 years, 11 months

r695 - trunk/lib/OpenGuides

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 15:11:34 +0100 (Sun, 23 Oct 2005) New Revision: 695 Modified: trunk/lib/OpenGuides/RDF.pm Log: address wasn't being escaped either Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-23 14:08:08 UTC (rev 694) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-23 14:11:34 UTC (rev 695) @@ -80,8 +80,9 @@ my $summary = $node_data{metadata}{summary}[0] || ''; # replace any errant characters in data to prevent illegal XML - foreach ($phone, $fax, $website, $opening_hours_text, $postcode, $city, $country, - $latitude, $longitude, $version, $os_x, $os_y, $catrefs, @locales, $summary) + foreach ($phone, $fax, $website, $opening_hours_text, $address, $postcode, + $city, $country, $latitude, $longitude, $version, $os_x, $os_y, + $catrefs, @locales, $summary) { if ($_) {

17 years, 11 months

r694 - trunk/lib/OpenGuides

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-23 15:08:08 +0100 (Sun, 23 Oct 2005) New Revision: 694 Modified: trunk/lib/OpenGuides/RDF.pm Log: RDF summary field was not being escaped Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-13 18:56:53 UTC (rev 693) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-23 14:08:08 UTC (rev 694) @@ -81,7 +81,7 @@ # replace any errant characters in data to prevent illegal XML foreach ($phone, $fax, $website, $opening_hours_text, $postcode, $city, $country, - $latitude, $longitude, $version, $os_x, $os_y, $catrefs, @locales) + $latitude, $longitude, $version, $os_x, $os_y, $catrefs, @locales, $summary) { if ($_) {

17 years, 11 months

r693 - in trunk: . templates

by svnadmin＠urchin.earth.li

Author: earle Date: 2005-10-13 19:56:53 +0100 (Thu, 13 Oct 2005) New Revision: 693 Modified: trunk/Changes trunk/templates/rdf_index.tt Log: update dc: url Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-12 03:15:22 UTC (rev 692) +++ trunk/Changes 2005-10-13 18:56:53 UTC (rev 693) @@ -4,6 +4,7 @@ Add summary field to RDF as dc:description. Show node summary in search results. Add "address" field that had got missed out from the RDF. + Update URL for Dublin Core elements in RDF index view. Fix bug that was breaking coordinate entry fields on search page if lat/lon was being used. Replace underscores in node names in redirection message with spaces. Modified: trunk/templates/rdf_index.tt =================================================================== --- trunk/templates/rdf_index.tt 2005-10-12 03:15:22 UTC (rev 692) +++ trunk/templates/rdf_index.tt 2005-10-13 18:56:53 UTC (rev 693) @@ -3,7 +3,7 @@ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" - xmlns:dc="http://purl.org/dc/1.0/" + xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns="http://purl.org/rss/1.0/"

17 years, 11 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits October 2005