Author: yonik
Date: Tue Jan 8 07:50:45 2008
New Revision: 610032
URL: http://svn.apache.org/viewvc?rev=610032&view=rev
Log:
don't default an encapsulator for split CSV fields
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=610032&r1=610031&r2=610032&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
Tue Jan 8 07:50:45 2008
@@ -322,9 +322,11 @@
String sepStr = params.getFieldParam(fname,SEPARATOR);
char fsep = sepStr==null || sepStr.length()==0 ? ',' :
sepStr.charAt(0);
String encStr = params.getFieldParam(fname,ENCAPSULATOR);
- char fenc = encStr==null || encStr.length()==0 ? '\'' :
encStr.charAt(0);
+ char fenc = encStr==null || encStr.length()==0 ? (char)-2 :
encStr.charAt(0);
+ String escStr = params.getFieldParam(fname,ESCAPE);
+ char fesc = escStr==null || encStr.length()==0 ?
CSVStrategy.ESCAPE_DISABLED : escStr.charAt(0);
- CSVStrategy fstrat = new
CSVStrategy(fsep,fenc,CSVStrategy.COMMENTS_DISABLED);
+ CSVStrategy fstrat = new
CSVStrategy(fsep,fenc,CSVStrategy.COMMENTS_DISABLED,fesc, false, false, false,
false);
adders[i] = new CSVLoader.FieldSplitter(fstrat, adders[i]);
}
}