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 729ad0526f70460098d9127db6f3a991713e3f6e..6bc14228cb007bb69daa637f536c4cd6cd391bcf 100644 (file)
--- 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 c5cd7feea06615341ceb22459f6fec4beebab7af..2db4c89878697dcf422af3a88ee1337ab43de3f8 100644 (file)
--- 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