Changeset 338

Timestamp:

03/26/04 17:28:30 (5 years ago)

Author:

earle

Message:

Fixed RDF.pm to use default city and country if the node in question is geospatial in topic.
Added language to TT vars for search.

Location:

trunk/lib/OpenGuides

Files:

• RDF.pm (modified) (4 diffs)
• SuperSearch.pm (modified) (3 diffs)

trunk/lib/OpenGuides/RDF.pm

@@ -143 +143 @@
     my $opening_hours_text = $node_data{metadata}{opening_hours_text}[0] || '';
     my $postcode           = $node_data{metadata}{postcode}[0]           || '';
-    my $city               = $node_data{metadata}{city}[0]               || '';
-    my $country            = $node_data{metadata}{country}[0]            || '';
+    my $city               = $node_data{metadata}{city}[0]               || $self->{default_city};
+    my $country            = $node_data{metadata}{country}[0]            || $self->{default_country};
     my $latitude           = $node_data{metadata}{latitude}[0]           || '';
     my $longitude          = $node_data{metadata}{longitude}[0]          || '';
@@ -154 +154 @@
     my @locales            = @{ $node_data{metadata}{locale} || [] };
 
-    my $objType;
+    my ($is_geospatial, $objType);
 
     if ($latitude || $longitude || $postcode || $city || $country || @locales)
     {
-      $objType = 'geo:SpatialThing';
+      $is_geospatial = 1;
+      $objType    = 'geo:SpatialThing';
     }
     else
@@ -203 +204 @@
   <$objType rdf:ID="obj" dc:title="$node_name">
 };
-
     $rdf .= "    <!-- categories -->\n";
-    $rdf .= "    <dc:subject>$_</dc:subject>\n" foreach @{$catrefs};
+    $rdf .= "    <dc:subject>$_</dc:subject>\n"             foreach @{$catrefs};
     $rdf .= "\n    <!-- address and geospatial data -->\n";
-    $rdf .= "    <city>$city</city>" if $city;
-    $rdf .= "    <postalCode>$postcode</postalCode>\n" if $postcode;
-    $rdf .= "    <country>$country</country>\n" if $country;
-    $rdf .= "    <wn:Neighborhood>$_</wn:Neighborhood>\n" foreach @locales;
+    $rdf .= "    <city>$city</city>"                        if $is_geospatial;
+    $rdf .= "    <postalCode>$postcode</postalCode>\n"      if $postcode;
+    $rdf .= "    <country>$country</country>\n"             if $is_geospatial;
+    $rdf .= "    <wn:Neighborhood>$_</wn:Neighborhood>\n"   foreach @locales;
 
     if ($latitude && $longitude) {
@@ -224 +224 @@
 
     $rdf .= "\n    <!-- contact information -->\n";
-    $rdf .= "    <phone>$phone</phone>\n" if $phone;
-    $rdf .= "    <fax>$fax</fax>\n" if $fax;
-    $rdf .= "    <homePage>$website</homePage>\n" if $website;
+    $rdf .= "    <phone>$phone</phone>\n"                              if $phone;
+    $rdf .= "    <fax>$fax</fax>\n"                                    if $fax;
+    $rdf .= "    <homePage>$website</homePage>\n"                      if $website;
     $rdf .= "    <chefmoz:Hours>$opening_hours_text</chefmoz:Hours>\n" if $opening_hours_text;
 

trunk/lib/OpenGuides/SuperSearch.pm

@@ -44 +44 @@
     my ($class, %args) = @_;
     my $config = $args{config};
-    my $self = { config => $config };
+    my $self   = { config => $config };
     bless $self, $class;
+
     my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
-    $self->{wiki} = $wiki;
+
+    $self->{wiki}     = $wiki;
     $self->{wikimain} = $config->{_}{script_url} . $config->{_}{script_name};
-    $self->{css} = $config->{_}{stylesheet_url};
-    $self->{head} = $config->{_}{site_name} . " Search";
+    $self->{css}      = $config->{_}{stylesheet_url};
+    $self->{head}     = $config->{_}{site_name} . " Search";
+    $self->{language} = $config->{_}{default_language}; 
+
     return $self;
 }
@@ -87 +91 @@
 
     $tt_vars{ss_version}  = $VERSION;
-    $tt_vars{ss_info_url} = 'http://openguides.org/london?Search_Script';
+    $tt_vars{ss_info_url} = 'http://london.openguides.org/?Search_Script';
 
     # Do we have an existing search? if so, do it.
@@ -156 +160 @@
     my ($self, %args) = @_;
     my $tt_vars = $args{tt_vars} || {};
+    $tt_vars->{language} = $self->{language};
+
     $tt_vars->{not_editable} = 1;