diff options
author | Peng Wu <alexepico@gmail.com> | 2013-04-10 14:27:12 +0800 |
---|---|---|
committer | Peng Wu <alexepico@gmail.com> | 2013-04-10 14:27:12 +0800 |
commit | 865b5c981d6574e21efa58944182ceb67287eced (patch) | |
tree | 67bf06d87bd1cd5ea79e268b77bf16356f613d29 | |
parent | 429090fb1a486f0d71fe7cf8a16b4e4d26161202 (diff) | |
download | libpinyin-865b5c981d6574e21efa58944182ceb67287eced.tar.gz libpinyin-865b5c981d6574e21efa58944182ceb67287eced.tar.xz libpinyin-865b5c981d6574e21efa58944182ceb67287eced.zip |
update utils/storage
-rw-r--r-- | utils/storage/export_interpolation.cpp | 14 | ||||
-rw-r--r-- | utils/storage/import_interpolation.cpp | 18 |
2 files changed, 28 insertions, 4 deletions
diff --git a/utils/storage/export_interpolation.cpp b/utils/storage/export_interpolation.cpp index 4d289b4..795b21d 100644 --- a/utils/storage/export_interpolation.cpp +++ b/utils/storage/export_interpolation.cpp @@ -45,8 +45,20 @@ int main(int argc, char * argv[]){ FILE * output = stdout; const char * bigram_filename = "bigram.db"; + SystemTableInfo system_table_info; + + bool retval = system_table_info.load("table.conf"); + if (!retval) { + fprintf(stderr, "load table.conf failed.\n"); + exit(ENOENT); + } + FacadePhraseIndex phrase_index; - if (!load_phrase_index(&phrase_index)) + + const pinyin_table_info_t * phrase_files = + system_table_info.get_table_info(); + + if (!load_phrase_index(phrase_files, &phrase_index)) exit(ENOENT); Bigram bigram; diff --git a/utils/storage/import_interpolation.cpp b/utils/storage/import_interpolation.cpp index 9574746..c1ac601 100644 --- a/utils/storage/import_interpolation.cpp +++ b/utils/storage/import_interpolation.cpp @@ -224,10 +224,18 @@ int main(int argc, char * argv[]){ FILE * input = stdin; const char * bigram_filename = "bigram.db"; + SystemTableInfo system_table_info; + + bool retval = system_table_info.load("table.conf"); + if (!retval) { + fprintf(stderr, "load table.conf failed.\n"); + exit(ENOENT); + } + PhraseLargeTable2 phrase_table; MemoryChunk * chunk = new MemoryChunk; - bool retval = chunk->load("phrase_index.bin"); + retval = chunk->load("phrase_index.bin"); if (!retval) { fprintf(stderr, "open phrase_index.bin failed!\n"); exit(ENOENT); @@ -235,7 +243,11 @@ int main(int argc, char * argv[]){ phrase_table.load(chunk); FacadePhraseIndex phrase_index; - if (!load_phrase_index(&phrase_index)) + + const pinyin_table_info_t * phrase_files = + system_table_info.get_table_info(); + + if (!load_phrase_index(phrase_files, &phrase_index)) exit(ENOENT); Bigram bigram; @@ -266,7 +278,7 @@ int main(int argc, char * argv[]){ taglib_fini(); - if (!save_phrase_index(&phrase_index)) + if (!save_phrase_index(phrase_files, &phrase_index)) exit(ENOENT); return 0; |