From b348cbc5a0cc19ac4f601e9d73b6851768331e5d Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Tue, 28 Jun 2016 10:58:13 +0800
Subject: fixes pinyin_get_character_offset function

---
 src/pinyin.cpp | 24 ++++++++++++++++--------
 src/pinyin.h   | 10 +++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/pinyin.cpp b/src/pinyin.cpp
index 25da763..ca3fa78 100644
--- a/src/pinyin.cpp
+++ b/src/pinyin.cpp
@@ -2815,20 +2815,28 @@ bool pinyin_get_right_character_offset(pinyin_instance_t * instance,
 }
 
 bool pinyin_get_character_offset(pinyin_instance_t * instance,
-                                 size_t offset,
-                                 size_t * plength) {
+                                 size_t cursor,
+                                 size_t * poffset) {
+    pinyin_context_t * context = instance->m_context;
+    FacadePhraseIndex * phrase_index = context->m_phrase_index;
+
     PhoneticKeyMatrix & matrix = instance->m_matrix;
     MatchResults results = instance->m_match_results;
-    _check_offset(matrix, offset);
 
-    size_t length = 0;
-    for (size_t i = 0; i < offset; ++i) {
+    size_t offset = 0;
+    PhraseItem item;
+    for (size_t i = 0; i < cursor; ++i) {
         phrase_token_t token = g_array_index(results, phrase_token_t, i);
-        if (null_token != token)
-            ++length;
+        if (null_token == token)
+            continue;
+
+        int retval = phrase_index->get_phrase_item(token, item);
+        assert(ERROR_OK == retval);
+        guint8 len = item.get_phrase_length();
+        offset += len;
     }
 
-    *plength = length;
+    *poffset = offset;
     return true;
 }
 
diff --git a/src/pinyin.h b/src/pinyin.h
index 3400568..c691197 100644
--- a/src/pinyin.h
+++ b/src/pinyin.h
@@ -901,16 +901,16 @@ bool pinyin_get_right_character_offset(pinyin_instance_t * instance,
 /**
  * pinyin_get_character_offset:
  * @instance: the pinyin instance.
- * @offset: the lookup offset.
- * @length: the character offset.
+ * @cursor: the lookup cursor.
+ * @offset: the character offset.
  * @returns: whether the get operation is successful.
  *
- * Get the character offset from the lookup offset.
+ * Get the character offset from the lookup cursor.
  *
  */
 bool pinyin_get_character_offset(pinyin_instance_t * instance,
-                                 size_t offset,
-                                 size_t * length);
+                                 size_t cursor,
+                                 size_t * offset);
 
 #if 0
 /**
-- 
cgit