openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r695 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 23 Oct '05

23 Oct '05

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 ($_) {

1 0

r694 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 23 Oct '05

23 Oct '05

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 ($_) {

1 0

r693 - in trunk: . templates
by svnadmin＠urchin.earth.li 13 Oct '05

13 Oct '05

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/"

1 0

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

← Newer
1
...
80
81
82
83
84
85
86
87
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits