wip #5410 @0.25

diff --git a/src/PDFTools.php b/src/PDFTools.php
index a004b67293300d74fc11392082cd98d35b4698ea..8b92e6797329752eb9b2193d9ff67d02ebb0fa73 100644 (file)
--- a/src/PDFTools.php
+++ b/src/PDFTools.php
@@ -409,19 +409,18 @@ class PDFTools
         $fwstk->execute();
     }
 
-    public static function extractTexts($pdf, $out, $ignoreSeparators = '', $force = true)
+    public static function extractTexts($pdf, $out, $textExtraction, $ignoreSeparators = '')
     {
         $out .= 'texts/';
-        Files::mkdir($out);
-
-        if (!$force && file_exists($out . 'fp1.txt')) {
-            return;
+        if ($ignoreSeparators) {
+            $out .= 'sep_' . md5($ignoreSeparators);
         }
+        $out = Files::mkdir($out) . '/';
 
         $fwstk = new FWSTK();
         $fwstk->setArg('--input ' . $pdf);
         $fwstk->setArg('--extractTexts ' . $out . '%s%d.txt');
-        $fwstk->setArg('--extractTextsMethod fluidbook');
+        $fwstk->setArg('--extractTextsMethod' . $textExtraction);
         $fwstk->setArg('--threads 1');
         if ($ignoreSeparators !== '') {
             $fwstk->setArg('--ignoreSeparators ' . $ignoreSeparators);