openguides-commits January 2008

openguides-commits@lists.openguides.org

1 participants
26 discussions

r1142 - trunk
by svnadmin＠urchin.earth.li 22 Jan '08

22 Jan '08

Author: earle Date: 2008-01-22 16:53:31 +0000 (Tue, 22 Jan 2008) New Revision: 1142 Modified: trunk/wiki.cgi Log: Change comments show up in user stats too - add link parsing. Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2008-01-22 16:38:24 UTC (rev 1141) +++ trunk/wiki.cgi 2008-01-22 16:53:31 UTC (rev 1142) @@ -267,7 +267,10 @@ my @nodes = $wiki->list_recent_changes( %criteria ); @nodes = map { {name => $q->escapeHTML($_->{name}), last_modified => $q->escapeHTML($_->{last_modified}), - comment => $q->escapeHTML($_->{metadata}{comment}[0]), + comment => OpenGuides::Utils::parse_change_comment( + $q->escapeHTML($_->{metadata}{comment}[0]), + $script_url . '?', + ), url => "$script_name?" . $q->escape($formatter->node_name_to_node_param($_->{name})) } } @nodes;

1 0

r1141 - in trunk: . lib lib/OpenGuides t
by svnadmin＠urchin.earth.li 22 Jan '08

22 Jan '08

Author: earle Date: 2008-01-22 16:38:24 +0000 (Tue, 22 Jan 2008) New Revision: 1141 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/t/45_home_recent_changes.t Log: Allow wiki links in change summaries. Closes #115. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-01-20 18:46:51 UTC (rev 1140) +++ trunk/Changes 2008-01-22 16:38:24 UTC (rev 1141) @@ -4,6 +4,8 @@ <http://dev.openguides.org/log/trunk>. 0.62 + Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in + change summaries. Ensure that all modules we ship are versioned. Added experimental support for local IP blacklisting modules; see the display_node method in "perldoc OpenGuides" for details. Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2008-01-20 18:46:51 UTC (rev 1140) +++ trunk/lib/OpenGuides/Utils.pm 2008-01-22 16:38:24 UTC (rev 1141) @@ -393,6 +393,47 @@ }; +=item B<parse_change_comment> + + my $change_comment = parse_change_comment($string, $base_url); + +Given a base URL (for example, C<http://example.com/wiki.cgi?>), takes a string, +replaces C<[[page]]> and C<[[page|titled link]]> with + + <a href="http://example.com/wiki.cgi?page">page</a> + +and + + <a href="http://example.com/wiki.cgi?page">titled link</a> + +respectively, and returns it. This is a limited subset of wiki markup suitable for +use in page change comments. + +=cut + +sub parse_change_comment { + my ($comment, $base_url) = @_; + + my @links = $comment =~ m{\[\[(.*?)\]\]}g; + + # It's not all that great having to reinvent the wheel in this way, but + # Text::WikiFormat won't let you specify the subset of wiki notation that + # you're interested in. C'est la vie. + foreach (@links) { + if (/(.*?)\|(.*)/) { + my ($page, $title) = ($1, $2); + $comment =~ s{\[\[$page\|$title\]\]} + {<a href="$base_url$page">$title</a>}; + } else { + my $page = $_; + $comment =~ s{\[\[$page\]\]} + {<a href="$base_url$page">$page</a>}; + } + } + + return $comment; +} + =item B<send_email> eval { OpenGuides::Utils->send_email( @@ -421,6 +462,7 @@ =cut + sub send_email { my ( $self, %args ) = @_; my $config = $args{config} or die "config argument not supplied"; Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2008-01-20 18:46:51 UTC (rev 1140) +++ trunk/lib/OpenGuides.pm 2008-01-22 16:38:24 UTC (rev 1141) @@ -338,17 +338,20 @@ last_n_changes => 10, metadata_was => { edit_type => "Normal edit" }, ); + my $base_url = $config->script_name . '?'; @recent = map { { name => CGI->escapeHTML($_->{name}), last_modified => CGI->escapeHTML($_->{last_modified}), version => CGI->escapeHTML($_->{version}), - comment => + comment => OpenGuides::Utils::parse_change_comment( CGI->escapeHTML($_->{metadata}{comment}[0]), + $base_url, + ), username => CGI->escapeHTML($_->{metadata}{username}[0]), - url => $config->script_name . "?" + url => $base_url . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})) } } @recent; @@ -652,18 +655,23 @@ $criteria{metadata_was} = { edit_type => "Normal edit" } unless $minor_edits; my @rc = $self->{wiki}->list_recent_changes( %criteria ); - + + my $base_url = $config->script_name . '?'; + @rc = map { { name => CGI->escapeHTML($_->{name}), last_modified => CGI->escapeHTML($_->{last_modified}), version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + comment => OpenGuides::Utils::parse_change_comment( + CGI->escapeHTML($_->{metadata}{comment}[0]), + $base_url, + ), 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 . "?" + url => $base_url . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), } } @rc; @@ -677,17 +685,22 @@ unless $minor_edits; my @rc = $self->{wiki}->list_recent_changes( %criteria ); + my $base_url = $config->script_name . '?'; + @rc = map { { name => CGI->escapeHTML($_->{name}), last_modified => CGI->escapeHTML($_->{last_modified}), version => CGI->escapeHTML($_->{version}), - comment => CGI->escapeHTML($_->{metadata}{comment}[0]), + comment => OpenGuides::Utils::parse_change_comment( + CGI->escapeHTML($_->{metadata}{comment}[0]), + $base_url, + ), 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 . "?" + url => $base_url . CGI->escape($wiki->formatter->node_name_to_node_param($_->{name})), } } @rc; @@ -1021,8 +1034,11 @@ version => CGI->escapeHTML( $version ), modified => CGI->escapeHTML( $node_data{last_modified} ), username => CGI->escapeHTML( $node_data{metadata}{username}[0] ), - comment => CGI->escapeHTML( $node_data{metadata}{comment}[0] ), - } if $node_data{version}; + comment => OpenGuides::Utils::parse_change_comment( + CGI->escapeHTML( $node_data{metadata}{comment}[0] ), + $self->config->script_name . '?', + ), + } if $node_data{version}; } @history = reverse @history; my %tt_vars = ( Modified: trunk/t/45_home_recent_changes.t =================================================================== --- trunk/t/45_home_recent_changes.t 2008-01-20 18:46:51 UTC (rev 1140) +++ trunk/t/45_home_recent_changes.t 2008-01-22 16:38:24 UTC (rev 1141) @@ -10,7 +10,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 13; +plan tests => 15; my ( $config, $guide, $wiki ); @@ -59,6 +59,24 @@ like( $output, qr/Kake/, "...and usernames" ); like( $output, qr/Edit this page/, "...edit this page link is there too" ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Red Lion", + content => "A nice pub.", + username => "Earle", + comment => "I also edited it. For fun, here are two links: [[A Page]], and the same link [[A Page|again]].", + ); + +# Reload page. +$output = $guide->display_node( + id => $config->home_name, + return_output => 1, + ); + +like( $output, qr{<a href="\?A Page">A Page</a>}, "...simple wiki links appear in Recent Changes" ); +like( $output, qr{<a href="\?A Page">again</a>}, "...titled wiki links appear in Recent Changes" ); + + # And that they don't show up if we don't want them. Turn off the navbar # too, since we want to make sure the edit page link shows up regardless (it # normally appears in the recent changes box). @@ -77,3 +95,4 @@ unlike( $output, qr/Kake/, "...nor usernames" ); unlike( $output, qr/Ten most.*recent changes/, "...heading not shown either" ); like( $output, qr/Edit this page/, "...edit this page link is there though" ); +

1 0

r1140 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 20 Jan '08

20 Jan '08

Author: earle Date: 2008-01-20 18:46:51 +0000 (Sun, 20 Jan 2008) New Revision: 1140 Modified: trunk/Changes trunk/lib/OpenGuides/Search.pm Log: Don't include redirect pages in search results. Closes #24. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-01-20 00:52:37 UTC (rev 1139) +++ trunk/Changes 2008-01-20 18:46:51 UTC (rev 1140) @@ -7,6 +7,7 @@ Ensure that all modules we ship are versioned. Added experimental support for local IP blacklisting modules; see the display_node method in "perldoc OpenGuides" for details. + Don't include redirect pages in search results. (#24) Include map link URLs in RDF output. (#26) Hide historic versions of nodes from search engines. (#207) Modified: trunk/lib/OpenGuides/Search.pm =================================================================== --- trunk/lib/OpenGuides/Search.pm 2008-01-20 00:52:37 UTC (rev 1139) +++ trunk/lib/OpenGuides/Search.pm 2008-01-20 18:46:51 UTC (rev 1140) @@ -503,17 +503,25 @@ $contents_res{$node} = int( $contents_res{$node} / $num_results ) + 1; } - # It'll be a real phrase (as opposed to a word) if it has a space in it. - # In this case, dump out the nodes that don't match the search exactly. - # I don't know why the phrase searching isn't working properly. Fix later. - if ( $phrase =~ /\s/ ) { - my @tmp = keys %contents_res; - foreach my $node ( @tmp ) { - my $content = $wiki->retrieve_node( $node ); + my @tmp = keys %contents_res; + foreach my $node ( @tmp ) { + my $content = $wiki->retrieve_node( $node ); + + # Don't include redirects in search results. + if ($content =~ /^#REDIRECT/) { + delete $contents_res{$node}; + next; + } + + # It'll be a real phrase (as opposed to a word) if it has a space in it. + # In this case, dump out the nodes that don't match the search exactly. + # I don't know why the phrase searching isn't working properly. Fix later. + if ( $phrase =~ /\s/ ) { unless ( $content =~ /$phrase/i || $node =~ /$phrase/i ) { delete $contents_res{$node}; - } + } } + } my %results = map { $_ => { name => $_, score => $contents_res{$_} } }

1 0

r1139 - trunk/templates
by svnadmin＠urchin.earth.li 20 Jan '08

20 Jan '08

Author: earle Date: 2008-01-20 00:52:37 +0000 (Sun, 20 Jan 2008) New Revision: 1139 Modified: trunk/templates/node.tt Log: The "no such node" message was using [% node_param %] by mistake - fixed to [% node_name %]. Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2008-01-18 21:50:49 UTC (rev 1138) +++ trunk/templates/node.tt 2008-01-20 00:52:37 UTC (rev 1139) @@ -49,7 +49,7 @@ [% END %] [% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] </div> -<div id="nonexistent_node_message">We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?</div> +<div id="nonexistent_node_message">We don't have a node called "[% node_name %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?</div> [% ELSE %] <div id="title_edit_link"> <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">Edit this page</a>

1 0

r1138 - trunk
by svnadmin＠urchin.earth.li 18 Jan '08

18 Jan '08

Author: earle Date: 2008-01-18 21:50:49 +0000 (Fri, 18 Jan 2008) New Revision: 1138 Modified: trunk/Changes Log: Mention last two bugs fixed. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-01-18 21:22:25 UTC (rev 1137) +++ trunk/Changes 2008-01-18 21:50:49 UTC (rev 1138) @@ -7,6 +7,8 @@ Ensure that all modules we ship are versioned. Added experimental support for local IP blacklisting modules; see the display_node method in "perldoc OpenGuides" for details. + Include map link URLs in RDF output. (#26) + Hide historic versions of nodes from search engines. (#207) 0.61 4 July 2007 Added experimental support for local spam detection modules; see the

1 0

r1137 - trunk/t
by svnadmin＠urchin.earth.li 18 Jan '08

18 Jan '08

Author: earle Date: 2008-01-18 21:22:25 +0000 (Fri, 18 Jan 2008) New Revision: 1137 Modified: trunk/t/ Log: What's wrong with me today? *Again* with the fixing. Property changes on: trunk/t ___________________________________________________________________ Name: svn:ignore - t/prefs.db t/node.db t/indexes + prefs.db node.db indexes

1 0

r1136 - in trunk/t: . templates
by svnadmin＠urchin.earth.li 18 Jan '08

18 Jan '08

Author: earle Date: 2008-01-18 21:21:30 +0000 (Fri, 18 Jan 2008) New Revision: 1136 Modified: trunk/t/ trunk/t/templates/ Log: This should ignore properly. Property changes on: trunk/t ___________________________________________________________________ Name: svn:ignore + t/prefs.db t/node.db t/indexes Property changes on: trunk/t/templates ___________________________________________________________________ Name: svn:ignore + tmp

1 0

r1135 - trunk
by svnadmin＠urchin.earth.li 18 Jan '08

18 Jan '08

Author: earle Date: 2008-01-18 21:20:31 +0000 (Fri, 18 Jan 2008) New Revision: 1135 Modified: trunk/ Log: No, that doesn't work like MANIFEST, whoops. Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - .vimrc *.swp _build Build Makefile.PL blib cover_db t/prefs.db t/node.db t/indexes t/templates/tmp wiki.conf + .vimrc *.swp _build Build Makefile.PL blib cover_db wiki.conf

1 0

r1134 - trunk
by svnadmin＠urchin.earth.li 18 Jan '08

18 Jan '08

Author: earle Date: 2008-01-18 21:19:46 +0000 (Fri, 18 Jan 2008) New Revision: 1134 Modified: trunk/ Log: More transient stuff to ignore. Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - .vimrc *.swp _build Build blib + .vimrc *.swp _build Build Makefile.PL blib cover_db t/prefs.db t/node.db t/indexes t/templates/tmp wiki.conf

1 0

r1133 - in trunk: lib/OpenGuides templates
by svnadmin＠urchin.earth.li 18 Jan '08

18 Jan '08

Author: earle Date: 2008-01-18 21:19:16 +0000 (Fri, 18 Jan 2008) New Revision: 1133 Modified: trunk/lib/OpenGuides/RDF.pm trunk/templates/node_rdf.tt Log: Add map link to RDF output. Closes #26. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2008-01-17 00:30:25 UTC (rev 1132) +++ trunk/lib/OpenGuides/RDF.pm 2008-01-18 21:19:16 UTC (rev 1133) @@ -83,7 +83,7 @@ foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude - os_x os_y summary ) ) { + os_x os_y map_link summary ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } @@ -105,7 +105,7 @@ # Check for geospatialness and define container object as appropriate. my $is_geospatial; foreach my $var ( qw( os_x os_y latitude longitude address postcode - opening_hours_text ) ) { + opening_hours_text map_link ) ) { $is_geospatial = 1 if $tt_vars{$var}; } Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2008-01-17 00:30:25 UTC (rev 1132) +++ trunk/templates/node_rdf.tt 2008-01-18 21:19:16 UTC (rev 1133) @@ -10,6 +10,7 @@ xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:os="http://downlode.org/Code/RDF/Ordnance_Survey/schema/1#" xmlns:owl="http://www.w3.org/2002/07/owl#" + xmlns:map="http://www.daml.org/2001/06/map/map-ont#" xmlns="http://www.w3.org/2000/10/swap/pim/contact#" > @@ -61,6 +62,12 @@ <country>[% country %]</country> [% END %] + [% IF map_link %] + <foaf:page> + <map:Map rdf:about="[% map_link %]" /> + </foaf:page> + [% END %] + [% FOREACH locale = locales %] <foaf:based_near> <wn:Neighborhood rdf:ID="[% locale.id %]">

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits January 2008