Changeset 2528

Timestamp:

02/22/10 22:43:48 (2 years ago)

Author:

karpet

Message:

more facet support, with CHI

Location:

Search-OpenSearch/trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/Search/OpenSearch/Engine.pm (modified) (5 diffs)
• lib/Search/OpenSearch/Response/XML.pm (modified) (5 diffs)

Search-OpenSearch/trunk/Makefile.PL

@@ -20 +20 @@
         'Data::Pageset'      => 0,
         'Search::Tools'      => 0,
+        'CHI'                => 0,
     },
     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },

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

@@ -8 +8 @@
 use Search::OpenSearch::Response::XML;
 use Search::OpenSearch::Response::JSON;
-
-__PACKAGE__->mk_accessors(qw( index facets fields link ));
+use CHI;
+
+__PACKAGE__->mk_accessors(qw( index facets fields link cache cache_ttl ));
 
 our $VERSION = '0.05';
@@ -23 +24 @@
             Search::OpenSearch::Facets->new( %{ $self->facets } ) );
     }
+    $self->{cache} ||= CHI->new(
+        driver           => 'File',
+        dir_create_mode  => 0770,
+        file_create_mode => 0660,
+        root_dir         => "/tmp/opensearch_cache",
+    );
+    $self->{cache_ttl} = 60 * 60 * 1;    # 1 hour
+
     return $self;
 }
@@ -73 +82 @@
         : $response_class->new(
         results   => $results,
-        facets    => $self->get_facets($results),
+        facets    => $self->get_facets( $query, $results ),
         fields    => $self->fields,
         offset    => $offset,
@@ -92 +101 @@
 
 sub get_facets {
-    croak "Engine " . ref( $_[0] ) . " must implement get_facets";
+    my $self      = shift;
+    my $query     = shift;
+    my $results   = shift;
+    my $cache_key = ref($self) . $query;
+    my $cache     = $self->cache or return;
+
+    my %facets;
+    if ( $cache->get($cache_key) ) {
+        %facets = %{ $cache->get($cache_key) };
+    }
+    else {
+        my $facets = $self->build_facets( $query, $results );
+        $cache->set( $cache_key, $facest, $self->cache_ttl );
+        %facets = %$facets;
+    }
+    return \%facets;
+}
+
+sub build_facets {
+    croak ref(shift) . " must implement build_facets()";
 }
 
@@ -186 +214 @@
 The base URI for Responses. Passed to Response->link.
 
+=head2 get_facets( I<query>, I<results> )
+
+Checks the cache for facets related to I<query> and, if found,
+returns them. If not found, calls build_facets(), which must
+be implemented by each Engine subclass.
+
+=head2 cache
+
+Get/set the internal CHI object. Defaults to the File driver.
+
+=head2 cache_ttl
+
+Get/set the cache key time-to-live. Default is 1 hour.
+
+=cut
+
 =head1 AUTHOR
 

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

@@ -8 +8 @@
 use URI::Encode qw( uri_encode );
 use POSIX qw( strftime );
+use Data::UUID;
 
 our $VERSION = '0.05';
@@ -20 +21 @@
 
 sub stringify {
-    my $self  = shift;
-    my $pager = $self->fetch_pager();
-
-    my @entries = $self->_build_entries;
+    my $self       = shift;
+    my $pager      = $self->fetch_pager();
+    my $UUID_maker = Data::UUID->new;
+    my @entries    = $self->_build_entries;
 
     my $now = strftime '%Y-%m-%dT%H:%M:%SZ', gmtime;
@@ -34 +35 @@
             'opensearch:startIndex'   => $self->offset,
             'opensearch:itemsPerPage' => $self->page_size,
+            'id'                      => $UUID_maker->create(),
         },
         'feed',
@@ -49 +51 @@
     );
 
-    # TODO generate uuid? cache per query?
-
     # main link
     my $link = $XMLer->singleton( 'link', { href => $self->link } );
@@ -128 +128 @@
     my $results = $self->fetch_results();
     my @entries;
+
+    #my $UUID_maker = Data::UUID->new;
+
     for my $result (@$results) {
         my $entry = $XMLer->perl_to_xml(
             {   title   => $result->{title},
                 content => $result->{summary},
-                id      => $result->{uri},
+                id      => $result->{uri},       # or uuid?
             },
-            'entry', 0, 1
+            'entry',
+            0,
+            1
         );
         my $link = $XMLer->singleton( 'link', { href => $result->{uri} } );