diff --git a/README.textile b/README.textile index ffa7696..c05816f 100644 --- a/README.textile +++ b/README.textile @@ -107,7 +107,7 @@ curl -XPOST http://localhost:9200/index/fulltext/_mapping -d' }' -3.indexing some docs +3.index some docs
diff --git a/pom.xml b/pom.xml index 41aa0fb..79de1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@4.0.0 org.elasticsearch elasticsearch-analysis-ik -1.1.0 +1.1.2 jar IK Analyzer for ElasticSearch 2009 @@ -31,7 +31,7 @@- 0.19.4 +0.19.8 diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml index aeb7277..7394b58 100644 --- a/src/main/assemblies/plugin.xml +++ b/src/main/assemblies/plugin.xml @@ -1,6 +1,6 @@ - + ik diff --git a/src/main/java/org/wltea/analyzer/cfg/Configuration.java b/src/main/java/org/wltea/analyzer/cfg/Configuration.java index e4456d2..88c59be 100644 --- a/src/main/java/org/wltea/analyzer/cfg/Configuration.java +++ b/src/main/java/org/wltea/analyzer/cfg/Configuration.java @@ -3,27 +3,22 @@ */ package org.wltea.analyzer.cfg; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.InvalidPropertiesFormatException; -import java.util.List; -import java.util.Properties; - import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.wltea.analyzer.dic.Dictionary; import org.wltea.analyzer.seg.CJKSegmenter; import org.wltea.analyzer.seg.ISegmenter; import org.wltea.analyzer.seg.LetterSegmenter; import org.wltea.analyzer.seg.QuantifierSegmenter; -import static org.wltea.analyzer.dic.Dictionary.*; +import java.io.*; +import java.util.ArrayList; +import java.util.InvalidPropertiesFormatException; +import java.util.List; +import java.util.Properties; + +import static org.wltea.analyzer.dic.Dictionary.getInstance; public class Configuration { diff --git a/src/main/java/org/wltea/analyzer/dic/Dictionary.java b/src/main/java/org/wltea/analyzer/dic/Dictionary.java index 5b75ee0..d5fca89 100644 --- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java +++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java @@ -3,22 +3,16 @@ */ package org.wltea.analyzer.dic; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Collection; -import java.util.List; - import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.wltea.analyzer.cfg.Configuration; +import java.io.*; +import java.util.Collection; +import java.util.List; + public class Dictionary { public static final String PATH_DIC_MAIN = "ik/main.dic"; @@ -128,10 +122,12 @@ public class Dictionary { for(String extDictName : extDictFiles){ File tempFile=new File(environment.configFile(),extDictName); + try { is = new FileInputStream(tempFile); } catch (FileNotFoundException e) { e.printStackTrace(); + logger.error("[Dict Loading]",e); } if(is == null){ @@ -149,7 +145,7 @@ public class Dictionary { _MainDict.fillSegment(theWord.trim().toCharArray()); } } while (theWord != null); - logger.info("[Dict Loading] {},MainDict Size:{}",file.toString(),_MainDict.getDicNum()); + logger.info("[Dict Loading] {},MainDict Size:{}",tempFile.toString(),_MainDict.getDicNum()); } catch (IOException ioe) { System.err.println("Extension Dictionary loading exception."); ioe.printStackTrace(); zip