<!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>[5409] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Try a loose `LIKE` search if all else fails for ideographic queries</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/5409">5409</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/5409","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-21 17:25:46 +0000 (Fri, 21 Apr 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'>Events: Try a loose `LIKE` search if all else fails for ideographic queries
Fixes https://github.com/coreymckrill/nearby-wordpress-events/issues/37</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-04-21 13:03:38 UTC (rev 5408)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2017-04-21 17:25:46 UTC (rev 5409)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,10 +229,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $location_name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $country
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $timezone
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $mode 'exact' to only return exact matches from the database;
+ * 'loose' to return any match. This has a high chance of false positives.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return stdClass|null
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function guess_ideographic_location_from_geonames( $location_name, $country, $timezone ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function guess_ideographic_location_from_geonames( $location_name, $country, $timezone, $mode = 'exact' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ideographic_countries = get_ideographic_counties();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,11 +246,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * appears in other rows, which happens sometimes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Because this will only match entries that are prefixed _and_ postfixed with a comma, it will never match the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * first and last entries in the column. That's ok, though, because the first entry is always an airport code
- * in English, which will be matched by other functions. The last entry is often ideographic, so it'd be nice
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * first and last entries in the column. That's ok, though, because the first entry is often an airport code
+ * in English, which is shorter than `ft_min_word_len` anyway. The last entry is often ideographic, so it'd be nice
</ins><span class="cx" style="display: block; padding: 0 10px"> * to match it, but this is good enough for now.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $escaped_location_name = sprintf( '%%,%s,%%', $wpdb->esc_like( $location_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $escaped_location_name = sprintf(
+ 'loose' === $mode ? '%%%s%%' : '%%,%s,%%',
+ $wpdb->esc_like( $location_name )
+ );
</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"> * REPLACE() is used because sometimes the `alternatenames` column contains entries where the `asciiname` is
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,6 +442,26 @@
</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 all else fails for a non-ASCII request, cast a wide net and try to find something before giving up, even
+ * if the chance of success if lower than normal. Returning false is guaranteed failure, so this improves things
+ * even if it only works 10% of the time.
+ *
+ * This must be done as the very last thing before giving up, because the likelihood of false positives is high.
+ */
+ if ( ! $location && isset( $args['location_name'] ) && 'ASCII' !== mb_detect_encoding( $args['location_name'] ) ) {
+ $guess = guess_ideographic_location_from_geonames( $args['location_name'], $country_code, $args['timezone'] ?? '', 'loose' );
+
+ if ( $guess ) {
+ $location = array(
+ 'description' => $guess->name,
+ 'latitude' => $guess->latitude,
+ 'longitude' => $guess->longitude,
+ 'country' => $guess->country,
+ );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $location ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['location_name'] ) || isset( $args['ip'] ) || ! empty( $args['latitude'] ) || ! empty( $args['longitude'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If any of these are specified, and no localitity was guessed based on the above checks, bail with no location.
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2017-04-21 13:03:38 UTC (rev 5408)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2017-04-21 17:25:46 UTC (rev 5409)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,6 +375,21 @@
</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">+ // The database only has 大阪市 ("Osaka-shi"), not 大阪 ("Osaka"), so an exact match will for 大阪 will fail
+ 'city-endonym-ideographic-municipal-unit-asia' => array(
+ 'input' => array(
+ 'location_name' => '大阪',
+ 'locale' => 'ja',
+ 'timezone' => 'Asia/Tokyo',
+ ),
+ 'expected' => array(
+ 'description' => 'osaka',
+ 'latitude' => '34.694',
+ 'longitude' => '135.502',
+ 'country' => 'JP',
+ ),
+ ),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'city-endonym-europe' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location_name' => 'Wien',
</span></span></pre>
</div>
</div>
</body>
</html>