<!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>[10117] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Search: Transform Block Directory block searches over to ElasticSearch.</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/10117">10117</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/10117","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-08-05 01:49:48 +0000 (Wed, 05 Aug 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: 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclassquerypluginsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-query-plugins.php</a></li>
<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_htmlwpcontentpluginsplugindirectoryapiroutesclassquerypluginsphp"></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/api/routes/class-query-plugins.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/api/routes/class-query-plugins.php 2020-08-05 01:36:05 UTC (rev 10116)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-query-plugins.php 2020-08-05 01:49:48 UTC (rev 10117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,49 +65,11 @@
</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">- // Temporary hacky block search
- $block_search = trim( strtolower( $request->get_param( 'block' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Block Directory searches
+ $block_search = $request->get_param( 'block' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $block_search ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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',
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query['s'] = $block_search;
+ $query['block_search'] = true;
</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"> if ( ! $query ) {
</span></span></pre></div>
<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-08-05 01:36:05 UTC (rev 10116)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php 2020-08-05 01:49:48 UTC (rev 10117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,6 +429,20 @@
</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">+ // 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'
+ )
+ )
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $es_wp_query_args['locale'] = $query->get( 'locale' ) ?: get_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,6 +776,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_block_search = ! empty( $args['block_search'] );
+
</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">@@ -787,6 +803,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description_en^' . $en_boost,
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</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 ( $is_block_search ) {
+ $boost_phrase_fields[] = 'block_title_' . $locale;
+ $boost_phrase_fields[] = 'block_title_en^' . $en_boost;
+ }
</ins><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">@@ -796,6 +816,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><ins style="background-color: #dfd; 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';
+ }
</ins><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><span class="cx" style="display: block; padding: 0 10px"> 'description_' . $locale,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,6 +838,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description_en',
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</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 ( $is_block_search ) {
+ $boost_phrase_fields[] = 'block_title_en';
+ }
</ins><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">@@ -820,6 +848,10 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_block_search ) {
+ $boost_title_fields[] = 'block_title_en';
+ $boost_title_fields[] = 'block_name';
+ }
</ins><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><span class="cx" style="display: block; padding: 0 10px"> 'description_en',
</span></span></pre>
</div>
</div>
</body>
</html>