Changeset 266

Timestamp:

11/02/03 11:24:03 (5 years ago)

Author:

ivorw

Message:

Allowed return_tt_vars to process single match response.
This is mainly to make it easier to write tests.

Also fixed multi-word category and locale search.

Files:

• trunk/lib/OpenGuides/SuperSearch.pm (modified) (2 diffs)

trunk/lib/OpenGuides/SuperSearch.pm

@@ -102 +102 @@
 
         # For 0 or many we display results, for 1 we redirect to that page.
-        if ( $numres == 1 ) {
+        if ( $numres == 1 && !$self->{return_tt_vars}) {
             my ($node) = each %results;
             my $output = CGI::redirect( $self->{wikimain} . "?"
@@ -193 +193 @@
                 $self->{wikitext}{$key} ||= $self->_mungepage( $text );
             }
-
-            # Search categories.
-            my @catmatches = $wiki->list_nodes_by_metadata(
+        }
+
+        my $meta_title = join '_',@leaves;
+        my $matchstr = join ' ',@leaves;
+
+        # Search categories.
+        my @catmatches = $wiki->list_nodes_by_metadata(
                                  metadata_type  => "category",
-                                 metadata_value => $_,
+                                 metadata_value => $meta_title,
                                  ignore_case    => 1,
-            );
-
-            foreach my $node ( @catmatches ) {
+        );
+
+        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 locales.
-            my @locmatches = $wiki->list_nodes_by_metadata(
+                $self->{wikitext}{$key} .= " [$matchstr]";
+        }
+
+        # Search locales.
+        my @locmatches = $wiki->list_nodes_by_metadata(
                                  metadata_type  => "locale",
-                                 metadata_value => $_,
+                                 metadata_value => $meta_title,
                                  ignore_case    => 1,
-            );
-            foreach my $node ( @locmatches ) {
+        );
+        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} .= " [$_]";
-            }
-        } # foreach (@leaves)
+                $self->{wikitext}{$key} .= " [$matchstr]";
+        }
     } # $op eq 'word'
 } # sub _prime_wikitext