diff options
Diffstat (limited to 'src/storage/phrase_large_table.cpp')
| -rw-r--r-- | src/storage/phrase_large_table.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/storage/phrase_large_table.cpp b/src/storage/phrase_large_table.cpp index 9e5e2d6..195024e 100644 --- a/src/storage/phrase_large_table.cpp +++ b/src/storage/phrase_large_table.cpp @@ -238,7 +238,7 @@ int PhraseBitmapIndexLevel::remove_index( int phrase_length, /* in */ ucs4_t phr PhraseLengthIndexLevel * &length_array = m_phrase_length_indexes[first_key]; if ( length_array ) return length_array->remove_index(phrase_length, phrase, token); - return REMOVE_ITEM_DONOT_EXISTS; + return ERROR_REMOVE_ITEM_DONOT_EXISTS; } int PhraseLengthIndexLevel::add_index( int phrase_length, /* in */ ucs4_t phrase[], /* in */ phrase_token_t token){ @@ -282,13 +282,13 @@ int PhraseLengthIndexLevel::add_index( int phrase_length, /* in */ ucs4_t phrase int PhraseLengthIndexLevel::remove_index( int phrase_length, /* in */ ucs4_t phrase[], /* out */ phrase_token_t & token){ assert(phrase_length + 1 < MAX_PHRASE_LENGTH); if ( m_phrase_array_indexes -> len <= phrase_length ) - return REMOVE_ITEM_DONOT_EXISTS; + return ERROR_REMOVE_ITEM_DONOT_EXISTS; #define CASE(len) case len: \ { \ PhraseArrayIndexLevel<len> * &array = g_array_index \ (m_phrase_array_indexes, PhraseArrayIndexLevel<len> *, len); \ if ( !array ) \ - return REMOVE_ITEM_DONOT_EXISTS; \ + return ERROR_REMOVE_ITEM_DONOT_EXISTS; \ return array->remove_index(phrase, token); \ } @@ -328,14 +328,14 @@ int PhraseArrayIndexLevel<phrase_length>::add_index(/* in */ ucs4_t phrase[], /* assert(range.second - range.first <= 1); if ( range.second - range.first == 1 ) - return INSERT_ITEM_EXISTS; + return ERROR_INSERT_ITEM_EXISTS; PhraseIndexItem<phrase_length> * cur_elem = range.first; int offset = (cur_elem - buf_begin) * sizeof(PhraseIndexItem<phrase_length>); m_chunk.insert_content(offset, &new_elem, sizeof(PhraseIndexItem<phrase_length> )); - return INSERT_OK; + return ERROR_OK; } template<size_t phrase_length> @@ -352,13 +352,13 @@ int PhraseArrayIndexLevel<phrase_length>::remove_index(/* in */ ucs4_t phrase[], assert(range.second - range.first <= 1); PhraseIndexItem<phrase_length> * cur_elem = range.first; if ( range.first == range.second || cur_elem == buf_end) - return REMOVE_ITEM_DONOT_EXISTS; + return ERROR_REMOVE_ITEM_DONOT_EXISTS; token = cur_elem->m_token; int offset = (cur_elem - buf_begin) * sizeof(PhraseIndexItem<phrase_length>); m_chunk.remove_content(offset, sizeof (PhraseIndexItem<phrase_length>)); - return REMOVE_OK; + return ERROR_OK; } bool PhraseLargeTable::load_text(FILE * infile){ |