Ticket #26: ticket_26.patch

trunk/t/21_rdf.t

@@ -5 +5 @@
 use OpenGuides::Utils;
 use OpenGuides::Test;
 use URI::Escape;
-use Test::More tests => 27;
+use Test::More tests => 28;
 
 eval { require DBD::SQLite; };
 my $have_sqlite = $@ ? 0 : 1;
@@ -59 +59 @@
             latitude           => "51.524193",
             longitude          => "-0.114436",
             summary            => "a nice pub",
+            map_link           => "http://pubsite.com/calthorpe/get_there.htm",
         }
     );
 
@@ -83 +84 @@
         qr|<dc:title>CGI::Wiki 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" />|,
+        "Map link" );
+
     like( $rdfxml, qr|<dc:contributor foaf:nick="Kake" />|,
         "last username to edit used as contributor" );
 

trunk/lib/OpenGuides/RDF.pm

@@ -76 +76 @@
     my $username           = $node_data{metadata}{username}[0]           || '';
     my $os_x               = $node_data{metadata}{os_x}[0]               || '';
     my $os_y               = $node_data{metadata}{os_y}[0]               || '';
+    my $map_link           = $node_data{metadata}{map_link}[0]           || '';
     my @categories         = @{ $node_data{metadata}{category} || [] };
     my @locales            = @{ $node_data{metadata}{locale} || [] };
     my $summary            = $node_data{metadata}{summary}[0]            || '';
@@ -83 +84 @@
     # replace any errant characters in data to prevent illegal XML
     foreach ($phone, $fax, $website, $opening_hours_text, $address, $postcode, 
              $city, $country, $latitude, $longitude, $version, $os_x, $os_y, 
-             @categories, @locales, $summary)
+             @categories, @locales, $summary, $map_link)
     {
       if ($_)
       {
@@ -95 +96 @@
     
     my ($is_geospatial, $objType);
 
-    if ($os_x || $os_y || $latitude || $longitude || $address || $postcode || @locales || $opening_hours_text) {
+    if ($os_x || $os_y || $latitude || $longitude || $address || $postcode ||
+        @locales || $opening_hours_text || $map_link) {
         $is_geospatial = 1;
         $objType    = 'geo:SpatialThing';
     } else {
@@ -172 +174 @@
     <os:x>$os_x</os:x>
     <os:y>$os_y</os:y>};
       }
+      if ($map_link) {
+          $rdf .= qq{\n<os:map_link rdf:resource="$map_link" />};
+      }
     }
-    
     $rdf .= "\n\n    <!-- contact information -->\n\n" if ($phone || $fax || $website || $opening_hours_text);
     $rdf .= "    <phone>$phone</phone>\n"                              if $phone;
     $rdf .= "    <fax>$fax</fax>\n"                                    if $fax;