diff options
| author | Peng Wu <alexepico@gmail.com> | 2011-05-05 11:13:34 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2011-05-05 11:13:34 +0800 |
| commit | 5f987095add7f63c7389fc5255c74fc408351c71 (patch) | |
| tree | d9ceaf3db292e659756422883352074dd79af727 /src | |
| parent | d91e11a3e0e3215db7b87eb902dc7e7f9974823f (diff) | |
| download | libpinyin-5f987095add7f63c7389fc5255c74fc408351c71.tar.gz libpinyin-5f987095add7f63c7389fc5255c74fc408351c71.tar.xz libpinyin-5f987095add7f63c7389fc5255c74fc408351c71.zip | |
refine attach method in flexible n-gram
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/novel_types.h | 9 | ||||
| -rw-r--r-- | src/storage/flexible_ngram.h | 16 | ||||
| -rw-r--r-- | src/storage/ngram.h | 6 |
3 files changed, 20 insertions, 11 deletions
diff --git a/src/include/novel_types.h b/src/include/novel_types.h index 82a9947..9f1a9fa 100644 --- a/src/include/novel_types.h +++ b/src/include/novel_types.h @@ -82,7 +82,7 @@ enum RemoveIndexResult{ }; /* For Phrase Index */ -enum PhraseIndexError{ +enum PhraseIndexResult{ ERROR_OK = 0, /* operate ok */ ERROR_NO_SUB_PHRASE_INDEX, /* sub phrase index is not loaded */ ERROR_NO_ITEM, /* item has a null slot */ @@ -91,6 +91,13 @@ enum PhraseIndexError{ ERROR_INTEGER_OVERFLOW /* integer is overflowed */ }; +/* For N-gram */ +enum ATTACH_FLAG{ + ATTACH_READONLY = 1, + ATTACH_READWRITE = 0x1 << 1, + ATTACH_CREATE = 0x1 << 2, +}; + /* * n-gram Definition * no B parameter(there are duplicated items in uni-gram and bi-gram) diff --git a/src/storage/flexible_ngram.h b/src/storage/flexible_ngram.h index 6f3c778..e5a086b 100644 --- a/src/storage/flexible_ngram.h +++ b/src/storage/flexible_ngram.h @@ -275,18 +275,26 @@ public: } /* attach berkeley db on filesystem for training purpose. */ - bool attach(const char * dbfile){ + bool attach(const char * dbfile, guint32 flags){ reset(); + u_int32_t db_flags = 0; + + if ( flags & ATTACH_READONLY ) + db_flags |= DB_RDONLY; + if ( flags & ATTACH_READWRITE ) + assert( !(flags & ATTACH_READONLY ) ); + if ( !dbfile ) return false; int ret = db_create(&m_db, NULL, 0); if ( ret != 0 ) assert(false); - ret = m_db->open(m_db, NULL, dbfile, NULL, DB_HASH, 0, 0644); - if ( ret != 0 ) { + ret = m_db->open(m_db, NULL, dbfile, NULL, DB_HASH, db_flags, 0644); + if ( ret != 0 && (flags & ATTACH_CREATE) ) { + db_flags |= DB_CREATE; /* Create database file here, and write the signature. */ - ret = m_db->open(m_db, NULL, dbfile, NULL, DB_HASH, DB_CREATE, 0644); + ret = m_db->open(m_db, NULL, dbfile, NULL, DB_HASH, db_flags, 0644); if ( ret != 0 ) return false; diff --git a/src/storage/ngram.h b/src/storage/ngram.h index 93e6ad7..a2bc7b6 100644 --- a/src/storage/ngram.h +++ b/src/storage/ngram.h @@ -26,12 +26,6 @@ namespace pinyin{ -enum { - ATTACH_READONLY = 1, - ATTACH_READWRITE = 0x1 << 1, - ATTACH_CREATE = 0x1 << 2, -}; - class Bigram; /* Note: |