Changeset 240

Timestamp:

09/23/03 15:34:48 (5 years ago)

Author:

kake

Message:

Search box now searches categories and locales as well as title and body.

Location:

trunk

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• PREREQUISITES (modified) (1 diff)
• lib/OpenGuides/SuperSearch.pm (modified) (1 diff)
• t/32_supersearch_simple_metadata.t (added)

trunk/Changes

@@ -1 @@
-0.25    
+0.25    23 September 2003
         Applied recent changes fix to front page feed as well.
+        Search box now searches categories and locales as well as title and
+          body - so for example a search on "holborn & pubs" will DTRT.
 
 0.24    8 September 2003

trunk/MANIFEST

@@ -57 +57 @@
 t/22_rss_modwiki.t
 t/31_supersearch.t
+t/32_supersearch_simple_metadata.t
 t/41_pubcrawl.t
 t/51_diff.t

trunk/PREREQUISITES

@@ -1 @@
-Modules required by OpenGuides 0.24
+Modules required by OpenGuides 0.25
 ===================================
 

trunk/lib/OpenGuides/SuperSearch.pm

@@ -175 +175 @@
     my ($self, $search) = @_;
     my $wiki = $self->{wiki};
+
+    # Search title and body.
     my %results = $wiki->search_nodes( $search );
-
     foreach my $node ( keys %results ) {
         my $key = $wiki->formatter->node_name_to_node_param( $node );
         my $text = $node . " " . $wiki->retrieve_node( $node );
         $self->{wikitext}{$key} ||= $self->_mungepage( $text );
+    }
+
+    # Search categories.
+    my @catmatches = $wiki->list_nodes_by_metadata(
+                         metadata_type => "category",
+                         metadata_value => $search,
+    );
+    foreach my $node ( @catmatches ) {
+        my $key = $wiki->formatter->node_name_to_node_param( $node );
+        my $text = $node. " " . $wiki->retrieve_node( $node );
+        $self->{wikitext}{$key} ||= $self->_mungepage( $text );
+        # Append this category so the regex finds it later.
+        $self->{wikitext}{$key} .= " [$search]";
+    }
+
+    # Search locales.
+    my @locmatches = $wiki->list_nodes_by_metadata(
+                         metadata_type => "locale",
+                         metadata_value => $search,
+    );
+    foreach my $node ( @locmatches ) {
+        my $key = $wiki->formatter->node_name_to_node_param( $node );
+        my $text = $node. " " . $wiki->retrieve_node( $node );
+        $self->{wikitext}{$key} ||= $self->_mungepage( $text );
+        # Append this locale so the regex finds it later.
+        $self->{wikitext}{$key} .= " [$search]";
     }
 }