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 2017/06/19 09:56:18 UTC
svn commit: r1799171 -
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
Author: chetanm
Date: Mon Jun 19 09:56:18 2017
New Revision: 1799171
URL: http://svn.apache.org/viewvc?rev=1799171&view=rev
Log:
OAK-6362 - Use NodeStoreFixtureProvider in tika command of oak-run
Reoder the generate first so that one can use 'generate' and 'extract'
in one command only
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java?rev=1799171&r1=1799170&r2=1799171&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java Mon Jun 19 09:56:18 2017
@@ -99,6 +99,14 @@ public class TextExtractorMain {
checkNotNull(blobStore, "This command requires an external BlobStore configured");
+ if (generate){
+ checkNotNull(dataFile, "Data file path not provided");
+ log.info("Generated csv data to be stored in {}", dataFile.getAbsolutePath());
+ BinaryResourceProvider brp = new NodeStoreBinaryResourceProvider(nodeStore, blobStore);
+ CSVFileGenerator generator = new CSVFileGenerator(dataFile);
+ generator.generate(brp.getBinaries(path));
+ }
+
if (report || extract) {
checkArgument(dataFile.exists(),
"Data file %s does not exist", dataFile.getAbsolutePath());
@@ -112,14 +120,6 @@ public class TextExtractorMain {
log.info(summary);
}
- if (generate){
- checkNotNull(dataFile, "Data file path not provided");
- log.info("Generated csv data to be stored in {}", dataFile.getAbsolutePath());
- BinaryResourceProvider brp = new NodeStoreBinaryResourceProvider(nodeStore, blobStore);
- CSVFileGenerator generator = new CSVFileGenerator(dataFile);
- generator.generate(brp.getBinaries(path));
- }
-
if (extract) {
checkNotNull(storeDir, "Directory to store extracted text content " +
"must be specified via %s", tikaOpts.getStoreDirSpecOpt());