<!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>[4752] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php: Plugin directory search: improve search precision.</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 { 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/4752">4752</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/4752","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-20 23:36:49 +0000 (Fri, 20 Jan 2017)</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: improve search precision. Props @gibrown.
See https://meta.trac.wordpress.org/ticket/1692#comment:145 for detailed notes. This fixes most previously reported search issues.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1692">#1692</a></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 2017-01-20 23:35:06 UTC (rev 4751)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php 2017-01-20 23:36:49 UTC (rev 4752)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,13 +283,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = get_locale();
- if ( $locale && $locale !== 'en' && $locale !== 'en_US' ) {
- $es_wp_query_args['query_fields'] = array( "title_{$locale}^1.2", 'title_en^0.2', "content_{$locale}", 'content_en^0.2', "excerpt_{$locale}^1.2", 'excerpt_en^0.2', 'author', 'tag', 'category', 'slug_ngram^0.005', 'slug^1.2', 'contributors' );
- } else {
- $es_wp_query_args['query_fields'] = array( 'title_en^1.2', 'content_en', 'excerpt_en^1.2', 'author', 'tag', 'category', 'slug_ngram^0.005', 'slug^1.2', 'contributors' );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_wp_query_args['locale'] = get_locale();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // You can use this filter to modify the search query parameters, such as controlling the post_type.
</span><span class="cx" style="display: block; padding: 0 10px"> // These arguments are in the format for convert_wp_es_to_es_args(), i.e. WP-style.
</span><span class="cx" style="display: block; padding: 0 10px"> $es_wp_query_args = apply_filters( 'jetpack_search_es_wp_query_args', $es_wp_query_args, $query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,7 +482,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => get_current_blog_id(),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'query' => null, // Search phrase
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'query_fields' => array( 'title_en^2', 'content_en', 'author', 'tag', 'category', 'slug_ngram', 'contributors' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'query_fields' => array(), // hacking to be able to do a very different type of query
+ 'locale' => false,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => null, // string or an array
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => array(), // ex: array( 'taxonomy-1' => array( 'slug' ), 'taxonomy-2' => array( 'slug-a', 'slug-b' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,6 +602,12 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['locale'] && $args['locale'] !== 'en' && $args['locale'] !== 'en_US' ) {
+ $locale = $args['locale'];
+ } else {
+ $locale = 'en';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ///////////////////////////////////////////////////////////
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,8 +620,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'must' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'multi_match' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'query' => $args['query'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fields' => $args['query_fields'],
- 'type' => 'cross_fields',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'all_content_' . $locale,
+ 'boost' => 0.1,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'operator' => 'and',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,10 +629,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'multi_match' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'query' => $args['query'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fields' => $args['query_fields'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => array(
+ 'title_' . $locale,
+ 'excerpt_' . $locale,
+ 'description_' . $locale,
+ 'taxonomy.plugin_tags.name',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'phrase',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'boost' => 2
</ins><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">+ array(
+ 'multi_match' => array(
+ 'query' => $args['query'],
+ 'fields' => array(
+ 'title_' . $locale . '.ngram'
+ ),
+ 'type' => 'phrase',
+ 'boost' => 0.2
+ ),
+ ),
+ array(
+ 'multi_match' => array(
+ 'query' => $args['query'],
+ 'fields' => array(
+ 'title_' . $locale,
+ 'slug_text',
+ ),
+ 'type' => 'best_fields',
+ 'boost' => 2
+ ),
+ ),
+ array(
+ 'multi_match' => array(
+ 'query' => $args['query'],
+ 'fields' => array(
+ 'excerpt_' . $locale,
+ 'description_' . $locale,
+ 'taxonomy.plugin_tags.name',
+ ),
+ 'type' => 'best_fields',
+ 'boost' => 2
+ ),
+ ),
+ array(
+ 'multi_match' => array(
+ 'query' => $args['query'],
+ 'fields' => array(
+ 'author',
+ 'contributors',
+ ),
+ 'type' => 'best_fields',
+ 'boost' => 2
+ ),
+ ),
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -794,7 +846,6 @@
</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"> 'boost_mode' => 'multiply',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'max_boost' => 5,
</del><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></span></pre>
</div>
</div>
</body>
</html>