Changeset 10117

Timestamp:

08/05/2020 01:49:48 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: Search: Transform Block Directory block searches over to ElasticSearch.

Block Searches might be less reliable today while this change is finalised, a few other index alterations are needed for all current blocks to be properly indexed.
Some changes to the boosting phrases will also be needed most likely once this is finalised and we can do some proper testing.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• api/routes/class-query-plugins.php (modified) (1 diff)
• libs/site-search/jetpack-search.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-query-plugins.php

@@ -66 +66 @@
                 }
 
-                // Temporary hacky block search
-                $block_search = trim( strtolower( $request->get_param( 'block' ) ) );
+                // Block Directory searches
+                $block_search = $request->get_param( 'block' );
                 if ( $block_search ) {
-                        $meta_query = array(
-                                'relation' => 'AND',
-                                array(
-                                        'key' => 'block_files',
-                                        'compare' => 'EXISTS',
-                                ),
-                                array(
-                                        'relation' => 'OR',
-                                        array(
-                                                'key' => 'block_name',
-                                                'value' => '^' . preg_quote( $block_search ),
-                                                'compare' => 'RLIKE',
-                                        ),
-                                        array(
-                                                'key' => 'block_name',
-                                                'value' => '/' . $block_search, // search following the slash
-                                                'compare' => 'LIKE',
-                                        ),
-                                        array(
-                                                'key' => 'block_title',
-                                                'value' => $block_search, // search in title
-                                                'compare' => 'LIKE',
-                                        ),
-                                        array(
-                                                'key' => 'header_name',
-                                                'value' => $block_search, // search in plugin title
-                                                'compare' => 'LIKE',
-                                        ),
-                                )
-                        );
-
-                        // Limit the search to the Block section
-                        $query[ 'meta_query' ] = $meta_query;
-                        $query[ 'tax_query' ] = array(
-                                array(
-                                        'taxonomy' => 'plugin_section',
-                                        'field' => 'slug',
-                                        'terms' => 'block',
-                                )
-                        );
+                        $query['s'] = $block_search;
+                        $query['block_search'] = true;
                 }
 

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

@@ -430 +430 @@
                 }
 
+                // Block Search.
+                if ( !empty( $query->query['block_search'] ) ) {
+                        $es_wp_query_args['block_search'] = $query->query['block_search'];
+
+                        // Limit to the Block Tax.
+                        $es_wp_query_args['filters'][] = array(
+                                'term' => array(
+                                        'taxonomy.plugin_section.name' => array(
+                                                'value' => 'block'
+                                        )
+                                )
+                        );
+                }
+
                 $es_wp_query_args['locale'] = $query->get( 'locale' ) ?: get_locale();
 
@@ -763 +777 @@
                 }
 
+                $is_block_search = ! empty( $args['block_search'] );
+
                 if ( $args['locale'] && $args['locale'] !== 'en' && substr( $args['locale'], 0, 3 ) !== 'en_' ) {
                         $locale = $args['locale'];
@@ -788 +804 @@
                                 'taxonomy.plugin_tags.name',
                         );
+                        if ( $is_block_search ) {
+                                $boost_phrase_fields[] = 'block_title_' . $locale;
+                                $boost_phrase_fields[] = 'block_title_en^' . $en_boost;
+                        }
                         $boost_ngram_fields   = array(
                                 'title_' . $locale . '.ngram',
@@ -797 +817 @@
                                 'slug_text',
                         );
+                        if ( $is_block_search ) {
+                                $boost_title_fields[] = 'block_title_' . $locale;
+                                $boost_title_fields[] = 'block_title_en^' . $en_boost;
+                                $boost_title_fields[] = 'block_name';
+                        }
                         $boost_content_fields = array(
                                 'excerpt_' . $locale,
@@ -814 +839 @@
                                 'taxonomy.plugin_tags.name',
                         );
+                        if ( $is_block_search ) {
+                                $boost_phrase_fields[] = 'block_title_en';
+                        }
                         $boost_ngram_fields   = array(
                                 'title_en.ngram',
@@ -821 +849 @@
                                 'slug_text',
                         );
+                        if ( $is_block_search ) {
+                                $boost_title_fields[] = 'block_title_en';
+                                $boost_title_fields[] = 'block_name';
+                        }
                         $boost_content_fields = array(
                                 'excerpt_en',