fix small bug(wildcard), and change some comments

[mdictionary] / src / mdictionary / backbone / Bookmarks.cpp

diff --git a/src/mdictionary/backbone/Bookmarks.cpp b/src/mdictionary/backbone/Bookmarks.cpp
index 32a3ab3..645e9ad 100644 (file)
--- a/src/mdictionary/backbone/Bookmarks.cpp
+++ b/src/mdictionary/backbone/Bookmarks.cpp
@@ -5,12 +5,11 @@
 Bookmarks::Bookmarks() {
     this->dbName = QDir::homePath() + "/.mdictionary/"
                  + "bookmarks.db";
-    checkAndCreateDb();
+    mdb = QSqlDatabase::addDatabase("QSQLITE");
+    mdb.setDatabaseName(dbName);
+    checkAndCreateDb(dbName);
     initAccents();
 
-    mdb = QSqlDatabase::addDatabase("QSQLITE",
-            QString("%2").arg((int)QThread::currentThreadId()));
-    mdb.setDatabaseName(dbName);
 }
 
 
@@ -19,31 +18,27 @@ Bookmarks::~Bookmarks() {
 }
 
 
-QSqlDatabase Bookmarks::getDbCnx(QString dbName) {
-    QSqlDatabase::removeDatabase(
-            QString("%2").arg((int)QThread::currentThreadId()));
-    QSqlDatabase db =QSqlDatabase::addDatabase("QSQLITE",
-            QString("%2").arg((int)QThread::currentThreadId()));
-    db.setDatabaseName(dbName);
-    return db;
+QSqlDatabase Bookmarks::getDbCnx(){
+    return mdb;
 }
 
 
-
-bool Bookmarks::checkAndCreateDb() {
-    QSqlDatabase db = getDbCnx(dbName);
+bool Bookmarks::checkAndCreateDb(QString dbName) {
+    QSqlDatabase db = QSqlDatabase::database();
+    if(dbName.size())
+        db.setDatabaseName(dbName);
+    else
+        db.setDatabaseName(this->dbName);
     db.open();
     QSqlQuery cur(db);
     cur.exec("create table bookmarks(key text, normalized text, translation text)");
-    db.close();
     return true;
 }
 
 
-
 void Bookmarks::clear() {
     checkAndCreateDb();
-    QSqlDatabase db = getDbCnx(dbName);
+    QSqlDatabase db = getDbCnx();
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return ;
@@ -51,14 +46,14 @@ void Bookmarks::clear() {
     QSqlQuery cur(db);
     cur.exec("drop table bookmarks");
     cur.exec("create table bookmarks(key text, normalized text,translation text)");
-    db.close();
 }
 
 
-
 void Bookmarks::add(Translation* translation) {
-    checkAndCreateDb();
-    QSqlDatabase db = getDbCnx(dbName);
+    if (!translation)
+        return ;
+    checkAndCreateDb();   
+    QSqlDatabase db = getDbCnx();
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return ;
@@ -68,15 +63,32 @@ void Bookmarks::add(Translation* translation) {
     cur.prepare("insert into bookmarks values (?,?,?)");
     cur.addBindValue(translation->key());
     cur.addBindValue(removeAccents(translation->key()));
-    cur.addBindValue(translation->toHtml());
+    cur.addBindValue(translation->toXml());
+    cur.exec();
+}
+
+
+void Bookmarks::add(QString key,QString removeAccentKey,QString value){
+    checkAndCreateDb();
+    QSqlDatabase db = getDbCnx();
+    if(!db.isOpen() && !db.open()) {
+        qDebug() << "Database error: " << db.lastError().text() << endl;
+        return ;
+    }
+    QSqlQuery cur(db);
+    cur.prepare("insert into bookmarks values (?,?,?)");
+    cur.addBindValue(key);
+    cur.addBindValue(removeAccentKey);
+    cur.addBindValue(value);
     cur.exec();
-    db.close();
 }
 
 
 void Bookmarks::remove(Translation* translation) {
+    if (!translation)
+        return ;
     checkAndCreateDb();
-    QSqlDatabase db = getDbCnx(dbName);
+    QSqlDatabase db = getDbCnx();
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return ;
@@ -85,15 +97,13 @@ void Bookmarks::remove(Translation* translation) {
     cur.prepare("delete from bookmarks where key=?");
     cur.addBindValue(translation->key());
     cur.exec();
-    db.close();
 }
 
 
-
 QList<Translation*> Bookmarks::list() {
     checkAndCreateDb();
     QList<Translation*> res;
-    QSqlDatabase db = getDbCnx(dbName);
+    QSqlDatabase db = getDbCnx();
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return res;
@@ -103,12 +113,10 @@ QList<Translation*> Bookmarks::list() {
     while(cur.next())
         res.append(new BookmarkTranslation(cur.value(0).toString(),
                 this, dbName));
-    db.close();
     return res;
 }
 
 
-
 QList<Translation*> Bookmarks::searchWordList(QString word) {
     checkAndCreateDb();
     if(word.indexOf("*")==-1 && word.indexOf("?")== -1)
@@ -117,7 +125,7 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
     word = word.replace("?", "_");
 
     QList<Translation*> tr;
-    QSqlDatabase db = getDbCnx(dbName);
+    QSqlDatabase db = getDbCnx();
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return tr;
@@ -132,16 +140,14 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
         res.insert(cur.value(0).toString());
     foreach(QString str, res.toList())
         tr.append(new BookmarkTranslation(str, this, dbName));
-    db.close();
     return tr;
 }
 
 
-
 QStringList Bookmarks::search(QString word, QString dbName) {
-    checkAndCreateDb();
     QStringList result;
-    QSqlDatabase db = getDbCnx(dbName);
+    QSqlDatabase db = QSqlDatabase::database();
+    db.setDatabaseName(dbName);
     if(!db.isOpen() && !db.open()) {
         qDebug() << "Database error: " << db.lastError().text() << endl;
         return result;
@@ -153,13 +159,10 @@ QStringList Bookmarks::search(QString word, QString dbName) {
     while(cur.next())
         result << cur.value(0).toString();
 
-    db.close();
     return result;
 }
 
 
-
-
 bool Bookmarks::inBookmarks(QString word) {
     if(!mdb.isOpen() && !mdb.open()) {
         qDebug() << "Database error: " << mdb.lastError().text() << endl;