summaryrefslogtreecommitdiffstats
path: root/kbabel
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-06-01 17:54:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-06-01 17:55:12 +0900
commit75c62476a59c681f3e8e7ee2ac46b4c8e6dc3c96 (patch)
tree6baef98633cae29c42a0538d2a7a4458836d40b6 /kbabel
parent287738d6472dc3aef8f493088fd5768e8c63e44e (diff)
downloadtdesdk-75c62476a59c681f3e8e7ee2ac46b4c8e6dc3c96.tar.gz
tdesdk-75c62476a59c681f3e8e7ee2ac46b4c8e6dc3c96.zip
KBabel: fixed support for Berkekey DB. This resolves issue #7.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kbabel')
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp18
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/database.cpp2
2 files changed, 10 insertions, 10 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 5fa69de0..a059eeed 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -341,7 +341,7 @@ DataBaseManager::openDataBase ()
db_create (&indexDb, 0, 0);
ret = db->open (db,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
transfilename.local8Bit (), 0, DB_BTREE, 0, 0644);
@@ -457,7 +457,7 @@ DataBaseManager::openDataBase ()
keysFile.unlink ();
ret = db->open (db,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
transfilename.local8Bit (), 0, DB_BTREE, 0,
@@ -483,7 +483,7 @@ DataBaseManager::openDataBase ()
ret = infoDb->open (infoDb,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
infofilename.local8Bit (), 0, DB_RECNO, 0, 0644);
@@ -501,7 +501,7 @@ DataBaseManager::openDataBase ()
// Words index database
ret = wordDb->open (wordDb,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
wordsfilename.local8Bit (), 0, DB_BTREE, 0, 0644);
@@ -515,7 +515,7 @@ DataBaseManager::openDataBase ()
//Index of keys.
ret = indexDb->open (indexDb,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
keysfilename.local8Bit (), 0, DB_RECNO, 0, 0644);
@@ -800,7 +800,7 @@ DataBaseManager::createDataBase (TQString directory,
db->set_flags (db, DB_RECNUM);
ret = db->open (db,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
filename.local8Bit (), 0, DB_BTREE, DB_CREATE | DB_EXCL,
@@ -818,7 +818,7 @@ DataBaseManager::createDataBase (TQString directory,
db_create (&infoDb, 0, 0);
ret = infoDb->open (infoDb,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode);
@@ -833,7 +833,7 @@ DataBaseManager::createDataBase (TQString directory,
db_create (&wordDb, 0, 0);
ret = wordDb->open (wordDb,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
filename.local8Bit (), 0, DB_BTREE, DB_CREATE, mode);
@@ -848,7 +848,7 @@ DataBaseManager::createDataBase (TQString directory,
db_create (&indexDb, 0, 0);
ret = indexDb->open (indexDb,
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
index 0abd3dc5..18fe72c6 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
@@ -33,7 +33,7 @@ int DataBase::open(DBTYPE type,unsigned int flags)
{
int ret;
ret = Db::open(
-#if DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL,
#endif
(const char*)filename.local8Bit(),(const char *)database.local8Bit(),type,flags,0644);