Changeset 10470 for sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

Timestamp:

11/26/2020 08:44:56 AM (4 years ago)

Author:

dd32

Message:

Events API: Handle queries with more than 3 "words" in the search by searching backwards until one matches. Improves matches for multi-word cities/countries.

Searches A B C D E, A B C D, A B C, A B, A for when no exact match is found.

See #3728.

File:

• sites/trunk/api.wordpress.org/public_html/events/1.0/index.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -312 +312 @@
      */
     $location_name_parts = preg_split( '/\s+/u', $location_name );
-    $location_word_count = is_array( $location_name_parts ) ? count( $location_name_parts ) : 1;
-
-    if ( ! $guess && $location_word_count >= 2 ) {
-        // Catch input like "Portland Maine"
-        $guess = guess_location_from_geonames( $location_name_parts[0], $timezone, $country_code, $wildcard = false );
-    }
-
-    if ( ! $guess && $location_word_count >= 3 ) {
-        // Catch input like "Sao Paulo Brazil"
-        $city_name = sprintf( '%s %s', $location_name_parts[0], $location_name_parts[1] );
-        $guess     = guess_location_from_geonames( $city_name, $timezone, $country_code, $wildcard = false );
+    $location_word_count = count( $location_name_parts );
+
+    // Catch input like "Portland Maine" and "Sao Paulo Brazil"
+    if ( ! $guess && $location_word_count > 1 ) {
+        foreach ( range( $location_word_count - 1, 1 ) as $i ) {
+            $city_name = implode( ' ', array_slice( $location_name_parts, 0, $i ) );
+            $guess     = guess_location_from_geonames( $city_name, $timezone, $country_code, $wildcard = false );
+
+            if ( $guess ) {
+                break; // end foreach
+            }
+        }
     }
 
@@ -386 +387 @@
             mb_strlen( $location_name )
         ) );
-    }
-
-    // Strip off null bytes
-    // @todo Modify geoname script to to this instead?
-    if ( ! empty( $row->name ) ) {
-        $row->name = trim( $row->name );
     }