From: James Turner <zakalawe@mac.com>
Date: Thu, 8 Nov 2012 18:31:16 +0000 (+0000)
Subject: Bug 921
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18e3fc0c82c1a05c56b0349a216754c5e9bb529b;p=flightgear.git

Bug 921

Fix GPS search functionality, I mixed up the SQlite wild-card operator.
---

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 729ad0526..6bc14228c 100644
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -1435,7 +1435,7 @@ FGPositioned::Type GPS::SearchFilter::minType() const
 
 FGPositioned::Type GPS::SearchFilter::maxType() const
 {
-  return FGPositioned::WAYPOINT;
+  return FGPositioned::VOR;
 }
 
 FGPositioned::Filter* GPS::createFilter(FGPositioned::Type aTy)
diff --git a/src/Navaids/NavDataCache.cxx b/src/Navaids/NavDataCache.cxx
index c5cd7feea..2db4c8987 100644
--- a/src/Navaids/NavDataCache.cxx
+++ b/src/Navaids/NavDataCache.cxx
@@ -809,13 +809,13 @@ public:
                                      FGPositioned::Filter* filter, bool exact)
   {
     string query = s;
-    if (!exact) query += "*";
+    if (!exact) query += "%";
     
   // build up SQL query text
     string matchTerm = exact ? "=?1" : " LIKE ?1";
     string sql = "SELECT rowid FROM positioned WHERE " + column + matchTerm;
     if (filter) {
-      sql += AND_TYPED;
+      sql += " " AND_TYPED;
     }
 
   // find or prepare a suitable statement frrm the SQL