From 8482bef442b335900b100272491bc585db4e0918 Mon Sep 17 00:00:00 2001
From: yanyiwu <wuyanyi09@foxmail.com>
Date: Wed, 9 Dec 2015 00:01:27 +0800
Subject: [PATCH] change multi user dicts seperator from ':' to '|;'

---
 ChangeLog.md                    | 5 +++++
 src/DictTrie.hpp                | 2 +-
 test/unittest/segments_test.cpp | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 3a7060a..4a1407b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # CppJieba ChangeLog
 
+## v4.2.0
+
+1. 修复[issue50]提到的多词典分隔符在Windows环境下存在的问题，从':'修改成'|'或';'。
+
 ## v4.1.2
 
 1. 新增 Jieba::Locate 函数接口，作为计算分词结果的词语位置信息，在某些场景下有用，比如搜索结果高亮之类的。
@@ -132,3 +136,4 @@
 
 [Limonp]:http://github.com/yanyiwu/limonp.git
 [Husky]:http://github.com/yanyiwu/husky.git
+[issue50]:https://github.com/yanyiwu/cppjieba/issues/50
diff --git a/src/DictTrie.hpp b/src/DictTrie.hpp
index 2010c34..ba0d67e 100644
--- a/src/DictTrie.hpp
+++ b/src/DictTrie.hpp
@@ -93,7 +93,7 @@ class DictTrie {
   }
 
   void LoadUserDict(const string& filePaths) {
-    vector<string> files = limonp::split(filePaths, ":");
+    vector<string> files = limonp::split(filePaths, "|;");
     size_t lineno = 0;
     for (size_t i = 0; i < files.size(); i++) {
       ifstream ifs(files[i].c_str());
diff --git a/test/unittest/segments_test.cpp b/test/unittest/segments_test.cpp
index 0c6b3ce..421b791 100644
--- a/test/unittest/segments_test.cpp
+++ b/test/unittest/segments_test.cpp
@@ -108,7 +108,7 @@ TEST(MixSegmentTest, TestUserDict) {
 
 TEST(MixSegmentTest, TestMultiUserDict) {
   MixSegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", 
-        "../test/testdata/userdict.utf8:../test/testdata/userdict.2.utf8");
+        "../test/testdata/userdict.utf8;../test/testdata/userdict.2.utf8");
   vector<string> words;
   string res;
 
@@ -225,7 +225,7 @@ TEST(QuerySegment, Test1) {
 }
 
 TEST(QuerySegment, Test2) {
-  QuerySegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../test/testdata/userdict.utf8:../test/testdata/userdict.english", 3);
+  QuerySegment segment("../test/testdata/extra_dict/jieba.dict.small.utf8", "../dict/hmm_model.utf8", "../test/testdata/userdict.utf8|../test/testdata/userdict.english", 3);
 
   {
     const char* str = "小明硕士毕业于中国科学院计算所，后在日本京都大学深造";