openguides-commits October 2005

openguides-commits@lists.openguides.org

1 participants
29 discussions

r692 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 12 Oct '05

12 Oct '05

Author: earle Date: 2005-10-12 04:15:22 +0100 (Wed, 12 Oct 2005) New Revision: 692 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/SuperSearch.pm Log: bump version numbers appropriately Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-12 01:57:58 UTC (rev 691) +++ trunk/Changes 2005-10-12 03:15:22 UTC (rev 692) @@ -1,7 +1,7 @@ 0.51 New "format=raw" option for outputting wiki text of a node. New "summary" metadata field for one-line summaries of nodes. - Add "summary" field to RDF as dc:description. + 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. Fix bug that was breaking coordinate entry fields on search page if lat/lon Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-12 01:57:58 UTC (rev 691) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-12 03:15:22 UTC (rev 692) @@ -3,7 +3,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.071'; +$VERSION = '0.08'; use CGI::Wiki::Plugin::RSS::ModWiki; use Time::Piece; Modified: trunk/lib/OpenGuides/SuperSearch.pm =================================================================== --- trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 01:57:58 UTC (rev 691) +++ trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 03:15:22 UTC (rev 692) @@ -1,6 +1,6 @@ package OpenGuides::SuperSearch; use strict; -our $VERSION = '0.09'; +our $VERSION = '0.10'; use CGI qw( :standard ); use CGI::Wiki::Plugin::Locator::Grid; Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-12 01:57:58 UTC (rev 691) +++ trunk/lib/OpenGuides.pm 2005-10-12 03:15:22 UTC (rev 692) @@ -13,7 +13,7 @@ use vars qw( $VERSION ); -$VERSION = '0.50'; +$VERSION = '0.51'; =head1 NAME

1 0

r691 - trunk/templates
by svnadmin＠urchin.earth.li 12 Oct '05

12 Oct '05

Author: earle Date: 2005-10-12 02:57:58 +0100 (Wed, 12 Oct 2005) New Revision: 691 Modified: trunk/templates/node.tt Log: fix RT #8852 (missing OS IE X/Y coords) Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2005-10-12 01:51:06 UTC (rev 690) +++ trunk/templates/node.tt 2005-10-12 01:57:58 UTC (rev 691) @@ -46,7 +46,7 @@ </form> </div> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) %] +[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %] <div id="coordinates"> [% END %] [% IF os_x AND os_y %] @@ -54,11 +54,16 @@     <small>OS Y co-ord: [% CGI.escapeHTML(os_y) %]</small>     +[% ELSIF osie_x AND osie_y %] + <small>OS IE X co-ord: [% CGI.escapeHTML(osie_x) %]</small> +     + <small>OS IE Y co-ord: [% CGI.escapeHTML(osie_y) %]</small> +     [% END %] [% IF latitude AND longitude %] <small>(Latitude: [% latitude %] Longitude: [% longitude %])</small> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) %] +[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%] </div> [% END %] <div id="rdf_link">

1 0

r690 - trunk
by svnadmin＠urchin.earth.li 12 Oct '05

12 Oct '05

Author: earle Date: 2005-10-12 02:51:06 +0100 (Wed, 12 Oct 2005) New Revision: 690 Modified: trunk/Changes Log: SuperSearch bugfix Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-12 01:49:28 UTC (rev 689) +++ trunk/Changes 2005-10-12 01:51:06 UTC (rev 690) @@ -8,8 +8,11 @@ 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. - + 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. + 0.50 2 October 2005 Remove rogue ampersand that had crept into the RSS feed.

1 0

r689 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 12 Oct '05

12 Oct '05

Author: earle Date: 2005-10-12 02:49:28 +0100 (Wed, 12 Oct 2005) New Revision: 689 Modified: trunk/lib/OpenGuides/SuperSearch.pm Log: always pass latitude and longitude to the template if criteria for distance search are defined Modified: trunk/lib/OpenGuides/SuperSearch.pm =================================================================== --- trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 01:36:06 UTC (rev 688) +++ trunk/lib/OpenGuides/SuperSearch.pm 2005-10-12 01:49:28 UTC (rev 689) @@ -155,6 +155,8 @@ $doing_search = 1; # Make sure to pass the criteria to the template. $tt_vars{dist} = $self->{distance_in_metres}; + $tt_vars{latitude} = $self->{latitude}; + $tt_vars{longitude} = $self->{longitude}; if ( $self->config->geo_handler eq 1 ) { $tt_vars{coord_field_1_value} = $self->{os_x}; $tt_vars{coord_field_2_value} = $self->{os_y};

1 0

r688 - trunk/templates
by svnadmin＠urchin.earth.li 12 Oct '05

12 Oct '05

Author: earle Date: 2005-10-12 02:36:06 +0100 (Wed, 12 Oct 2005) New Revision: 688 Modified: trunk/templates/supersearch.tt Log: fix a ballsup that broke tests Modified: trunk/templates/supersearch.tt =================================================================== --- trunk/templates/supersearch.tt 2005-10-12 01:19:57 UTC (rev 687) +++ trunk/templates/supersearch.tt 2005-10-12 01:36:06 UTC (rev 688) @@ -35,11 +35,18 @@ <tr> <th>Location:</th> <td> + [% IF coord_field_1 != 'latitude' %] <p> within <input type="text" name="[% dist_field %]" value="[% dist %]" size="5" maxlength="5" /> metres of<br /> [% coord_field_1_name %] <input type="text" name="[% coord_field_1 %]" value="[% coord_field_1_value %]" size="10" maxlength="10" />,<br /> [% coord_field_2_name %] <input type="text" name="[% coord_field_2 %]" value="[% coord_field_2_value %]" size="10" maxlength="10" /> </p> + [% END %] + <p> + within <input type="text" name="latlong_dist" value="[% dist %]" size="5" maxlength="5" /> metres of<br /> + latitude (decimal) <input type="text" name="latitude" value="[% latitude %]" size="10" maxlength="10" />,<br /> + longitude (decimal) <input type="text" name="longitude" value="[% longitude %]" size="10" maxlength="10" /> + </p> </td> </tr> <tr>

1 0

r687 - in trunk: . lib
by svnadmin＠urchin.earth.li 12 Oct '05

12 Oct '05

Author: earle Date: 2005-10-12 02:19:57 +0100 (Wed, 12 Oct 2005) New Revision: 687 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: new format=raw output option Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-11 13:39:10 UTC (rev 686) +++ trunk/Changes 2005-10-12 01:19:57 UTC (rev 687) @@ -1,4 +1,5 @@ 0.51 + New "format=raw" option for outputting wiki text of a node. New "summary" metadata field for one-line summaries of nodes. Add "summary" field to RDF as dc:description. Show node summary in search results. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-11 13:39:10 UTC (rev 686) +++ trunk/lib/OpenGuides.pm 2005-10-12 01:19:57 UTC (rev 687) @@ -170,6 +170,12 @@ my $modified = $node_data{last_modified}; my %metadata = %{$node_data{metadata}}; + if ($args{format} && $args{format} eq 'raw') { + print "Content-Type: text/plain\n\n"; + print $raw; + exit 0; + } + my %metadata_vars = OpenGuides::Template->extract_metadata_vars( wiki => $wiki, config => $config, Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-10-11 13:39:10 UTC (rev 686) +++ trunk/wiki.cgi 2005-10-12 01:19:57 UTC (rev 687) @@ -112,6 +112,11 @@ } else { # Default is to display a node. if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node ); + } elsif ( $format and $format eq 'raw' ) { + $guide->display_node( + id => $node, + format => 'raw', + ); } else { my $version = $q->param("version"); my $other_ver = $q->param("diffversion");

1 0

r686 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 11 Oct '05

11 Oct '05

Author: earle Date: 2005-10-11 14:39:10 +0100 (Tue, 11 Oct 2005) New Revision: 686 Modified: trunk/lib/OpenGuides/RDF.pm Log: oops, braino - address is definitely in output now. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-09 23:40:37 UTC (rev 685) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-11 13:39:10 UTC (rev 686) @@ -147,7 +147,8 @@ if ($is_geospatial) { - $rdf .= "\n \n\n" if $is_geospatial; + $rdf .= "\n \n\n"; + $rdf .= " <address>$address</address>\n" if $address; $rdf .= " <city>$city</city>\n" if $city; $rdf .= " <postalCode>$postcode</postalCode>\n" if $postcode; $rdf .= " <country>$country</country>\n" if $country;

1 0

r685 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 09 Oct '05

09 Oct '05

Author: earle Date: 2005-10-10 00:40:37 +0100 (Mon, 10 Oct 2005) New Revision: 685 Modified: trunk/Changes trunk/README.CSS trunk/lib/OpenGuides/SuperSearch.pm Log: add node summary to search results Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-09 23:37:43 UTC (rev 684) +++ trunk/Changes 2005-10-09 23:40:37 UTC (rev 685) @@ -1,7 +1,10 @@ 0.51 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. + 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. Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2005-10-09 23:37:43 UTC (rev 684) +++ trunk/README.CSS 2005-10-09 23:40:37 UTC (rev 685) @@ -84,6 +84,10 @@ Used in: recent_changes.tt Purpose: User who made a change +div.hit_summary + Used in: supersearch.tt + Purpose: One-line summary of individual search result. + IDs --- Modified: trunk/lib/OpenGuides/SuperSearch.pm =================================================================== --- trunk/lib/OpenGuides/SuperSearch.pm 2005-10-09 23:37:43 UTC (rev 684) +++ trunk/lib/OpenGuides/SuperSearch.pm 2005-10-09 23:40:37 UTC (rev 685) @@ -252,6 +252,11 @@ my $formatter = $self->wiki->formatter; foreach my $i ( 0 .. $#results ) { my $name = $results[$i]{name}; + + # Add the one-line summary of the node, if there is one. + my %node = $self->wiki->retrieve_node($name); + $results[$i]{summary} = $node{metadata}{summary}[0]; + my $node_param = $formatter->node_name_to_node_param( $name ); $results[$i]{url} = $self->{wikimain} . "?$node_param"; }

1 0

r684 - trunk/templates
by svnadmin＠urchin.earth.li 09 Oct '05

09 Oct '05

Author: earle Date: 2005-10-10 00:37:43 +0100 (Mon, 10 Oct 2005) New Revision: 684 Modified: trunk/templates/supersearch.tt Log: add summary field to search results; fix bug breaking distance input fields if lat/lon is being used Modified: trunk/templates/supersearch.tt =================================================================== --- trunk/templates/supersearch.tt 2005-10-09 22:51:40 UTC (rev 683) +++ trunk/templates/supersearch.tt 2005-10-09 23:37:43 UTC (rev 684) @@ -35,22 +35,11 @@ <tr> <th>Location:</th> <td> - <ul> - [% IF coord_field_1 == 'os_x' OR coord_field_1 == 'osie_x' %] - <li> - within <input type="text" name="[% dist_field %]" value="[% dist %]" size="5" maxlength="5" /> metres - of [% coord_field_1_name %] - <input type="text" name="[% coord_field_1 %]" value="[% coord_field_1_value %]" size="10" maxlength="10" />, - [% coord_field_2_name %] - <input type="text" name="[% coord_field_2 %]" value="[% coord_field_2_value %]" size="10" maxlength="10" /> - </li> - [% END %] - <li> - within <input type="text" name="latlong_dist" value="[% dist %]" size="5" maxlength="5" /> metres - of latitude <input type="text" name="latitude" value="[% latitude %]" size="10" maxlength="10" /> - longitude <input type="text" name="longitude" value="[% longitude %]" size="10" maxlength="10" /> - </li> - </ul> + <p> + within <input type="text" name="[% dist_field %]" value="[% dist %]" size="5" maxlength="5" /> metres of<br /> + [% coord_field_1_name %] <input type="text" name="[% coord_field_1 %]" value="[% coord_field_1_value %]" size="10" maxlength="10" />,<br /> + [% coord_field_2_name %] <input type="text" name="[% coord_field_2 %]" value="[% coord_field_2_value %]" size="10" maxlength="10" /> + </p> </td> </tr> <tr> @@ -73,9 +62,10 @@ <a href="[% result.url %]"><b>[% result.name %]</b></a> (score: [% result.score %]) [% IF result.distance %] ([% result.distance %] metres away) - [% END %] - <br /> + [% END %][% IF result.summary %] + <div class="hit_summary"> [% result.summary %] + </div>[% END %] </li> [% END %] </ol>

1 0

r683 - in trunk: . lib lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 09 Oct '05

09 Oct '05

Author: earle Date: 2005-10-09 23:51:40 +0100 (Sun, 09 Oct 2005) New Revision: 683 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Template.pm trunk/t/21_rdf.t trunk/templates/edit_form.tt Log: new "summary" metadata field Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-10-09 21:26:12 UTC (rev 682) +++ trunk/Changes 2005-10-09 22:51:40 UTC (rev 683) @@ -1,4 +1,6 @@ 0.51 + New "summary" metadata field for one-line summaries of nodes. + Add "summary" field to RDF as dc:description. Add "address" field that had got missed out from the RDF. Replace underscores in node names in redirection message with spaces. Redirection message now links to a rendered version of the old page Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-10-09 21:26:12 UTC (rev 682) +++ trunk/lib/OpenGuides/RDF.pm 2005-10-09 22:51:40 UTC (rev 683) @@ -77,6 +77,7 @@ my $os_y = $node_data{metadata}{os_y}[0] || ''; my $catrefs = $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, $postcode, $city, $country, @@ -139,6 +140,8 @@ <$objType rdf:ID="obj" dc:title="$node_name"> }; + $rdf .= " <dc:description>$summary</dc:description>\n" if $summary; + $rdf .= "\n \n\n" if $catrefs; $rdf .= " <dc:subject>$_</dc:subject>\n" foreach @{$catrefs}; Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2005-10-09 21:26:12 UTC (rev 682) +++ trunk/lib/OpenGuides/Template.pm 2005-10-09 22:51:40 UTC (rev 683) @@ -281,18 +281,24 @@ my $hours_text = $args{metadata} ? $metadata{opening_hours_text}[0] : $q->param("hours_text"); + + my $summary = $args{metadata} ? $metadata{summary}[0] + : $q->param("summary"); + my %vars = ( categories => \@categories, locales => \@locales, category => \@catlist, locale => \@loclist, formatted_website_text => $formatted_website_text, - hours_text => $hours_text + hours_text => $hours_text, + summary => $summary, ); if ( $args{metadata} ) { foreach my $var ( qw( phone fax address postcode os_x os_y osie_x - osie_y latitude longitude map_link website) ) { + osie_y latitude longitude map_link website + summary) ) { $vars{$var} = $metadata{$var}[0]; } # Data for the distance search forms on the node display. @@ -332,7 +338,7 @@ ); } } else { - foreach my $var ( qw( phone fax address postcode map_link website) ) { + foreach my $var ( qw( phone fax address postcode map_link website summary) ) { $vars{$var} = $q->param($var); } Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-10-09 21:26:12 UTC (rev 682) +++ trunk/lib/OpenGuides.pm 2005-10-09 22:51:40 UTC (rev 683) @@ -733,7 +733,7 @@ } } - foreach my $var ( qw( username comment edit_type ) ) { + foreach my $var ( qw( summary username comment edit_type ) ) { $metadata{$var} = $q->param($var) || ""; } $metadata{host} = $ENV{REMOTE_ADDR}; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-10-09 21:26:12 UTC (rev 682) +++ trunk/t/21_rdf.t 2005-10-09 22:51:40 UTC (rev 683) @@ -5,7 +5,7 @@ use OpenGuides::Utils; use OpenGuides::Test; use URI::Escape; -use Test::More tests => 25; +use Test::More tests => 26; eval { require DBD::SQLite; }; my $have_sqlite = $@ ? 0 : 1; @@ -57,7 +57,8 @@ website => "test website", opening_hours_text => "test hours", latitude => "51.524193", - longitude => "-0.114436" + longitude => "-0.114436", + summary => "a nice pub", } ); @@ -98,6 +99,7 @@ like( $rdfxml, qr|<postalCode>WC1X 8JR</postalCode>|, "postcode" ); like( $rdfxml, qr|<geo:lat>51.524193</geo:lat>|, "latitude" ); like( $rdfxml, qr|<geo:long>-0.114436</geo:long>|, "longitude" ); + like( $rdfxml, qr|<dc:description>a nice pub</dc:description>|, "summary (description)" ); like( $rdfxml, qr|<dc:date>|, "date element included" ); unlike( $rdfxml, qr|<dc:date>1970|, "hasn't defaulted to the epoch" ); Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2005-10-09 21:26:12 UTC (rev 682) +++ trunk/templates/edit_form.tt 2005-10-09 22:51:40 UTC (rev 683) @@ -59,6 +59,12 @@ <legend>Metadata (optional)</legend> <table summary="Form for entering metadata about the subject of this node"> <tr> + <td class="label" colspan="2"><label for="summary">One-line summary of this node:</label></td> + </tr> + <tr> + <td colspan="2"><input type="text" size="50" id="summary" name="summary" value="[% summary %]" /></td> + </tr> + <tr> <td class="label"><label for="phone">Phone:</label></td> <td><input type="text" size="50" id="phone" name="phone" value="[% phone %]" /></td> </tr>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits October 2005