You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/10/18 13:47:08 UTC
svn commit: r1533403 - in
/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko:
dic/DictionaryResources.java tagging/Tagger.java utils/HanjaUtils.java
Author: uschindler
Date: Fri Oct 18 11:47:07 2013
New Revision: 1533403
URL: http://svn.apache.org/r1533403
Log:
LUCENE-4956: Move empty line removal up
Modified:
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/dic/DictionaryResources.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/tagging/Tagger.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/utils/HanjaUtils.java
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/dic/DictionaryResources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/dic/DictionaryResources.java?rev=1533403&r1=1533402&r2=1533403&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/dic/DictionaryResources.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/dic/DictionaryResources.java Fri Oct 18 11:47:07 2013
@@ -86,6 +86,9 @@ public class DictionaryResources {
if (line.startsWith("!") || line.startsWith("\uFEFF!")) { // Skip comment lines starting with '!'
continue;
}
+ if (line.isEmpty()) {
+ continue;
+ }
processor.processLine(line);
}
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/tagging/Tagger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/tagging/Tagger.java?rev=1533403&r1=1533402&r2=1533403&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/tagging/Tagger.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/tagging/Tagger.java Fri Oct 18 11:47:07 2013
@@ -45,8 +45,6 @@ public class Tagger {
DictionaryResources.readLines(DictionaryResources.FILE_TAG_DIC, new LineProcessor() {
@Override
public void processLine(String str) throws IOException {
- str=str.trim();
- if(str.isEmpty()) return;
String[] syls = str.split("[:]+");
if(syls.length!=4)
throw new IOException("Invalid file format: "+Arrays.toString(syls));
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/utils/HanjaUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/utils/HanjaUtils.java?rev=1533403&r1=1533402&r2=1533403&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/utils/HanjaUtils.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/ko/utils/HanjaUtils.java Fri Oct 18 11:47:07 2013
@@ -35,11 +35,9 @@ public class HanjaUtils {
DictionaryResources.readLines(DictionaryResources.FILE_MAP_HANJA_DIC, new LineProcessor() {
@Override
public void processLine(String s) throws IOException {
- if(s.isEmpty() || s.indexOf(",")==-1) return;
-
String[] hanInfos = s.split("[,]+");
if(hanInfos.length!=2 || hanInfos[0].length()!=1)
- throw new IOException("Invalid file format.");
+ throw new IOException("Invalid file format: "+s);
map.put(hanInfos[0].charAt(0), hanInfos[1].toCharArray());
}