wip #6188 @0.25

diff --git a/app/Fluidbook/Compiler/Links.php b/app/Fluidbook/Compiler/Links.php
index d8d9153680cc4cd085dfc4ff52d5e3bcec20e89d..c115034f225d3e86845a78f55c42dee9d8fa12cd 100644 (file)
--- a/app/Fluidbook/Compiler/Links.php
+++ b/app/Fluidbook/Compiler/Links.php
@@ -148,7 +148,6 @@ trait Links
 
         $linksCopy = $links;
 
-
         foreach ($linksCopy as $k => $linkData) {
             if ($linkData['type'] == Link::LAYER && $linkData['to'] == 'text') {
                 $dupData = $linkData;
@@ -161,6 +160,7 @@ trait Links
                 array_push($links, $linkData);
                 unset($links[$k]);
             }
+
             if ($this->fluidbookSettings->PDFRendererIframe === 'svg' && (($linkData['type'] == Link::IFRAME && stristr($linkData['to'], '.pdf')) || ($linkData['type'] == Link::MULTIMEDIA && stristr($linkData['to'], '.pdf')))) {
                 $ofile = $this->wdir . '/' . $linkData['to'];
                 $dfile = $this->wdir . '/' . $linkData['to'] . '.svg';
@@ -173,10 +173,12 @@ trait Links
                 $linkData['backgroundColor'] = '#fff';
                 $links[$k] = $linkData;
             }
+
             if ($linkData['type'] == Link::PAGE_LABEL || $linkData == Link::ANCHOR) {
                 $linkData['to'] = AnchorLink::normalizeAnchor($linkData['to']);
                 $anchorExists[$linkData['to']] = $linkData;
             }
+
             if ($linkData['type'] == Link::TEXT || $linkData['type'] == Link::IMAGE || $linkData['type'] == Link::LAYER) {
                 $linkData = Link::decryptLink($linkData);
                 $animations = ContentLink::parseAnimations($linkData['image_rollover'] ?? 'none');
@@ -195,6 +197,7 @@ trait Links
                     }
                 }
             }
+
             if (isset($linkData['image']) && $linkData['image'] && $linkData['type'] != Link::ARTICLE && $linkData['type'] != Link::TEXT && $linkData['type'] != Link::COLOR && $linkData['type'] != Link::LAYER && $linkData['type'] != Link::IMAGE) {
                 $dupData = $linkData;
                 $dupData['image'] = '';
@@ -260,7 +263,6 @@ trait Links
             }
         }
 
-
         if ($this->fluidbookSettings->anchorsAliases && file_exists($this->fluidbookSettings->anchorsAliases)) {
             $aliases = [];
             for ($i = 0; $i <= 2; $i++) {
@@ -296,7 +298,6 @@ trait Links
             }
         }
 
-
         $this->config->pagesOfCustomLinks = $pagesOfCustomLinks;
 
         $i = 1;

diff --git a/app/Fluidbook/Compiler/Search.php b/app/Fluidbook/Compiler/Search.php
index a10a8bb965610455efb3d182eb9da85ac75c2b77..87840035e9eb1482b0a03658b9499f8bbfbc358b 100644 (file)
--- a/app/Fluidbook/Compiler/Search.php
+++ b/app/Fluidbook/Compiler/Search.php
@@ -10,7 +10,14 @@ trait Search
 {
     public function writeSearch()
     {
-        $cache = sha1($this->fluidbookSettings->highlightResults . '/--/' . $this->fluidbookSettings->searchWordSelectionAlgorithm . '///' . $this->fluidbookSettings->textExtraction . '|--|' . $this->fluidbookSettings->ignoreSearchSeparators . '|||' . $this->getFluidbook()->getCompositionUpdate() . '()()()' . FWSTK::lastUpdate());
+        $cache = sha1($this->fluidbookSettings->highlightResults . '/--/' .
+            $this->fluidbookSettings->searchWordSelectionAlgorithm . '///' .
+            $this->fluidbookSettings->textExtraction . '|--|' .
+            $this->fluidbookSettings->ignoreSearchSeparators . '|||' .
+            $this->getFluidbook()->getCompositionUpdate() . '()()()' .
+            FWSTK::lastUpdate() . '$$$' .
+            $this->fluidbookSettings->search_mode . '=+='
+        );
         $cacheDir = Files::mkdir(protected_path('fluidbookpublication/index/' . $this->book_id . '/' . $cache . '/'));
         $indexFile = $cacheDir . '/search.index.js';
         $textFile = $cacheDir . '/search.texts.js';
@@ -28,7 +35,7 @@ trait Search
         if ($this->fluidbookSettings->highlightResults) {
             $this->vdir->copy($cacheDir . '/search.highlight.js', 'data/search.highlight.js');
         }
-        if ($this->fluidbookSettings->search_mode==='robust' || $this->fluidbookSettings->searchWordSelectionAlgorithm == 'expression') {
+        if ($this->fluidbookSettings->search_mode === 'robust' || $this->fluidbookSettings->searchWordSelectionAlgorithm == 'expression') {
             $this->vdir->copy($cacheDir . '/search.texts.js', 'data/search.texts.js');
         }
     }