You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/07/13 15:50:25 UTC
svn commit: r1690669 - in /jackrabbit/oak/trunk/oak-run/src:
main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java
test/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProviderTest.java
Author: chetanm
Date: Mon Jul 13 13:50:24 2015
New Revision: 1690669
URL: http://svn.apache.org/r1690669
Log:
OAK-2953 - Implement text extractor as part of oak-run
Fix failing testcase
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProviderTest.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java?rev=1690669&r1=1690668&r2=1690669&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java Mon Jul 13 13:50:24 2015
@@ -32,15 +32,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CSVFileGenerator {
- /*
- Instead of using the FORMAT from CSVFileBinaryResourceProvider
- defining our own without header. Otherwise commons-csv was always
- adding the header
- */
- private static final CSVFormat FORMAT = CSVFormat.DEFAULT
- .withCommentMarker('#')
- .withNullString("") //Empty string are considered as null
- .withIgnoreSurroundingSpaces();
private final Logger log = LoggerFactory.getLogger(getClass());
private File outFile;
@@ -52,7 +43,8 @@ public class CSVFileGenerator {
Closer closer = Closer.create();
int count = 0;
try{
- CSVPrinter printer = new CSVPrinter(Files.newWriter(outFile, Charsets.UTF_8), FORMAT);
+ CSVPrinter printer = new CSVPrinter(Files.newWriter(outFile, Charsets.UTF_8),
+ CSVFileBinaryResourceProvider.FORMAT);
for (BinaryResource br : binaries){
count++;
printer.printRecord(
Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProviderTest.java?rev=1690669&r1=1690668&r2=1690669&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/NodeStoreBinaryResourceProviderTest.java Mon Jul 13 13:50:24 2015
@@ -109,6 +109,11 @@ public class NodeStoreBinaryResourceProv
}
@Override
+ public String getReference() {
+ return id;
+ }
+
+ @Override
public String getContentIdentity() {
return id;
}