refine utils

3 files changed, 8 insertions, 30 deletions

diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am
index f8f03a5..cb54626 100644
--- a/utils/storage/Makefile.am
+++ b/utils/storage/Makefile.am
@@ -19,6 +19,7 @@ INCLUDES                = -I$(top_srcdir)/src \
                           -I$(top_srcdir)/src/include \
                           -I$(top_srcdir)/src/storage \
                           -I$(top_srcdir)/src/lookup \
+			  -I$(top_srcdir)/utils \
                           @GLIB2_CPPFLAGS@
 
 bin_PROGRAMS		 = gen_binary_files \
diff --git a/utils/storage/export_interpolation.cpp b/utils/storage/export_interpolation.cpp
index 60e27d6..10dcbdd 100644
--- a/utils/storage/export_interpolation.cpp
+++ b/utils/storage/export_interpolation.cpp
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <glib.h>
 #include "pinyin_internal.h"
-
+#include "utils_helper.h"
 
 /* export interpolation model as textual format */
 
@@ -47,20 +47,8 @@ int main(int argc, char * argv[]){
     MemoryChunk * chunk = NULL;
 
     FacadePhraseIndex phrase_index;
-    for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) {
-        const char * bin_file = pinyin_phrase_files[i];
-        if (NULL == bin_file)
-            continue;
-
-        chunk = new MemoryChunk;
-        bool retval = chunk->load(bin_file);
-        if (!retval) {
-            fprintf(stderr, "open %s failed!\n", bin_file);
-            exit(ENOENT);
-        }
-
-        phrase_index.load(i, chunk);
-    }
+    if (!init_phrase_index(&phrase_index))
+        exit(ENOENT);
 
     Bigram bigram;
     bigram.attach(bigram_filename, ATTACH_READONLY);
@@ -80,7 +68,7 @@ bool gen_unigram(FILE * output, FacadePhraseIndex * phrase_index) {
 
         PhraseIndexRange range;
         int result = phrase_index->get_range(i, range);
-        if ( result )
+        if (ERROR_OK != result )
             continue;
 
         PhraseItem item;
diff --git a/utils/storage/import_interpolation.cpp b/utils/storage/import_interpolation.cpp
index 0bc45ba..89e2276 100644
--- a/utils/storage/import_interpolation.cpp
+++ b/utils/storage/import_interpolation.cpp
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include "pinyin_internal.h"
+#include "utils_helper.h"
 
 enum LINE_TYPE{
     BEGIN_LINE = 1,
@@ -207,20 +208,8 @@ int main(int argc, char * argv[]){
     phrases.load(chunk);
 
     FacadePhraseIndex phrase_index;
-    for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) {
-        const char * bin_file = pinyin_phrase_files[i];
-        if (NULL == bin_file)
-            continue;
-
-        chunk = new MemoryChunk;
-        bool retval = chunk->load(bin_file);
-        if (!retval) {
-            fprintf(stderr, "open %s failed!\n", bin_file);
-            exit(ENOENT);
-        }
-
-        phrase_index.load(i, chunk);
-    }
+    if (!init_phrase_index(&phrase_index))
+        exit(ENOENT);
 
     Bigram bigram;
     retval = bigram.attach(bigram_filename, ATTACH_CREATE|ATTACH_READWRITE);