wait #6526 @0.5

diff --git a/app/Models/FluidbookDocument.php b/app/Models/FluidbookDocument.php
index 9a63216759f6bfba5de50fef81d1eddc44efe0af..d1a314b08c99d13fac3e17259c7bdb6604ab9c7f 100644 (file)
--- a/app/Models/FluidbookDocument.php
+++ b/app/Models/FluidbookDocument.php
@@ -406,11 +406,11 @@ class FluidbookDocument extends ToolboxModel
         return Gzip::filemtime($path) >= FWSTK::lastUpdate();
     }
 
-    public function getHightlightFile($page, $mode = 'standard')
+    public function getHightlightFile($page, $mode = 'standard', $ignoreSeparators = '')
     {
-        $path = $this->_getHightlightFilePath($page, $mode);
+        $path = $this->_getHightlightFilePath($page, $mode, $ignoreSeparators);
         if (!$this->_checkTextFile($path)) {
-            PDFTools::extractHighlightsData($this->getPDFSource(), $this->path(), $mode);
+            PDFTools::extractHighlightsData($this->getPDFSource(), $this->path(), $mode,$ignoreSeparators);
             if (!Gzip::file_exists($path)) {
                 throw new \Exception('An error occured while producing file ' . $path);
             }
@@ -424,10 +424,14 @@ class FluidbookDocument extends ToolboxModel
         return $map[$textExtraction];
     }
 
-    public function _getHightlightFilePath($page, $mode = 'standard')
+    public function _getHightlightFilePath($page, $mode = 'standard', $ignoreSeparators = '')
     {
+        $sepFolder = '';
+        if ($ignoreSeparators) {
+            $sepFolder = 'sep_' . md5($ignoreSeparators) . '/';
+        }
         $dir = $mode !== 'standard' ? $mode . '/' : '';
-        return $this->path('texts/' . $dir) . 'p' . $page . '.fby';
+        return $this->path('texts/' . $dir . $sepFolder) . 'p' . $page . '.fby';
     }
 
     public function _getTextPath($page, $type = self::TEXT_PLAIN, $mode = 'standard', $extractionMethod = 'fluidbook', $ignoreSeparators = '')

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 4edd72753d210177771d9d8dd1f80fbf27583aac..79d9200cfcb13ecc6972ad71ac92537950e4efbf 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -397,7 +397,7 @@ class FluidbookPublication extends ToolboxStatusModel
     public function getHightlightFile($page)
     {
         $compo = $this->getComposition()[$page];
-        return self::_getDocument($compo[0])->getHightlightFile($compo[1], $this->search_mode ?: 'standard');
+        return self::_getDocument($compo[0])->getHightlightFile($compo[1], $this->search_mode ?: 'standard', $this->ignoreSearchSeparators);
     }
 
     public function getPDFSplitSource($page)