From 89af7978a9711b3ab6aea7b43f292805857e8fcb Mon Sep 17 00:00:00 2001
From: ikawaha <ikawaha@users.noreply.github.com>
Date: Mon, 28 Sep 2015 15:53:08 +0900
Subject: [PATCH] fix compliation with the latest changes to kagome

---
 analysis/language/ja/ja_morph_kagome.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/analysis/language/ja/ja_morph_kagome.go b/analysis/language/ja/ja_morph_kagome.go
index 1eec87da..4045e003 100644
--- a/analysis/language/ja/ja_morph_kagome.go
+++ b/analysis/language/ja/ja_morph_kagome.go
@@ -15,23 +15,27 @@ import (
 	"github.com/blevesearch/bleve/analysis"
 	"github.com/blevesearch/bleve/registry"
 
-	"github.com/ikawaha/kagome"
+	"github.com/ikawaha/kagome/tokenizer"
 )
 
 const TokenizerName = "kagome"
 
 type KagomeMorphTokenizer struct {
-	tok *kagome.Tokenizer
+	tok tokenizer.Tokenizer
+}
+
+func init() {
+	_ = tokenizer.SysDic() // prepare system dictionary
 }
 
 func NewKagomeMorphTokenizer() *KagomeMorphTokenizer {
 	return &KagomeMorphTokenizer{
-		tok: kagome.NewTokenizer(),
+		tok: tokenizer.New(),
 	}
 }
 
-func NewKagomeMorphTokenizerWithUserDic(userdic *kagome.UserDic) *KagomeMorphTokenizer {
-	k := kagome.NewTokenizer()
+func NewKagomeMorphTokenizerWithUserDic(userdic tokenizer.UserDic) *KagomeMorphTokenizer {
+	k := tokenizer.New()
 	k.SetUserDic(userdic)
 	return &KagomeMorphTokenizer{
 		tok: k,
@@ -40,7 +44,7 @@ func NewKagomeMorphTokenizerWithUserDic(userdic *kagome.UserDic) *KagomeMorphTok
 
 func (t *KagomeMorphTokenizer) Tokenize(input []byte) analysis.TokenStream {
 	var (
-		morphs    []kagome.Token
+		morphs    []tokenizer.Token
 		prevstart int
 	)
 
@@ -49,7 +53,7 @@ func (t *KagomeMorphTokenizer) Tokenize(input []byte) analysis.TokenStream {
 		return rv
 	}
 
-	morphs = t.tok.Tokenize(string(input))
+	morphs = t.tok.Analyze(string(input), tokenizer.Search)
 
 	for i, m := range morphs {
 		if m.Surface == "EOS" || m.Surface == "BOS" {