KBabel: fixed support for Berkekey DB. This resolves issue #7.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/8/head
Michele Calgaro 5 years ago
parent 287738d647
commit 75c62476a5
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -341,7 +341,7 @@ DataBaseManager::openDataBase ()
db_create (&indexDb, 0, 0); db_create (&indexDb, 0, 0);
ret = db->open (db, ret = db->open (db,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
transfilename.local8Bit (), 0, DB_BTREE, 0, 0644); transfilename.local8Bit (), 0, DB_BTREE, 0, 0644);
@ -457,7 +457,7 @@ DataBaseManager::openDataBase ()
keysFile.unlink (); keysFile.unlink ();
ret = db->open (db, ret = db->open (db,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
transfilename.local8Bit (), 0, DB_BTREE, 0, transfilename.local8Bit (), 0, DB_BTREE, 0,
@ -483,7 +483,7 @@ DataBaseManager::openDataBase ()
ret = infoDb->open (infoDb, ret = infoDb->open (infoDb,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
infofilename.local8Bit (), 0, DB_RECNO, 0, 0644); infofilename.local8Bit (), 0, DB_RECNO, 0, 0644);
@ -501,7 +501,7 @@ DataBaseManager::openDataBase ()
// Words index database // Words index database
ret = wordDb->open (wordDb, ret = wordDb->open (wordDb,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
wordsfilename.local8Bit (), 0, DB_BTREE, 0, 0644); wordsfilename.local8Bit (), 0, DB_BTREE, 0, 0644);
@ -515,7 +515,7 @@ DataBaseManager::openDataBase ()
//Index of keys. //Index of keys.
ret = indexDb->open (indexDb, ret = indexDb->open (indexDb,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
keysfilename.local8Bit (), 0, DB_RECNO, 0, 0644); keysfilename.local8Bit (), 0, DB_RECNO, 0, 0644);
@ -800,7 +800,7 @@ DataBaseManager::createDataBase (TQString directory,
db->set_flags (db, DB_RECNUM); db->set_flags (db, DB_RECNUM);
ret = db->open (db, ret = db->open (db,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
filename.local8Bit (), 0, DB_BTREE, DB_CREATE | DB_EXCL, filename.local8Bit (), 0, DB_BTREE, DB_CREATE | DB_EXCL,
@ -818,7 +818,7 @@ DataBaseManager::createDataBase (TQString directory,
db_create (&infoDb, 0, 0); db_create (&infoDb, 0, 0);
ret = infoDb->open (infoDb, ret = infoDb->open (infoDb,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode); filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode);
@ -833,7 +833,7 @@ DataBaseManager::createDataBase (TQString directory,
db_create (&wordDb, 0, 0); db_create (&wordDb, 0, 0);
ret = wordDb->open (wordDb, ret = wordDb->open (wordDb,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
filename.local8Bit (), 0, DB_BTREE, DB_CREATE, mode); filename.local8Bit (), 0, DB_BTREE, DB_CREATE, mode);
@ -848,7 +848,7 @@ DataBaseManager::createDataBase (TQString directory,
db_create (&indexDb, 0, 0); db_create (&indexDb, 0, 0);
ret = indexDb->open (indexDb, ret = indexDb->open (indexDb,
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode); filename.local8Bit (), 0, DB_RECNO, DB_CREATE, mode);

@ -33,7 +33,7 @@ int DataBase::open(DBTYPE type,unsigned int flags)
{ {
int ret; int ret;
ret = Db::open( ret = Db::open(
#if DB_VERSION_MINOR > 0 #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || (DB_VERSION_MAJOR >= 5)
NULL, NULL,
#endif #endif
(const char*)filename.local8Bit(),(const char *)database.local8Bit(),type,flags,0644); (const char*)filename.local8Bit(),(const char *)database.local8Bit(),type,flags,0644);

Loading…
Cancel
Save