Changeset 2904

Timestamp:

08/02/10 15:18:33 (18 months ago)

Author:

karpet

Message:

add original search() args to internal methods

Location:

Search-OpenSearch/trunk

Files:

• Changes (modified) (1 diff)
• lib/Search/OpenSearch.pm (modified) (1 diff)
• lib/Search/OpenSearch/Engine.pm (modified) (4 diffs)
• lib/Search/OpenSearch/Facets.pm (modified) (1 diff)
• lib/Search/OpenSearch/Response.pm (modified) (1 diff)
• lib/Search/OpenSearch/Response/JSON.pm (modified) (1 diff)
• lib/Search/OpenSearch/Response/XML.pm (modified) (1 diff)

Search-OpenSearch/trunk/Changes

@@ -38 +38 @@
         * fix bug and clarify docs w.r.t 'c', 'f' and 'r' params to Engine->search()
         * add "query_json" object to Response
+
+0.10    xxx
+        * pass original args to Engine->search() through to build_results() and build_facets().
+          This (in theory) should make it easier for subclasses to extend the functionality
+          of search() without needing to override it.
+
+

Search-OpenSearch/trunk/lib/Search/OpenSearch.pm

@@ -5 +5 @@
 use Carp;
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 sub engine {

Search-OpenSearch/trunk/lib/Search/OpenSearch/Engine.pm

@@ -31 +31 @@
 );
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 use Rose::Object::MakeMethods::Generic (
@@ -136 +136 @@
                 page_size    => $page_size,
                 apply_hilite => $apply_hilite,
-                query        => $query
+                query        => $query,
+                args         => \%args,          # original args
             )
         );
     }
     if ( $include_facets && !$count_only ) {
-        $response->facets( $self->get_facets( $query, $results ) );
+        $response->facets( $self->get_facets( $query, $results, \%args ) );
     }
     my $build_time = sprintf( "%0.5f", time() - $start_build );
@@ -170 +171 @@
     else {
         $self->logger and $self->logger->log("build facets for '$cache_key'");
-        $facets = $self->build_facets( $query, $results );
+        $facets = $self->build_facets( $query, $results, @_ );
         $cache->set( $cache_key, $facets, $self->cache_ttl );
     }
@@ -206 +207 @@
             fields       => $fields,
             apply_hilite => $args{apply_hilite},
+            args         => \%args,
             );
         last if ++$count >= $page_size;

Search-OpenSearch/trunk/lib/Search/OpenSearch/Facets.pm

@@ -7 +7 @@
 __PACKAGE__->mk_accessors(qw( names sample_size ));
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 1;

Search-OpenSearch/trunk/lib/Search/OpenSearch/Response.pm

@@ -29 +29 @@
 __PACKAGE__->mk_accessors( @attributes, qw( debug pps ) );
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 sub init {

Search-OpenSearch/trunk/lib/Search/OpenSearch/Response/JSON.pm

@@ -6 +6 @@
 use JSON;
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 sub stringify {

Search-OpenSearch/trunk/lib/Search/OpenSearch/Response/XML.pm

@@ -11 +11 @@
 use Data::UUID;
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 my $XMLer = Search::Tools::XML->new;