Revize c73ae8f7

Zvýrazňování hledaných slov i v detailu transliterace

app/FrontModule/component/Catalogue/CatalogueSearchResultList.latte

@@ -50 +50 @@
     </div>
 
     {if isset($row->id)}
-        {control transliterationView $row->id, $showAll}
+        {control transliterationView $row->id, $showAll, TRUE}
     {/if}
 {/snippet}
 

app/FrontModule/component/Transliteration/TransliterationSearchForm.php

@@ -50 +50 @@
     {
         $form = new Form();
 
-        $form->addText('word1', 'Word 1')
-            ->setAttribute("autofocus");
+        $form->addText('word1', 'Word 1');
         $form->addText('word2', 'Word 2');
         $form->addSelect('word2_condition', '', ESearchFormOperators::$wordSelectLabels);
         $form->addText('word3', 'Word 3');

app/FrontModule/component/Transliteration/TransliterationSearchResultList.php

@@ -11 +11 @@
 use App\Model\TransliterationSearchModel;
 use App\Utils\Form;
 use App\Utils\Paginator;
+use App\Utils\WordHighlighter;
 use Nette\Application\UI\Control;
 
 class TransliterationSearchResultList extends Control
@@ -52 +53 @@
      * @persistent
      */
     public $limit;
+    /**
+     * @var WordHighlighter
+     */
+    private $wordHighlighter;
 
     /**
      * TransliterationSearchResultList constructor.
      * @param TransliterationSearchModel $transliterationSearchModel
      * @param TransliterationRepository $transliterationRepository
      * @param LineRepository $lineRepository
+     * @param WordHighlighter $wordHighlighter
      * @throws \Nette\Application\AbortException
      */
     public function __construct(
         TransliterationSearchModel $transliterationSearchModel,
         TransliterationRepository $transliterationRepository,
-        LineRepository $lineRepository
+        LineRepository $lineRepository,
+        WordHighlighter $wordHighlighter
     )
     {
         parent::__construct();
@@ -89 +96 @@
         {
             $this->presenter->redirect('Transliteration:search');
         }
+        $this->wordHighlighter = $wordHighlighter;
     }
 
 
@@ -99 +107 @@
         $this->resultRows = $this->transliterationRepository->transliterationsFulltextSearch($this->searchTerms, $this->paginator->getOffset(), $this->paginator->getPageSize())->fetchAll();
         $this->paginator->setPageCount($this->totalCount);
 
-        $this->highlight();
+        $this->wordHighlighter->highlight($this->resultRows, $this->searchTerms);
         if(in_array($this->adjacentLines, EAdjacentLines::$lines) && $this->adjacentLines > 0)
         {
             foreach ($this->resultRows as &$row)
@@ -114 +122 @@
         $this->template->render();
     }
 
-    public function highlight()
-    {
-        foreach ($this->resultRows as $resultRow)
-        {
-            //nejprve escape html znaků, které chceme nechat zobrazovat,
-            //jelikož následně přidáváme html tagy pro vyznačení a výstup v latte nemůže být escapovaný
-            $resultRow->transliteration = htmlspecialchars($resultRow->transliteration);
-
-            if(!empty($this->searchTerms['word1']))
-            {
-                $resultRow->transliteration = preg_replace(
-                    "/" . $this->transliterationRepository->prepareSearchRegExp($this->searchTerms['word1']) . "/",
-                    "<span class='found'>$0</span>",
-                    $resultRow->transliteration);
-            }
-
-            /**
-             * TODO: dořešit označování slov, když se zadají slova co se překrývají tak se tagy mezi sebou ruší,
-             * viz např. vyhledávání slov 'šu' a 'as'
-             */
-            if($this->searchTerms['word2_condition'] === ESearchFormOperators::AND || $this->searchTerms['word2_condition'] === ESearchFormOperators::OR )
-            {
-                $resultRow->transliteration = preg_replace(
-                    "/" . $this->transliterationRepository->prepareSearchRegExp($this->searchTerms['word2']) . "/",
-                    "<span class='found'>$0</span>",
-                    $resultRow->transliteration);
-            }
-
-            if($this->searchTerms['word3_condition'] === ESearchFormOperators::AND || $this->searchTerms['word3_condition'] === ESearchFormOperators::OR )
-            {
-                $resultRow->transliteration = preg_replace(
-                    "/" . $this->transliterationRepository->prepareSearchRegExp($this->searchTerms['word3']) . "/",
-                    "<span class='found'>$0</span>",
-                    $resultRow->transliteration);
-            }
-        }
-    }
-
     public function handleChangePage($page, $limit)
     {
         if($this->presenter->isAjax())

app/FrontModule/component/Transliteration/TransliterationView.latte

@@ -106 +106 @@
 
                     <i>{$surfaceType}</i> <br>
                     {foreach $lines as $line}
-                        {$line['line_number']}. {$line['transliteration']} <br>
+                        {$line['line_number']}. {$line['transliteration']|noescape} <br>
                     {/foreach}
                 </div>
             {/foreach}

app/FrontModule/component/Transliteration/TransliterationView.php

@@ -8 +8 @@
 use App\Model\Repository\LitReferenceRepository;
 use App\Model\Repository\RevHistoryRepository;
 use App\Model\Repository\TransliterationRepository;
+use App\Model\TransliterationSearchModel;
+use App\Utils\WordHighlighter;
 use Nette\Application\UI\Control;
 
 class TransliterationView extends Control
@@ -28 +30 @@
      * @var RevHistoryRepository
      */
     private $revHistoryRepository;
+    /**
+     * @var WordHighlighter
+     */
+    private $wordHighlighter;
+    /**
+     * @var TransliterationSearchModel
+     */
+    private $transliterationSearchModel;
 
     public function __construct(TransliterationRepository $transliterationRepository,
                                 LineRepository $lineRepository,
                                 LitReferenceRepository $litReferenceRepository,
-                                RevHistoryRepository $revHistoryRepository)
+                                RevHistoryRepository $revHistoryRepository,
+                                WordHighlighter $wordHighlighter,
+                                TransliterationSearchModel $transliterationSearchModel
+    )
     {
         parent::__construct();
 
@@ -40 +53 @@
         $this->lineRepository = $lineRepository;
         $this->litReferenceRepository = $litReferenceRepository;
         $this->revHistoryRepository = $revHistoryRepository;
+        $this->wordHighlighter = $wordHighlighter;
+        $this->transliterationSearchModel = $transliterationSearchModel;
     }
 
     /**
@@ -47 +62 @@
      *
      * @param int $id : ID transliterace
      * @param bool $showAll : zobrazení katalogu i transliterací
+     * @param bool $isCatalogue : určuje jestli byla komponenta zobrazena z katalogu nebo z vyhledávání textů
+     *                            a podle toho zvýrazňuje texty
      * @throws \Nette\Application\AbortException
      */
-    public function render(int $id, bool $showAll = TRUE)
+    public function render(int $id, bool $showAll = TRUE, $isCatalogue = FALSE)
     {
         $this->template->setFile(__DIR__ . '/TransliterationView.latte');
 
@@ -64 +81 @@
         if($showAll)
         {
             $lines = $this->lineRepository->getAllLinesForTransliteration($id);
+
+            // Pokud se nejedná o vyhledávání z katalogu, tak zvýrazňujeme výsledky
+            if (!$isCatalogue)
+            {
+                $this->wordHighlighter->highlight($lines, $this->transliterationSearchModel->getSearchTerms());
+            }
+
             $lineArray = [];
             foreach ($lines as $line)
             {

app/config/model.neon

@@ -27 +27 @@
     #Sessions
     - App\Model\TransliterationSearchModel
     - App\Model\TransportModel
-    - App\Model\CatalogueSearchModel
+    - App\Model\CatalogueSearchModel
+
+    #Utils
+    - App\Utils\WordHighlighter

app/model/repository/LineRepository.php

@@ -37 +37 @@
                   WHERE t.id_transliteration = ?
                   ORDER BY st.sorter ASC, id_line ASC",
             $transliterationId
-        );
+        )->fetchAll();
     }
 
     /**

app/model/repository/TransliterationRepository.php

@@ -250 +250 @@
      * @param bool $countOnly : flag pokud chceme vrátit pouze počet výsledků
      * @return \Nette\Database\ResultSet
      */
-    public function transliterationCatalogueSearch(ArrayHash $queryParams, int $offset = null, int $limit = null, bool $countOnly = false)
+    public function transliterationCatalogueSearch(ArrayHash $queryParams, int $offset = null, int $limit = null, $countOnly = false)
     {
         /**
          * @var $mc string : udává jestli je mezi vyhledávanými parametry logické AND nebo OR

app/utils/WordHighlighter.php

@@ +1 @@
+<?php
+
+
+namespace App\Utils;
+
+
+use App\Enum\ESearchFormOperators;
+use App\Model\Repository\LineRepository;
+use App\Model\Repository\TransliterationRepository;
+use Nette\Database\IRow;
+
+class WordHighlighter
+{
+    /**
+     * @var TransliterationRepository
+     */
+    private $transliterationRepository;
+
+    public function __construct(TransliterationRepository $transliterationRepository)
+    {
+        $this->transliterationRepository = $transliterationRepository;
+    }
+
+    /**
+     * Zvýrazňuje výsledky při vyhledávání textů
+     *
+     * @param IRow[] $resultRows : pole s nalezenými lines
+     * @param null $searchTerms : vyhledávané položky
+     */
+    public function highlight(&$resultRows, $searchTerms = NULL)
+    {
+        foreach ($resultRows as $resultRow)
+        {
+            //nejprve escape html znaků, které chceme nechat zobrazovat,
+            //jelikož následně přidáváme html tagy pro vyznačení a výstup v latte nemůže být escapovaný
+            $resultRow->{LineRepository::COLUMN_TRANSLITERATION} = htmlspecialchars($resultRow->{LineRepository::COLUMN_TRANSLITERATION});
+
+            if (isset($searchTerms['word1']) && !empty($searchTerms['word1']))
+            {
+                $resultRow->{LineRepository::COLUMN_TRANSLITERATION} = preg_replace(
+                    "/" . $this->transliterationRepository->prepareSearchRegExp($searchTerms['word1']) . "/",
+                    "<span class='found'>$0</span>",
+                    $resultRow->{LineRepository::COLUMN_TRANSLITERATION});
+            }
+
+            /**
+             * TODO: dořešit označování slov, když se zadají slova co se překrývají tak se tagy mezi sebou ruší,
+             * viz např. vyhledávání slov 'šu' a 'as'
+             */
+            if (isset($searchTerms['word2']) && isset($searchTerms['word2_condition']) &&
+                ($searchTerms['word2_condition'] === ESearchFormOperators:: AND || $searchTerms['word2_condition'] === ESearchFormOperators:: OR))
+            {
+                $resultRow->{LineRepository::COLUMN_TRANSLITERATION} = preg_replace(
+                    "/" . $this->transliterationRepository->prepareSearchRegExp($searchTerms['word2']) . "/",
+                    "<span class='found'>$0</span>",
+                    $resultRow->{LineRepository::COLUMN_TRANSLITERATION});
+            }
+
+            if (isset($searchTerms['word3']) && isset($searchTerms['word3_condition']) &&
+                $searchTerms['word3_condition'] === ESearchFormOperators:: AND || $searchTerms['word3_condition'] === ESearchFormOperators:: OR)
+            {
+                $resultRow->{LineRepository::COLUMN_TRANSLITERATION} = preg_replace(
+                    "/" . $this->transliterationRepository->prepareSearchRegExp($searchTerms['word3']) . "/",
+                    "<span class='found'>$0</span>",
+                    $resultRow->{LineRepository::COLUMN_TRANSLITERATION});
+            }
+        }
+    }
+}