openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r745 - trunk/t
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 21:40:46 +0000 (Sun, 05 Mar 2006) New Revision: 745 Modified: trunk/t/21_rdf.t Log: Sigh, and the rest. References #66 Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2006-03-05 21:39:17 UTC (rev 744) +++ trunk/t/21_rdf.t 2006-03-05 21:40:46 UTC (rev 745) @@ -66,9 +66,9 @@ like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" ); - like( $rdfxml, qr|<dc:title>Bloomsbury</foaf:name>|, + like( $rdfxml, qr|<dc:title>Bloomsbury</dc:title>|, "finds the first locale" ); - like( $rdfxml, qr|<dc:title>St Pancras</foaf:name>|, + like( $rdfxml, qr|<dc:title>St Pancras</dc:title>|, "finds the second locale" ); like( $rdfxml, qr|<phone>test phone number</phone>|,

1 0

r744 - trunk/t
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 21:39:17 +0000 (Sun, 05 Mar 2006) New Revision: 744 Modified: trunk/t/21_rdf.t Log: Test fixup, references #66 Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2006-03-05 21:35:10 UTC (rev 743) +++ trunk/t/21_rdf.t 2006-03-05 21:39:17 UTC (rev 744) @@ -66,9 +66,9 @@ like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" ); - like( $rdfxml, qr|<foaf:name>Bloomsbury</foaf:name>|, + like( $rdfxml, qr|<dc:title>Bloomsbury</foaf:name>|, "finds the first locale" ); - like( $rdfxml, qr|<foaf:name>St Pancras</foaf:name>|, + like( $rdfxml, qr|<dc:title>St Pancras</foaf:name>|, "finds the second locale" ); like( $rdfxml, qr|<phone>test phone number</phone>|,

1 0

r743 - trunk
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 21:35:10 +0000 (Sun, 05 Mar 2006) New Revision: 743 Modified: trunk/PREREQUISITES trunk/wiki.cgi Log: 0.52 version updates. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-03-05 21:33:29 UTC (rev 742) +++ trunk/PREREQUISITES 2006-03-05 21:35:10 UTC (rev 743) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.51 +Modules required by OpenGuides 0.52 =================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-03-05 21:33:29 UTC (rev 742) +++ trunk/wiki.cgi 2006-03-05 21:35:10 UTC (rev 743) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.51'; +$VERSION = '0.52'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r742 - trunk
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 21:33:29 +0000 (Sun, 05 Mar 2006) New Revision: 742 Modified: trunk/MANIFEST Log: Fix missing file add. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-03-05 21:26:54 UTC (rev 741) +++ trunk/MANIFEST 2006-03-05 21:33:29 UTC (rev 742) @@ -8,6 +8,7 @@ PREREQUISITES README README.CSS +README.GMAPS SIGNATURE TROUBLESHOOTING examples/london.css

1 0

r741 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 21:26:54 +0000 (Sun, 05 Mar 2006) New Revision: 741 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm Log: Locales in RDF now use dc:title, not foaf:name, Fixes #66 Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-03-05 21:24:21 UTC (rev 740) +++ trunk/Changes 2006-03-05 21:26:54 UTC (rev 741) @@ -15,6 +15,7 @@ Fix mod_perl redirect bug. Fix test failure with CGI.pm 3.16. #87 Edit on mirrored pages now goes to source site + #66 Locales in RDF now use dc:title, not foaf:name 0.51 15 November 2005 Important changes: Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2006-03-05 21:24:21 UTC (rev 740) +++ trunk/lib/OpenGuides/RDF.pm 2006-03-05 21:26:54 UTC (rev 741) @@ -157,7 +157,7 @@ $rdf .= qq{ <foaf:based_near> <wn:Neighborhood> - <foaf:name>$_</foaf:name> + <dc:title>$_</dc:title> </wn:Neighborhood> </foaf:based_near>\n} foreach @locales;

1 0

r740 - trunk/templates
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 21:24:21 +0000 (Sun, 05 Mar 2006) New Revision: 740 Modified: trunk/templates/map_index.tt Log: Fix Google Maps dms bug, fixes #75. Modified: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2006-03-05 11:53:09 UTC (rev 739) +++ trunk/templates/map_index.tt 2006-03-05 21:24:21 UTC (rev 740) @@ -12,6 +12,8 @@ [% metadata = node.node_data.metadata %] [% i = i + 1 %] [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] + [% NEXT IF metadata.latitude.list.first.match('m') %] + [% NEXT IF metadata.longitude.list.first.match('m') %] <li><a href='#' onclick="marker[% i %].openInfoWindowHtml(htmlString[% i %]); return false;">[% node.name %]</a>[% IF metadata.city.list.first %], [% metadata.city.list.first %][% END %]</li> [% END %] [% END %] @@ -33,6 +35,8 @@ [% i = i + 1 %] [% metadata = node.node_data.metadata %] [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] + [% NEXT IF metadata.latitude.list.first.match('m') %] + [% NEXT IF metadata.longitude.list.first.match('m') %] var point[% i %] = new GPoint([% metadata.longitude.list.first %], [% metadata.latitude.list.first %]); var marker[% i %] = new GMarker(point[% i %],baseIcon); [% IF metadata.source %]

1 0

r739 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: ivorw Date: 2006-03-05 11:53:09 +0000 (Sun, 05 Mar 2006) New Revision: 739 Modified: trunk/Changes trunk/lib/OpenGuides/Template.pm trunk/t/51_display_node.t trunk/templates/map_index.tt trunk/templates/navbar.tt Log: Closes #87 Editing a mirrored page now edits on source site Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-03-05 10:50:23 UTC (rev 738) +++ trunk/Changes 2006-03-05 11:53:09 UTC (rev 739) @@ -14,6 +14,7 @@ #67 Default website for a page is now http:// Fix mod_perl redirect bug. Fix test failure with CGI.pm 3.16. + #87 Edit on mirrored pages now goes to source site 0.51 15 November 2005 Important changes: Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-03-05 10:50:23 UTC (rev 738) +++ trunk/lib/OpenGuides/Template.pm 2006-03-05 11:53:09 UTC (rev 739) @@ -304,6 +304,10 @@ summary => $summary, ); + if (exists $metadata{source}) { + ($vars{source_site}) = $metadata{source}[0] =~ /^(.*?)(?:\?|$)/; + } + if ( $args{metadata} ) { foreach my $var ( qw( phone fax address postcode os_x os_y osie_x osie_y latitude longitude map_link website Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2006-03-05 10:50:23 UTC (rev 738) +++ trunk/t/51_display_node.t 2006-03-05 11:53:09 UTC (rev 739) @@ -2,7 +2,7 @@ use CGI::Wiki::Setup::SQLite; use OpenGuides::Config; use OpenGuides; -use Test::More tests => 5; +use Test::More tests => 7; eval { require DBD::SQLite; }; my $have_sqlite = $@ ? 0 : 1; @@ -31,15 +31,17 @@ isa_ok( $guide, "OpenGuides" ); my $wiki = $guide->wiki; isa_ok( $wiki, "CGI::Wiki" ); - $wiki->write_node( "Test Page", "foo" ); + $wiki->write_node( "Test Page", "foo", undef, { source => "alternate.cgi?Test_Page" } ); my $output = eval { $guide->display_node( id => "Test Page", return_output => 1 ); }; is( $@, "", "->display_node doesn't die" ); + like( $output, qr{\<a.*?\Qhref="alternate.cgi?id=Test_Page;action=edit">Edit this page</a>\E}, "...and edit link is redirected to source URL" ); $config->home_name( "My Home Page" ); $output = $guide->display_node( return_output => 1 ); like( $output, qr/My Home Page/, "...and defaults to the home node, and takes notice of what we want to call it" ); + like( $output, qr{\Q<a href="wiki.cgi?action=edit;id=My_Home_Page">Edit this page</a>\E}, "...and home page has an edit link" ); my %tt_vars = $guide->display_node( return_tt_vars => 1 ); ok( defined $tt_vars{recent_changes}, "...and recent_changes is set for the home node even if we have changed its name" ); } Modified: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2006-03-05 10:50:23 UTC (rev 738) +++ trunk/templates/map_index.tt 2006-03-05 11:53:09 UTC (rev 739) @@ -35,7 +35,10 @@ [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] var point[% i %] = new GPoint([% metadata.longitude.list.first %], [% metadata.latitude.list.first %]); var marker[% i %] = new GMarker(point[% i %],baseIcon); - var htmlString[% i %] = "<a href=\"?[% node.param %]\">[% node.name %]</a> <a style='text-decoration:none;' href=\"?id=[% node.param %];action=edit\">(edit)</a><br />[% metadata.address.list.first %]<br />[% metadata.city.list.first %]"; + [% IF metadata.source %] + [% source_url = metadata.source.list.first.match('^(.*?)\?(?:\?|$)').first %] + [% END %] + var htmlString[% i %] = "<a href=\"?[% node.param %]\">[% node.name %]</a> <a style='text-decoration:none;' href=\"%[ source_url %]?id=[% node.param %];action=edit\">(edit)</a><br />[% metadata.address.list.first %]<br />[% metadata.city.list.first %]"; GEvent.addListener(marker[% i %], "click", function() { marker[% i %].openInfoWindowHtml(htmlString[% i %]); }); Modified: trunk/templates/navbar.tt =================================================================== --- trunk/templates/navbar.tt 2006-03-05 10:50:23 UTC (rev 738) +++ trunk/templates/navbar.tt 2006-03-05 11:53:09 UTC (rev 739) @@ -54,7 +54,7 @@ <div class="navbar_group_title">This page:</div> <ul> - <li><a class="edit_page_link" href="[% full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></li> + <li><a class="edit_page_link" href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></li> <li><a href="[% cgi_url %]?action=show_backlinks;id=[% node_param %]">Show pages linking here</a></li> [% IF version AND version > 1 %] <li><a href="[% cgi_url %]?action=list_all_versions;id=[% node_param %]">List all revisions</a></li>

1 0

r738 - in trunk: . t
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: dom Date: 2006-03-05 10:50:23 +0000 (Sun, 05 Mar 2006) New Revision: 738 Modified: trunk/Changes trunk/t/31_search.t Log: Further fix for 302 status change (references #88) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-03-05 10:39:39 UTC (rev 737) +++ trunk/Changes 2006-03-05 10:50:23 UTC (rev 738) @@ -13,6 +13,7 @@ Fix <link> in RSS to point to RecentChanges page, not the feed itself. #67 Default website for a page is now http:// Fix mod_perl redirect bug. + Fix test failure with CGI.pm 3.16. 0.51 15 November 2005 Important changes: Modified: trunk/t/31_search.t =================================================================== --- trunk/t/31_search.t 2006-03-05 10:39:39 UTC (rev 737) +++ trunk/t/31_search.t 2006-03-05 10:50:23 UTC (rev 738) @@ -81,7 +81,7 @@ return_output => 1, vars => { search => "weebl" }, ); - unlike( $output, qr/Status: 302 (?:Moved|Found)/, + unlike( $output, qr/Status: 302/, "no redirect if match only in body"); # One hit in title should redirect to that page. @@ -89,7 +89,7 @@ return_output => 1, vars => { search => "want pie now" }, ); - like( $output, qr/Status: 302 (?:Moved|Found)/, + like( $output, qr/Status: 302/, "prints redirect on single hit and match in title" ); # Old versions of CGI.pm mistakenly print location: instead of Location: like( $output,

1 0

r737 - trunk/t
by svnadmin＠urchin.earth.li 05 Mar '06

05 Mar '06

Author: ivorw Date: 2006-03-05 10:39:39 +0000 (Sun, 05 Mar 2006) New Revision: 737 Modified: trunk/t/31_search.t Log: Fixed #88 Redirect test can now cope with both 302 Moved and 302 Found Modified: trunk/t/31_search.t =================================================================== --- trunk/t/31_search.t 2006-02-22 22:10:50 UTC (rev 736) +++ trunk/t/31_search.t 2006-03-05 10:39:39 UTC (rev 737) @@ -81,7 +81,7 @@ return_output => 1, vars => { search => "weebl" }, ); - unlike( $output, qr/Status: 302 Moved/, + unlike( $output, qr/Status: 302 (?:Moved|Found)/, "no redirect if match only in body"); # One hit in title should redirect to that page. @@ -89,7 +89,7 @@ return_output => 1, vars => { search => "want pie now" }, ); - like( $output, qr/Status: 302 Moved/, + like( $output, qr/Status: 302 (?:Moved|Found)/, "prints redirect on single hit and match in title" ); # Old versions of CGI.pm mistakenly print location: instead of Location: like( $output,

1 0

r736 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 22 Feb '06

22 Feb '06

Author: dom Date: 2006-02-22 22:10:50 +0000 (Wed, 22 Feb 2006) New Revision: 736 Added: trunk/README.GMAPS Modified: trunk/INSTALL trunk/README trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Config.pm Log: More Google Maps tweaks. Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2006-02-21 23:28:00 UTC (rev 735) +++ trunk/INSTALL 2006-02-22 22:10:50 UTC (rev 736) @@ -201,7 +201,7 @@ If you want Google Maps integration, you need to register with Google to get an API key. Visit http://www.google.com/apis/maps/signup.html and follow the instructions. Paste the great long string into the console window where you -are installing. +are installing. See README.GMAPS for more information. "What is the longitude of the centre point of a map to draw for your guide?" "What is the latitude of the centre point of a map to draw for your guide?" @@ -249,6 +249,9 @@ National Grid, Geography::NationalGrid::IE to use the Irish National Grid, and Geo::Coordinates::UTM to use a UTM ellipsoid. +If you want to use a UTM ellipsoid, WGS-84 is the best choice, as it +will allow you to use the Google Maps support with the minimum of fuss. + * Dependency errors If, after you have answered these questions, the build script complains Modified: trunk/README =================================================================== --- trunk/README 2006-02-21 23:28:00 UTC (rev 735) +++ trunk/README 2006-02-22 22:10:50 UTC (rev 736) @@ -13,6 +13,8 @@ BUGS AND CAVEATS UTF8 data are currently not handled correctly throughout. + Google Maps points will display offset when using British and Irish + National Grid input systems. Other bugs are documented at <http://dev.openguides.org/> @@ -35,7 +37,7 @@ The OpenGuides Project (openguides-dev(a)openguides.org) COPYRIGHT - Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2006 The OpenGuides Project. All Rights Reserved. The OpenGuides distribution is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Added: trunk/README.GMAPS =================================================================== --- trunk/README.GMAPS 2006-02-21 23:28:00 UTC (rev 735) +++ trunk/README.GMAPS 2006-02-22 22:10:50 UTC (rev 736) @@ -0,0 +1,39 @@ +As of 0.52, OpenGuides supports Google Maps using the API. The support has a +few rough edges that still need ironing out, mostly relating to ellipsoids, +and for that reason they aren't exposed by default. + +To use Google Maps, you need to get an API key from +http://www.google.com/apis/maps/signup.html. When you've put this value into +the config file as gmaps_api_key, the maps become available to you in two +places. Firstly, if the user has set the user preference to display Google +Maps, any node which has location information will get an inset map +pinpointing the location. Secondly, the URL +http://.../wiki.cgi?action=index;format=map becomes a large map with a list +of all nodes (regardless of the user settings). The latter will become very +slow on any sizable guide (there is work being done on speeding up indexes +in general - please see the mailing list). If you don't get maps displayed +when you know that the node has location information, read on. + +Ellipsoids and map accuracy +--------------------------- + +If you are based in the US and inputting points using latitude/longitude, +the values in your database will almost certainly correspond to points on +Google Maps. If so, simply change the "ellipsoid" configuration variable +to "WGS-84" if it's not already set to this, and your maps will display. + +If you are using the British Grid system things are more complicated and this +support is incomplete. If you set the configuration variable force_wgs84 +to 1, maps will display, but points will be offset from where they should +be, normally by about 50 metres. This is because the British Grid uses a +different ellipsoid from Google Maps. We plan to integrate conversion +routines to fix this in a future release. In the meantime, if you +advertise the maps you must make users aware of this flaw and tell them +not to try and "correct" location data! + +You may be unlucky enough to be using the UTM input modes (ie not British +or Irish National Grid) but have data entered in a mixture of formats. +This is likely if your users are from the UK, as you may find a mixture of +WGS-84 and Airy (ie British Grid style) based nodes. In this case, you +*do* need to correct any that are offset. Only do this if your users +input Lat/long values rather than grid Eastings/Northings. Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2006-02-21 23:28:00 UTC (rev 735) +++ trunk/lib/OpenGuides/Config.pm 2006-02-22 22:10:50 UTC (rev 736) @@ -77,7 +77,7 @@ formatting_rules_link => "http://openguides.org/page/text_formatting", backlinks_in_title => 0, geo_handler => 1, - ellipsoid => "International", + ellipsoid => "WGS-84", centre_long => 0, centre_lat => 0, default_gmaps_zoom => 5, @@ -232,7 +232,7 @@ =item * geo_handler (default: C<1>) -=item * ellipsoid (default: C<International>) +=item * ellipsoid (default: C<WGS-84>) =item * gmaps_api_key @@ -254,7 +254,7 @@ =head1 COPYRIGHT - Copyright (C) 2004-2005 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2004-2006 The OpenGuides Project. All Rights Reserved. The OpenGuides distribution is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-02-21 23:28:00 UTC (rev 735) +++ trunk/lib/OpenGuides.pm 2006-02-22 22:10:50 UTC (rev 736) @@ -985,7 +985,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2006 The OpenGuides Project. All Rights Reserved. The OpenGuides distribution is free software; you can redistribute it and/or modify it under the same terms as Perl itself.

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
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