From 9fa69e29974230b68b217d279f26949a09308ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20sp1rit=E2=80=8B?= Date: Thu, 7 Oct 2021 22:24:08 +0200 Subject: [PATCH] add ffi constructor to CommandLineApp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Florian "sp1rit"​ Signed-off-by: Florian "sp1rit"​ --- .../java/technology/tabula/CommandLineApp.java | 17 +++++++++++++++++ .../technology/tabula/writers/CSVWriter.java | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/technology/tabula/CommandLineApp.java b/src/main/java/technology/tabula/CommandLineApp.java index 4a771fb..bfaf5a0 100644 --- a/src/main/java/technology/tabula/CommandLineApp.java +++ b/src/main/java/technology/tabula/CommandLineApp.java @@ -6,6 +6,7 @@ import java.io.FilenameFilter; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.cli.CommandLine; @@ -57,6 +58,22 @@ public class CommandLineApp { } } + public CommandLineApp(Pair[] page_areas, Integer[] pages, OutputFormat output_format, boolean guess, ExtractionMethod extraction_method, boolean use_returns, String password) throws ParseException { + if (page_areas != null) + this.pageAreas = Arrays.asList(page_areas); + if (pages != null) + this.pages = Arrays.asList(pages); + this.outputFormat = output_format; + + TableExtractor extractor = new TableExtractor(); + extractor.setGuess(guess); + extractor.setMethod(extraction_method); + extractor.setUseLineReturns(use_returns); + this.tableExtractor = extractor; + + this.password = password; + } + public static void main(String[] args) { CommandLineParser parser = new DefaultParser(); try { diff --git a/src/main/java/technology/tabula/writers/CSVWriter.java b/src/main/java/technology/tabula/writers/CSVWriter.java index 682397b..7cbf46b 100644 --- a/src/main/java/technology/tabula/writers/CSVWriter.java +++ b/src/main/java/technology/tabula/writers/CSVWriter.java @@ -20,7 +20,7 @@ public class CSVWriter implements Writer { } protected CSVWriter(CSVFormat format) { - this.format = format; + this.format = format.withRecordSeparator("\n"); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // -- 2.33.0