diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/storage/ngram_kyotodb.cpp | 12 | ||||
| -rw-r--r-- | src/storage/phrase_large_table3_kyotodb.cpp | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/storage/ngram_kyotodb.cpp b/src/storage/ngram_kyotodb.cpp index 3de3e5b..60f7997 100644 --- a/src/storage/ngram_kyotodb.cpp +++ b/src/storage/ngram_kyotodb.cpp @@ -24,6 +24,7 @@ #include <errno.h> #include <kchashdb.h> #include <kcprotodb.h> +#include "kyotodb_utils.h" /* Use DB::visitor to get_all_items. */ @@ -117,16 +118,7 @@ bool Bigram::save_db(const char * dbfile){ bool Bigram::attach(const char * dbfile, guint32 flags){ reset(); - uint32_t mode = 0; - - if (flags & ATTACH_READONLY) - mode |= BasicDB::OREADER; - if (flags & ATTACH_READWRITE) { - assert( !( flags & ATTACH_READONLY ) ); - mode |= BasicDB::OREADER | BasicDB::OWRITER; - } - if (flags & ATTACH_CREATE) - mode |= BasicDB::OCREATE; + uint32_t mode = attach_options(flags); if (!dbfile) return false; diff --git a/src/storage/phrase_large_table3_kyotodb.cpp b/src/storage/phrase_large_table3_kyotodb.cpp index 6241c74..e78f08e 100644 --- a/src/storage/phrase_large_table3_kyotodb.cpp +++ b/src/storage/phrase_large_table3_kyotodb.cpp @@ -23,6 +23,7 @@ #include "phrase_large_table3.h" #include <kchashdb.h> #include <kcprotodb.h> +#include "kyotodb_utils.h" using namespace kyotocabinet; @@ -55,16 +56,7 @@ void PhraseLargeTable3::reset() { /* attach method */ bool PhraseLargeTable3::attach(const char * dbfile, guint32 flags) { reset(); - uint32_t mode = 0; - - if (flags & ATTACH_READONLY) - mode |= BasicDB::OREADER; - if (flags & ATTACH_READWRITE) { - assert( !( flags & ATTACH_READONLY ) ); - mode |= BasicDB::OREADER | BasicDB::OWRITER; - } - if (flags & ATTACH_CREATE) - mode |= BasicDB::OCREATE; + uint32_t mode = attach_options(flags); if (!dbfile) return false; |