X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=trunk%2Fsrc%2Fplugins%2Fxdxf%2Fsrc%2Fxdxfplugin.cpp;h=7f2686845e6764d4858cf81f260b53088cb2420d;hb=048304fb3c55a219273aa811f2e5ca5e9eb70e80;hp=0a0a5461ad402185b27f8cf26a3b04a7652981d3;hpb=4cdaafcc773201d53dc935910f920a9a4b39625b;p=mdictionary

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 0a0a546..7f26868 100644
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -67,7 +67,8 @@ QString XdxfPlugin::infoNote() const {
 }
 
 QList<Translation*> XdxfPlugin::searchWordList(QString word, int limit) {
-    if(_settings->value("cached") == "true")
+    //if(_settings->value("cached") == "true")
+    if(isCached())
         return searchWordListCache(word,limit);
     return searchWordListFile(word, limit);
 }
@@ -154,7 +155,8 @@ QList<Translation*> XdxfPlugin::searchWordListFile(QString word, int limit) {
 }
 
 QString XdxfPlugin::search(QString key) {
-    if(_settings->value("cached") == "true")
+//    if(_settings->value("cached") == "true")
+    if(isCached())
         return searchCache(key);
     return searchFile(key);
 }
@@ -288,6 +290,8 @@ Settings* XdxfPlugin::settings() {
 
 bool XdxfPlugin::isCached()
 {
+    if(_settings->value("cached") == "true")
+        return true;
     return false;
 }
 
@@ -346,7 +350,9 @@ QString XdxfPlugin::removeAccents(QString string) {
             !normalized[i].isSpace() &&
             !normalized[i].isDigit() &&
             normalized[i] != '*' &&
-            normalized[i] != '%') {
+            normalized[i] != '%' &&
+            normalized[i] != '_' &&
+            normalized[i] != '?' ) {
             normalized.remove(i,1);
         }
     }