Search on more data, return more detailed name.

horde · Nov 5, 2016 · 73ed419 · 73ed419
1 parent 9827b9c
commit 73ed419
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/framework/Service_Weather/lib/Horde/Service/Weather/Metar.php b/framework/Service_Weather/lib/Horde/Service/Weather/Metar.php
@@ -274,18 +274,18 @@ public function autocompleteLocation($search)
             return array();
         }
 
-        $sql = 'SELECT icao, name FROM ' . $this->_tableName . ' WHERE '
-            . 'name LIKE ? OR icao LIKE ?';
+        $sql = 'SELECT icao, name, state, municipality, country FROM ' . $this->_tableName . ' WHERE '
+            . 'name LIKE ? OR icao LIKE ? OR state LIKE ? OR municipality LIKE ?';
         try {
-            $rows = $this->_db->select($sql, array($search . '%', $search . '%'));
+            $rows = $this->_db->select($sql, array_fill(0, 4, $search . '%'));
         } catch (Horde_Db_Exception $e) {
             throw new Horde_Service_Weather_Exception($e);
         }
 
         $results = array();
         foreach ($rows as $row) {
             $obj = new stdClass();
-            $obj->name = $row['name'];
+            $obj->name = sprintf('%s (%s, %s, %s)', $row['name'], $row['municipality'], $row['state'], $row['country']);
             $obj->code = $row['icao'];
             $results[] = $obj;
         }
@@ -308,7 +308,7 @@ protected function _getLocations()
         if (empty($this->_db)) {
             return array();
         }
-        $sql = 'SELECT icao, name, country FROM ' . $this->_tableName . ' ORDER BY country';
+        $sql = 'SELECT icao, name, state, municipality, country FROM ' . $this->_tableName . ' ORDER BY country';
         try {
             return $this->_db->selectAll($sql);
         } catch (Horde_Exception $e) {