diff --git a/src/main/java/es-plugin.properties b/src/main/java/es-plugin.properties deleted file mode 100644 index fdb2222..0000000 --- a/src/main/java/es-plugin.properties +++ /dev/null @@ -1 +0,0 @@ -plugin=org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java b/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java index e07e554..b30422b 100644 --- a/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java +++ b/src/main/java/org/elasticsearch/index/analysis/IkAnalyzerProvider.java @@ -9,14 +9,23 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; import org.wltea.analyzer.dic.Dictionary; import org.wltea.analyzer.lucene.IKAnalyzer; - +import org.elasticsearch.common.logging.ESLogger; +import org.elasticsearch.common.logging.Loggers; public class IkAnalyzerProvider extends AbstractIndexAnalyzerProvider { private final IKAnalyzer analyzer; + private ESLogger logger=null; @Inject public IkAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) { super(index, indexSettings, name, settings); - analyzer=new IKAnalyzer(settings); + +// logger = Loggers.getLogger("ik-analyzer"); +// +// logger.info("[Setting] {}",settings.getAsMap().toString()); +// logger.info("[Index Setting] {}",indexSettings.getAsMap().toString()); +// logger.info("[Env Setting] {}",env.configFile()); + + analyzer=new IKAnalyzer(indexSettings); } @Override diff --git a/src/main/java/org/wltea/analyzer/dic/Dictionary.java b/src/main/java/org/wltea/analyzer/dic/Dictionary.java index 279d01c..5b75ee0 100644 --- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java +++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java @@ -57,6 +57,8 @@ public class Dictionary { public void Init(Settings settings){ +// logger.info("[Init Setting] {}",settings.getAsMap().toString()); + if(!dictInited){ environment =new Environment(settings); configuration=new Configuration(settings); @@ -74,6 +76,17 @@ public class Dictionary { _MainDict = new DictSegment((char)0); File file= new File(environment.configFile(), Dictionary.PATH_DIC_MAIN); + +// logger.info("[Main Dict Loading] {}",file.getAbsolutePath()); +// logger.info("[Environment] {}",environment.homeFile()); +// logger.info("[Environment] {}",environment.workFile()); +// logger.info("[Environment] {}",environment.workWithClusterFile()); +// logger.info("[Environment] {}",environment.dataFiles()); +// logger.info("[Environment] {}",environment.dataWithClusterFiles()); +// logger.info("[Environment] {}",environment.configFile()); +// logger.info("[Environment] {}",environment.pluginsFile()); +// logger.info("[Environment] {}",environment.logsFile()); + InputStream is = null; try { is = new FileInputStream(file); diff --git a/src/main/java/org/wltea/analyzer/lucene/IKAnalyzer.java b/src/main/java/org/wltea/analyzer/lucene/IKAnalyzer.java index eddd5e8..60f07f1 100644 --- a/src/main/java/org/wltea/analyzer/lucene/IKAnalyzer.java +++ b/src/main/java/org/wltea/analyzer/lucene/IKAnalyzer.java @@ -25,6 +25,8 @@ public final class IKAnalyzer extends Analyzer { } public IKAnalyzer(Settings settings) { + + Dictionary.getInstance().Init(settings); }