From 7607a66e0e66310899d241d1b0116fc8725075f8 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 13 Dec 2012 22:05:52 +0800
Subject: [PATCH] fix logging

---
 README.textile                                |  2 +-
 pom.xml                                       |  4 ++--
 src/main/assemblies/plugin.xml                |  2 +-
 .../org/wltea/analyzer/cfg/Configuration.java | 19 +++++++------------
 .../org/wltea/analyzer/dic/Dictionary.java    | 18 +++++++-----------
 5 files changed, 18 insertions(+), 27 deletions(-)

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'
 }'
 </pre>
 
-3.indexing some docs
+3.index some docs
 
 <pre>
 
diff --git a/pom.xml b/pom.xml
index 41aa0fb..79de1e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-ik</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
     <description>IK Analyzer for ElasticSearch</description>
     <inceptionYear>2009</inceptionYear>
@@ -31,7 +31,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>0.19.4</elasticsearch.version>
+        <elasticsearch.version>0.19.8</elasticsearch.version>
     </properties>
 
   <repositories>
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 @@
 <?xml version="1.0"?>
 <assembly>
-    <id></id>
+    <id>ik</id>
     <formats>
         <format>zip</format>
     </formats>
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();