auto download textual model data

diff --git a/autogen.sh b/autogen.sh
index 5c951b8..cb8d4ae 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,8 @@
 
 aclocal
 
+libtoolize --force
+
 autoheader
 
 automake -a

diff --git a/data/Makefile.am b/data/Makefile.am
index 93aff44..25e4683 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,6 +34,10 @@ libpinyin_dbdir              = $(pkgdatadir)/data
 
 CLEANFILES             = $(binary_model_data)
 
+$(textual_model_data):
+       wget https://github.com/downloads/libpinyin/libpinyin/model.text.tar.gz
+       tar xvf model.text.tar.gz
+
 $(binary_model_data): $(textual_model_data)
        $(RM) $(binary_model_data)
        ../utils/storage/gen_binary_files --table-dir $(top_srcdir)/data

diff --git a/src/pinyin.cpp b/src/pinyin.cpp
index 2d4015a..a34136a 100644 (file)
--- a/src/pinyin.cpp
+++ b/src/pinyin.cpp
@@ -67,7 +67,7 @@ pinyin_context_t * pinyin_init(const char * systemdir, const char * userdir){
     context->m_phrase_index->merge(2, log);
 
     context->m_system_bigram = new Bigram;
-    filename = g_build_filename(context->m_system_dir, "system.db", NULL);
+    filename = g_build_filename(context->m_system_dir, "bigram.db", NULL);
     context->m_system_bigram->attach(filename, ATTACH_READONLY);
     context->m_user_bigram = new Bigram;
     filename = g_build_filename(context->m_user_dir, "user.db", NULL);