Changeset 3470

Timestamp:

06/19/2016 12:31:50 PM (10 years ago)

Author:

tellyworth

Message:

Search: include modified date cutoff, phrase query.

Modified timestamps in the DB right now are incorrect, so the 2-year age cutoff is not currently reflected in search results; but it should work once the data is fixed.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

@@ -251 +251 @@
             $posts_per_page = 15;
 
+        $date_cutoff = strftime( '%Y-%m-%d', strtotime( '-2 years' ) );
+        $date_today = strftime( '%Y-%m-%d' );
+
         // Start building the WP-style search query args
         // They'll be translated to ES format args later
@@ -259 +262 @@
             'orderby'        => $query->get( 'orderby' ),
             'order'          => $query->get( 'order' ),
+            // plugin directory specific:
+            'date_range'     =>  array( 'field' => 'modified', 'gte' => $date_cutoff, 'lte' => $date_today ),
         );
 
@@ -553 +558 @@
         if ( $args['query'] ) {
             $analyzer = Jetpack_Search::get_analyzer_name( $this->blog_lang );
-            $query = array( 'multi_match' => array(
-                'query'  => $args['query'],
-                'fields' => $args['query_fields'],
-                'operator'  => 'and',
-                'type'  => 'cross_fields',
-                'analyzer' => $analyzer
-            ) );
+            $query = array( 
+                'bool' => array(
+                    'must' => array(
+                        'multi_match' => array(
+                            'query'  => $args['query'],
+                            'fields' => $args['query_fields'],
+                            'type'  => 'cross_fields',
+                            'analyzer' => $analyzer
+                        ),
+                    ),
+                    'should' => array(
+                        'multi_match' => array(
+                            'query'  => $args['query'],
+                            'fields' => $args['query_fields'],
+                            'type'  => 'phrase',
+                            'analyzer' => $analyzer
+                        ),
+                    ),
+                ),
+            );
+
             $es_query_args['query'] = Jetpack_Search::score_query_by_recency( $query );
 
@@ -611 +630 @@
             $es_query_args['filter'] = array( 'match_all' => new stdClass() );
         }
-    
+
         return $es_query_args;
     }