<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[10228] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php: Plugin Directory: Search: Put less importance upon the description of the block plugins, and filter out the lower 1% of results.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/10228">10228</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10228","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-02 04:05:29 +0000 (Wed, 02 Sep 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Search: Put less importance upon the description of the block plugins, and filter out the lower 1% of results.
This is an attempt at making the search only return relevant results for block searches, non-block searches we want pages upon pages of result, but blocks should be more exact.
A search without any highly relevant results will still return very lowly related results and is mostly unaffected by this.
Testing has been done by re-running common searches and picking out keywords from existing block plugins and seeing what gets returned.
Note: block_name/block_title were removed as they're not being indexed properly in ElasticSearch.
See https://github.com/WordPress/gutenberg/issues/24910.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorylibssitesearchjetpacksearchphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorylibssitesearchjetpacksearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php 2020-09-01 18:21:23 UTC (rev 10227)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php 2020-09-02 04:05:29 UTC (rev 10228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Block Search.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $query->query['block_search'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_block_search = !empty( $query->query['block_search'] );
+ if ( $is_block_search ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $es_wp_query_args['block_search'] = $query->query['block_search'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Limit to the Block Tax.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,6 +456,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Only trust ES to give us IDs, not the content since it is a mirror
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args['fields'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_id',
+ 'blog_id',
+
+ /*
+ // For debugging, enabling extra fields to be returned can be helpful.
+ 'title_en',
+ 'excerpt_en',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'support_threads_resolved',
</span><span class="cx" style="display: block; padding: 0 10px"> 'support_threads_percentage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'support_resolution_yes',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,10 +473,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tested',
</span><span class="cx" style="display: block; padding: 0 10px"> 'rating',
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_modified',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_id',
- 'blog_id',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // */
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // This filter is harder to use if you're unfamiliar with ES but it allows complete control over the query
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args = apply_filters( 'jetpack_search_es_query_args', $es_query_args, $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->search_query = $es_query_args;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,6 +487,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Try filtering out super irrelevant lower 1% results from searches for Blocks.
+ if ( $is_block_search && 1 === $page ) {
+ // Include the 99%.
+ $cutoff = 0.01 * $this->search_result['results']['max_score'];
+
+ foreach ( $this->search_result['results']['hits'] as $i => $result ) {
+ if ( $result['_score'] < $cutoff ) {
+ unset( $this->search_result['results']['hits'][ $i ] );
+
+ // If we've removed an entry, pretend that this is all we've got.
+ $this->search_result['results']['total'] = count( $this->search_result['results'] );
+ }
+ }
+
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Total number of results for paging purposes
</span><span class="cx" style="display: block; padding: 0 10px"> $this->found_posts = min( $this->search_result['results']['total'], 9000 ); // The Jetpack search API errors out if we try to request past 9k
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,6 +800,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_block_search = ! empty( $args['block_search'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // How much weighting to put on the Description field.
+ // Blocks get a much lower value here, as it's more title/excerpt (short description) based.
+ $desc_boost = $is_block_search ? 0.05 : 1;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args['locale'] && $args['locale'] !== 'en' && substr( $args['locale'], 0, 3 ) !== 'en_' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = $args['locale'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,6 +816,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // As of 2017-01-23 it looked like we were off by about 10,000x,
</span><span class="cx" style="display: block; padding: 0 10px"> // so rather than 0.1 we use a much smaller multiplier of en content
</span><span class="cx" style="display: block; padding: 0 10px"> $en_boost = 0.00001;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $desc_en_boost = $desc_boost * $en_boost;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $matching_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'all_content_' . $locale,
</span><span class="cx" style="display: block; padding: 0 10px"> 'all_content_en^' . $en_boost,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,16 +825,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $boost_phrase_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_' . $locale,
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt_' . $locale,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description_' . $locale,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description_' . $locale . '^' . $desc_boost,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title_en^' . $en_boost,
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt_en^' . $en_boost,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description_en^' . $en_boost,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description_en^' . $desc_en_boost,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $is_block_search ) {
- $boost_phrase_fields[] = 'block_title_' . $locale;
- $boost_phrase_fields[] = 'block_title_en^' . $en_boost;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> $boost_ngram_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_' . $locale . '.ngram',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_en.ngram^' . $en_boost,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,16 +840,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_en^' . $en_boost,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug_text',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $is_block_search ) {
- $boost_title_fields[] = 'block_title_' . $locale;
- $boost_title_fields[] = 'block_title_en^' . $en_boost;
- $boost_title_fields[] = 'block_name';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> $boost_content_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt_' . $locale,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description_' . $locale,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description_' . $locale . '^' . $desc_boost,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'excerpt_en^' . $en_boost,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description_en^' . $en_boost,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description_en^' . $desc_en_boost,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,12 +854,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $boost_phrase_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_en',
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt_en',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description_en',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description_en^' . $desc_boost,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $is_block_search ) {
- $boost_phrase_fields[] = 'block_title_en';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> $boost_ngram_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_en.ngram',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,18 +864,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_en',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug_text',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $is_block_search ) {
- $boost_title_fields[] = 'block_title_en';
- $boost_title_fields[] = 'block_name';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> $boost_content_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt_en',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description_en',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description_en^' . $desc_boost,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //
</del><span class="cx" style="display: block; padding: 0 10px"> // Build the query - potentially extracting more filters
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: add auto phrase searching
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: add fuzzy searching to correct for spelling mistakes
</span></span></pre>
</div>
</div>
</body>
</html>