fix some bugs

[mdictionary] / src / plugins / stardict / StarDictPlugin.cpp

diff --git a/src/plugins/stardict/StarDictPlugin.cpp b/src/plugins/stardict/StarDictPlugin.cpp
index bf75e6a..b12f843 100644 (file)
--- a/src/plugins/stardict/StarDictPlugin.cpp
+++ b/src/plugins/stardict/StarDictPlugin.cpp
@@ -24,10 +24,12 @@
 
 #include "StarDictPlugin.h"
 
+
 uint qHash(const TranslationStarDict &key) {
    return qHash(key.key());
 }
 
+
 StarDictPlugin::StarDictPlugin(QObject *parent) : CommonDictInterface(parent),
                     _langFrom(""), _langTo(""),_name(""), _infoNote("") {
     _settings = new Settings();
@@ -36,7 +38,6 @@ StarDictPlugin::StarDictPlugin(QObject *parent) : CommonDictInterface(parent),
     connect(_dictDialog, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 
-
     _settings->setValue("type","stardict");
     _icon = QIcon("/usr/share/mdictionary/stardict.png");
     _wordsCount = -1;
@@ -45,13 +46,13 @@ StarDictPlugin::StarDictPlugin(QObject *parent) : CommonDictInterface(parent),
     initAccents();
 }
 
+
 void StarDictPlugin::retranslate() {
     QString locale = QLocale::system().name();
-
     QTranslator *translator = new QTranslator(this);
 
-    if(!translator->load(":/xdxf/translations/" + locale)) {
-        translator->load(":/xdxf/translations/en_US");
+    if(!translator->load(":/stardict/translations/" + locale)) {
+        translator->load(":/stardicts/translations/en_US");
     }
     QCoreApplication::installTranslator(translator);
 }
@@ -89,26 +90,29 @@ QString StarDictPlugin::infoNote() const {
 
 
 QList<Translation*> StarDictPlugin::searchWordList(QString word, int limit) {
-    qDebug() << "StarDict searachWordList" << word;
     QList<TranslationStarDict> translations;
     bool is32b = false;
-    if(settings()->value("idxoffsetbits") == "32" ||
-            settings()->value("idxoffsetbits") == "")
-       is32b = true;
-
     bool err = 0;
     int wordcount = settings()->value("wordcount").toInt(&err);
-    if(!err)
-        return QList<Translation*>();
-
+    int counter = 0;
+    int counterLimit = 0;
     QString idxPath = settings()->value("idxFileName");
     StarDictReader * reader = StarDictReaderFactory::createReader(idxPath);
     QString fkey;
     qint64 offset = 0, len = 0;
     QRegExp keyword(word, Qt::CaseInsensitive, QRegExp::Wildcard);
 
-    int counter = 0;
-    int counterLimit = 0;
+    if( word.indexOf("*")==-1 && word.indexOf("?")==-1 &&
+        word.indexOf("_")==-1 && word.indexOf("%")==-1)
+        word+="*";
+
+
+    if((settings()->value("idxoffsetbits") == "32") ||
+                         (settings()->value("idxoffsetbits") == ""))
+        is32b = true;
+    if(!err)
+        return QList<Translation*>();
+
     stopped=false;
     while(counter < wordcount && (counterLimit<limit || limit==0) && !stopped) {
         counter++;
@@ -120,7 +124,6 @@ QList<Translation*> StarDictPlugin::searchWordList(QString word, int limit) {
         len = reader->readInt32BigEndian();
 
         if(keyword.exactMatch(fkey)) {
-            qDebug()<<"InfoNote"<<infoNote();
             TranslationStarDict tran(fkey, infoNote(), this);
             qDebug() << "off/len" << offset << len;
             int id = translations.indexOf(tran);
@@ -136,8 +139,6 @@ QList<Translation*> StarDictPlugin::searchWordList(QString word, int limit) {
     QListIterator<TranslationStarDict> it(translations);
     while(it.hasNext())
         ret.push_back(new TranslationStarDict(it.next()));
-
-
     return ret;
 }
 
@@ -149,8 +150,10 @@ QByteArray StarDictPlugin::read(QByteArray::iterator it,
     if(bytes == 0 && it != end){
         while(*it != '\0' && it != end)
             ret.append(*it++);
-        if(it == end) qDebug()<<"end";
-        else  qDebug()<<"000";
+        if(it == end)
+            qDebug()<<"end";
+        else
+            qDebug()<<"000";
     }
     else
         for(int i = 0; i < bytes && it != end; i++)
@@ -219,8 +222,9 @@ QString StarDictPlugin::interpret(QByteArray::iterator it,
         result += QString::fromUtf8(read(it++, end));
     }
 
+
 // Dont know whether mDictionary would ever handle binary stardict format
-//     to be honest dont see any kind of adventages (can't find any binary dict)
+// to be honest dont see any kind of adventages (can't find any binary dict)
  /*
     }
     else if(mode == 'W') {
@@ -251,6 +255,7 @@ QString StarDictPlugin::interpret(QByteArray::iterator it,
     return result;
 }
 
+
 QString StarDictPlugin::format(QByteArray raw, QString mode,QString key) {
     QString result;
     if(mode == "") {
@@ -272,18 +277,15 @@ QString StarDictPlugin::format(QByteArray raw, QString mode,QString key) {
 QString StarDictPlugin::search(QString key, qint64 offset, qint32 len) {
     QString dictPath = settings()->value("dictFileName");
     StarDictReader *reader = StarDictReaderFactory::createReader(dictPath);
-
     QByteArray raw = reader->readString(offset, len);
-    qDebug()<<"mod"<<settings()->value("sametypesequence");
     QString result= format(raw, settings()->value("sametypesequence"),key);
+
     delete reader;
     return result;
 }
 
 
-
 void StarDictPlugin::stop() {
-    qDebug()<<"zatrzymanie programu";
     stopped=true;
 }
 
@@ -303,14 +305,14 @@ CommonDictInterface* StarDictPlugin::getNew(const Settings *settings) const {
             setLastDialogParent(_dictDialog->lastDialogParent());
 
     if(settings && plugin->setSettings(settings)) {
-        disconnect(plugin, SIGNAL(notify(Notify::NotifyType,QString)),
-                this, SIGNAL(notify(Notify::NotifyType,QString)));
+        disconnect( plugin, SIGNAL(notify(Notify::NotifyType,QString)),
+                    this, SIGNAL(notify(Notify::NotifyType,QString)));
         plugin->getDictionaryInfo();
         return plugin;
     }
     else {
-        disconnect(plugin, SIGNAL(notify(Notify::NotifyType,QString)),
-                this, SIGNAL(notify(Notify::NotifyType,QString)));
+        disconnect( plugin, SIGNAL(notify(Notify::NotifyType,QString)),
+                    this, SIGNAL(notify(Notify::NotifyType,QString)));
         delete plugin;
         return 0;
     }
@@ -348,12 +350,11 @@ bool StarDictPlugin::getDictionaryInfo() {
     QFile file(settings()->value("ifoFileName"));
     if(!QFile::exists(_settings->value("ifoFileName"))
                 || !file.open(QFile::ReadOnly | QFile::Text)) {
-       Q_EMIT notify(Notify::Warning,
+        Q_EMIT notify(Notify::Warning,
                QString(tr("StarDict dictionary cannot be read from file")));
         qDebug()<<"Error: could not open the file";
         return false;
     }
-
     QTextStream in(&file);
     while (!in.atEnd()) {
         QString line = in.readLine();
@@ -362,7 +363,6 @@ bool StarDictPlugin::getDictionaryInfo() {
             settings()->setValue(list.at(0),list.at(1));
         }
     }
-
     _name = settings()->value("bookname");
     return true;
 }