From 0b43ea6b03298d3dfa96720a1c4511812c544186 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 30 Aug 2012 16:33:24 +0800 Subject: [PATCH] write facade_phrase_table2.h --- src/storage/Makefile.am | 3 +- src/storage/facade_chewing_table.h | 4 +- src/storage/facade_phrase_table.h | 10 ++- src/storage/facade_phrase_table2.h | 160 +++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 7 deletions(-) create mode 100644 src/storage/facade_phrase_table2.h diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 0cdad3c..fc2ac09 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -40,7 +40,8 @@ noinst_HEADERS = pinyin_parser2.h \ pinyin_phrase2.h \ chewing_large_table.h \ facade_chewing_table.h \ - facade_phrase_table.h + facade_phrase_table.h \ + facade_phrase_table2.h noinst_LTLIBRARIES = libstorage.la diff --git a/src/storage/facade_chewing_table.h b/src/storage/facade_chewing_table.h index 3535c04..da740c4 100644 --- a/src/storage/facade_chewing_table.h +++ b/src/storage/facade_chewing_table.h @@ -143,7 +143,7 @@ public: * @phrase_length: the length of the phrase to be added. * @keys: the pinyin keys of the phrase to be added. * @token: the token of the phrase to be added. - * @returns: the add result of enum AddIndexResult. + * @returns: the add result of enum ErrorResult. * * Add the phrase token to the user chewing table. * @@ -160,7 +160,7 @@ public: * @phrase_length: the length of the phrase to be removed. * @keys: the pinyin keys of the phrase to be removed. * @token: the token of the phrase to be removed. - * @returns: the remove result of enum RemoveIndexResult. + * @returns: the remove result of enum ErrorResult. * * Remove the phrase token from the user chewing table. * diff --git a/src/storage/facade_phrase_table.h b/src/storage/facade_phrase_table.h index d3acde3..ee2ff0f 100644 --- a/src/storage/facade_phrase_table.h +++ b/src/storage/facade_phrase_table.h @@ -116,14 +116,15 @@ public: * @phrase_length: the length of the phrase to be added. * @phrase: the ucs4 characters of the phrase to be added. * @token: the token of the phrase to be added. - * @returns: the add result of enum AddIndexResult. + * @returns: the add result of enum ErrorResult. * * Add the phrase token to the user phrase table. * */ int add_index(int phrase_length, /* in */ ucs4_t phrase[], /* in */ phrase_token_t token) { - assert(NULL != m_user_phrase_table); + if (NULL == m_user_phrase_table) + return false; return m_user_phrase_table->add_index (phrase_length, phrase, token); } @@ -133,14 +134,15 @@ public: * @phrase_length: the length of the phrase to be removed. * @phrase: the ucs4 characters of the phrase to be removed. * @token: the token of the phrase to be removed. - * @returns: the remove result of enum RemoveIndexResult. + * @returns: the remove result of enum ErrorResult. * * Remove the phrase token from the user phrase table. * */ int remove_index(int phrase_length, /* in */ ucs4_t phrase[], /* out */ phrase_token_t & token){ - assert(NULL != m_user_phrase_table); + if (NULL == m_user_phrase_table) + return false; return m_user_phrase_table->remove_index (phrase_length, phrase, token); } diff --git a/src/storage/facade_phrase_table2.h b/src/storage/facade_phrase_table2.h new file mode 100644 index 0000000..ddc3e75 --- /dev/null +++ b/src/storage/facade_phrase_table2.h @@ -0,0 +1,160 @@ +/* + * libpinyin + * Library to deal with pinyin. + * + * Copyright (C) 2012 Peng Wu + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef FACADE_PHRASE_TABLE2_H +#define FACADE_PHRASE_TABLE2_H + +#include "phrase_large_table2.h" + +namespace pinyin{ + +/** + * FacadePhraseTable2: + * + * The facade class of phrase large table2. + * + */ + +class FacadePhraseTable2{ +private: + PhraseLargeTable2 * m_system_phrase_table; + PhraseLargeTable2 * m_user_phrase_table; + +public: + /** + * FacadePhraseTable2::FacadePhraseTable2: + * + * The constructor of the FacadePhraseTable2. + * + */ + FacadePhraseTable2() { + m_system_phrase_table = NULL; + m_user_phrase_table = NULL; + } + + /** + * FacadePhraseTable2::load: + * @system: the memory chunk of the system phrase table. + * @user: the memory chunk of the user phrase table. + * @returns: whether the load operation is successful. + * + * Load the system or user phrase table from the memory chunks. + * + */ + bool load(MemoryChunk * system, MemoryChunk * user) { + bool result = false; + if (system) { + m_system_phrase_table = new PhraseLargeTable; + result = m_system_phrase_table->load(system) || result; + } + if (user) { + m_user_phrase_table = new PhraseLargeTable; + result = m_user_phrase_table->load(user) || result; + } + return result; + } + + /** + * FacadePhraseTable2::store: + * @new_user: the memory chunk to store the user phrase table. + * @returns: whether the store operation is successful. + * + * Store the user phrase table to the memory chunk. + * + */ + bool store(MemoryChunk * new_user) { + if (NULL == m_user_phrase_table) + return false; + return m_user_phrase_table->store(new_user); + } + + /** + * FacadePhraseTable2::search: + * @phrase_length: the length of the phrase to be searched. + * @phrase: the ucs4 characters of the phrase to be searched. + * @tokens: the GArray of tokens to store the matched phrases. + * @returns: the search result of enum SearchResult. + * + * Search the phrase tokens according to the ucs4 characters. + * + */ + int search(int phrase_length, /* in */ ucs4_t phrase[], + /* out */ PhraseTokens tokens) const { + /* clear ranges. */ + for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) { + if (ranges[i]) + g_array_set_size(ranges[i], 0); + } + + int result = SEARCH_NONE; + + if (NULL != m_system_phrase_table) + result |= m_system_phrase_table->search + (phrase_length, phrase, tokens); + + if (NULL != m_user_phrase_table) + result |= m_user_phrase_table->search + (phrase_length, phrase, tokens); + + return result; + } + + /** + * FacadePhraseTable2::add_index: + * @phrase_length: the length of the phrase to be added. + * @phrase: the ucs4 characters of the phrase to be added. + * @token: the token of the phrase to be added. + * @returns: the add result of enum ErrorResult. + * + * Add the phrase token to the user phrase table. + * + */ + int add_index(int phrase_length, /* in */ ucs4_t phrase[], + /* in */ phrase_token_t token) { + if (NULL == m_user_phrase_table) + return false; + return m_user_phrase_table->add_index + (phrase_length, phrase, token); + } + + /** + * FacadePhraseTable2::remove_index: + * @phrase_length: the length of the phrase to be removed. + * @phrase: the ucs4 characters of the phrase to be removed. + * @token: the token of the phrase to be removed. + * @returns: the remove result of enum ErrorResult. + * + * Remove the phrase token from the user phrase table. + * + */ + int remove_index(int phrase_length, /* in */ ucs4_t phrase[], + /* in */ phrase_token_t token) { + if (NULL == m_user_phrase_table) + return false; + return m_user_phrase_table->remove_index + (phrase_length, phrase, token); + } +}; + +}; + + +#endif -- 2.7.4