From 942a02e1efe2d261f7cf8d878d50f47e4e314abf Mon Sep 17 00:00:00 2001
From: Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
Date: Thu, 2 Sep 2010 12:47:54 +0200
Subject: [PATCH] fix db worning in xdxf plugin

---
 trunk/src/base/backbone/Bookmarks.cpp          |    2 +-
 trunk/src/base/backbone/backbone.cpp           |    6 +++---
 trunk/src/plugins/xdxf/src/TranslationXdxf.cpp |    6 +++---
 trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp  |    1 -
 trunk/src/plugins/xdxf/src/xdxfplugin.cpp      |   21 +++++++++++++++------
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/trunk/src/base/backbone/Bookmarks.cpp b/trunk/src/base/backbone/Bookmarks.cpp
index 527a8a5..061e416 100644
--- a/trunk/src/base/backbone/Bookmarks.cpp
+++ b/trunk/src/base/backbone/Bookmarks.cpp
@@ -103,7 +103,7 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
         word+="%";
     word = word.replace("*", "%");
     word = word.replace("?", "_");
-    qDebug() << word;
+//    qDebug() << word;
 
     QList<Translation*> tr;
     QSqlDatabase db = getDbCnx(dbName);
diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index a206bb6..45e6b5d 100644
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -296,9 +296,9 @@ void Backbone::translationReady() {
             foreach(Translation* trans, list) {
                 if(!trans)
                     continue;
-                if(!_searchBookmarks)
-                    trans->setBookmark(_bookmarks.
-                            inBookmarks(trans->key()));
+           //     if(!_searchBookmarks)
+           //         trans->setBookmark(_bookmarks.
+          //                  inBookmarks(trans->key()));
                 _result.insert(trans->key().toLower(), trans);
            }
         }
diff --git a/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp b/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
index d505d7a..0bd9718 100644
--- a/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
+++ b/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
@@ -28,7 +28,7 @@
 
 TranslationXdxf::TranslationXdxf():_key(""),_dictionaryInfo("") {
     xdxfPlugin=0;
-    qDebug()<<"\n\n create translaton Xdxf\n\n";
+//   qDebug()<<"\n\n create translaton Xdxf\n\n";
 }
 
 TranslationXdxf::TranslationXdxf(QString _key, QString _dictionaryInfo,
@@ -38,11 +38,11 @@ TranslationXdxf::TranslationXdxf(QString _key, QString _dictionaryInfo,
         _dictHash = xdxfPlugin->hash();
     _bookmark=0;
 
-    qDebug()<<"create translaton Xdxf";
+//    qDebug()<<"create translaton Xdxf";
 }
 
 TranslationXdxf::~TranslationXdxf() {
-    qDebug()<<"delete translation:: Xdxf";
+//    qDebug()<<"delete translation:: Xdxf";
 }
 
 QString TranslationXdxf::key() const {
diff --git a/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp
index 03829c5..c3ce79e 100644
--- a/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp
@@ -78,7 +78,6 @@ void XdxfLoadDialog::selectFile() {
                                      NULL);
 
     if (!fileName.isEmpty()) {
-        qDebug()<<fileName;
         browseLabel->setText(tr("Dictionary file: %1").arg(fileName));
         _dicitonaryFilePath = fileName;
     }repaint(rect());
diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 812bf2c..176b6a6 100644
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -93,7 +93,6 @@ QList<Translation*> XdxfPlugin::searchWordListCache(QString word, int limit) {
     QSet<Translation*> translations;
     QString cacheFilePath = _settings->value("cache_path");
 
-//  QSqlDatabase::removeDatabase(cacheFilePath);
     db.setDatabaseName(cacheFilePath);
     if(!QFile::exists(cacheFilePath) || !db.open()) {
         qDebug() << "Database error" << db.lastError().text() << endl;
@@ -369,12 +368,14 @@ void XdxfPlugin::setSettings(const Settings *settings) {
 
         if(isPathChange) {
             _wordsCount=0;
-            if(oldPath!="") {
+            if(oldPath!="")
                 _settings->setValue("cached","false");
-                QSqlDatabase::removeDatabase(db_name);
+            if(_settings->value("cached")=="true"
+                    && _settings->value("cache_path")!="") {
+                db_name = _settings->value("type")
+                        + _settings->value("cache_path");
+                db = QSqlDatabase::addDatabase("QSQLITE",db_name);
             }
-            db_name = _settings->value("type") + _settings->value("path");
-            db = QSqlDatabase::addDatabase("QSQLITE",db_name);
         }
 
         if((_settings->value("cached") == "false" ||
@@ -479,6 +480,12 @@ bool XdxfPlugin::makeCache(QString) {
         i++;
     } while(QFile::exists(cachePathN));
 
+    db_name = _settings->value("type") + cachePathN;
+    db = QSqlDatabase::addDatabase("QSQLITE",db_name);
+
+    qDebug()<<QSqlDatabase::connectionNames().size();
+    foreach(QString name,QSqlDatabase::connectionNames())
+        qDebug()<<name;
     /*checke errors (File open and db open)*/
     QFile dictionaryFile(dictFileN.filePath());
     if (!QFile::exists(_settings->value("path"))
@@ -590,8 +597,10 @@ bool XdxfPlugin::makeCache(QString) {
 
 
 void XdxfPlugin::clean() {
-    if(QFile::exists(_settings->value("cache_path")))
+    if(QFile::exists(_settings->value("cache_path"))) {
         QFile(_settings->value("cache_path")).remove();
+        QSqlDatabase::removeDatabase(db_name);
+    }
 }
 
 
-- 
1.7.9.5