From d27bcb302f5a7ccb65f0e6a16c9d844f11f5db01 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 1 Jun 2020 17:54:31 +0900
Subject: KBabel: fixed support for Berkekey DB. This resolves issue #7.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 75c62476a59c681f3e8e7ee2ac46b4c8e6dc3c96)
---
 kbabel/kbabeldict/modules/dbsearchengine/database.cpp  | 18 +++++++++---------
 kbabel/kbabeldict/modules/dbsearchengine2/database.cpp |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kbabel/kbabeldict')

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);
-- 
cgit v1.2.1