Author: ilmari Date: 2007-06-10 17:02:07 +0100 (Sun, 10 Jun 2007) New Revision: 1060

Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Revert broken commit (there is no os:map_link tag)

Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/Changes 2007-06-10 16:02:07 UTC (rev 1060) @@ -16,7 +16,6 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) - Include os:map_link in node RDF (fixes #26).

0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there).

Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-10 16:02:07 UTC (rev 1060) @@ -81,7 +81,7 @@

foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude username - os_x os_y summary map_link ) ) { + os_x os_y summary ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } @@ -103,7 +103,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 map_link ) ) { + opening_hours_text ) ) { $is_geospatial = 1 if $tt_vars{$var}; }

Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/t/21_rdf.t 2007-06-10 16:02:07 UTC (rev 1060) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; }

-plan tests => 28; +plan tests => 27;

Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -56,7 +56,6 @@ opening_hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", - map_link => "http://pubsite.com/calthorpe/get_there.htm", summary => "a nice pub", } ); @@ -82,10 +81,6 @@ qr|dc:titleWiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" );

-like( $rdfxml, - qr|<os:map_link rdf:resource="http://pubsite.com/calthorpe/get_there.htm" />|, - "includes map link" ); - like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" );

Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/templates/node_rdf.tt 2007-06-10 16:02:07 UTC (rev 1060) @@ -77,10 +77,6 @@ os:y[% os_y %]</os:y> [% END %]

- [% IF map_link %] - <os:map_link rdf:resource="[% map_link %]" /> - [% END %] - [% END %]

[% IF phone OR fax OR website OR opening_hours_text %]