You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/16 15:50:10 UTC
svn commit: r1232012 - in /lucene/dev/trunk: ./ lucene/
modules/analysis/kuromoji/build.xml
modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/util/CSVUtil.java
Author: rmuir
Date: Mon Jan 16 14:50:09 2012
New Revision: 1232012
URL: http://svn.apache.org/viewvc?rev=1232012&view=rev
Log:
LUCENE-3696: fix dictionary construction to work on java5
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/modules/analysis/kuromoji/build.xml
lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/util/CSVUtil.java
Modified: lucene/dev/trunk/modules/analysis/kuromoji/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/kuromoji/build.xml?rev=1232012&r1=1232011&r2=1232012&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/kuromoji/build.xml Mon Jan 16 14:50:09 2012
@@ -72,7 +72,7 @@
<delete verbose="true">
<fileset dir="src/resources/org/apache/lucene/analysis/kuromoji/dict" includes="**/*"/>
</delete>
- <java fork="true" failonerror="true" maxmemory="512m" classname="org.apache.lucene.analysis.kuromoji.util.DictionaryBuilder">
+ <java fork="true" failonerror="true" maxmemory="756m" classname="org.apache.lucene.analysis.kuromoji.util.DictionaryBuilder">
<classpath>
<path refid="tools.classpath"/>
<pathelement path="${build.dir}/classes/tools"/>
Modified: lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/util/CSVUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/util/CSVUtil.java?rev=1232012&r1=1232011&r2=1232012&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/util/CSVUtil.java (original)
+++ lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/util/CSVUtil.java Mon Jan 16 14:50:09 2012
@@ -54,7 +54,7 @@ public final class CSVUtil {
String value = sb.toString();
value = unQuoteUnEscape(value);
result.add(value);
- sb = new StringBuilder();
+ sb.setLength(0);
continue;
}
@@ -75,13 +75,17 @@ public final class CSVUtil {
String result = original;
// Unquote
- Matcher m = QUOTE_REPLACE_PATTERN.matcher(original);
- if(m.matches()) {
- result = m.group(1);
- }
+ if (result.indexOf('\"') >= 0) {
+ Matcher m = QUOTE_REPLACE_PATTERN.matcher(original);
+ if(m.matches()) {
+ result = m.group(1);
+ }
- // Unescape
- result = result.replaceAll(ESCAPED_QUOTE, "\"");
+ // Unescape
+ if (result.indexOf(ESCAPED_QUOTE) >= 0) {
+ result = result.replace(ESCAPED_QUOTE, "\"");
+ }
+ }
return result;
@@ -92,7 +96,11 @@ public final class CSVUtil {
* @param original
*/
public static String quoteEscape(String original) {
- String result = original.replaceAll("\"", ESCAPED_QUOTE);
+ String result = original;
+
+ if (result.indexOf('\"') >= 0) {
+ result.replace("\"", ESCAPED_QUOTE);
+ }
if(result.indexOf(COMMA) >= 0) {
result = "\"" + result + "\"";
}