Revize 0545637d

Re #7618 oprava kódování

app/FrontModule/component/Transliteration/TransliterationSearchResultList.php

@@ -34 +34 @@
     private $searchTerms;
 
     private $resultRows;
+
+    /** @var int */
     private $totalCount;
 
     /**
@@ -108 +110 @@
 
         $this->template->resultRows = $this->resultRows;
         $this->template->paginator = $this->paginator;
+
         $this->template->render();
     }
 
@@ -119 +122 @@
             //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);
 
-            $resultRow->transliteration = preg_replace(
-                "/" . $this->transliterationRepository->prepareSearchRegExp($this->searchTerms['word1']) . "/",
-                "<span class='found'>$0</span>",
-                $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ší,

app/model/repository/TransliterationRepository.php

@@ -44 +44 @@
         $where = '';
         $whereArgs = [];
 
-        if($queryParams['exact_match'])
+        if(!empty($queryParams['word1']))
         {
-            $where .= "l.transliteration LIKE ? ";
-            $whereArgs[] = "%" . $queryParams['word1'] . "%";
-        }
-        else
-        {
-            $where .= "l.transliteration REGEXP ? ";
-            $whereArgs[] = $this->prepareSearchRegExp($queryParams['word1']);
+            if ($queryParams['exact_match'])
+            {
+                $where .= "l.transliteration LIKE ? ";
+                $whereArgs[] = "%" . $queryParams['word1'] . "%";
+            } else
+            {
+                $where .= "l.transliteration REGEXP ? ";
+                $whereArgs[] = $this->prepareSearchRegExp($queryParams['word1']);
+            }
         }
 
         if($queryParams['word2_condition'])
@@ -136 +138 @@
         $query .= "FROM transliteration t
                   LEFT JOIN surface s ON s.id_transliteration = t.id_transliteration
                   LEFT JOIN line l ON l.id_surface = s.id_surface
-                  LEFT JOIN book b ON t.id_book = b.id_book
-                  WHERE " . $where;
+                  LEFT JOIN book b ON t.id_book = b.id_book ";
+
+        if (!empty($where))
+        {
+            $query .= 'WHERE ' . $where;
+        }
 
         if (!$countOnly)
         {
@@ -154 +160 @@
         return $this->context->queryArgs($query, $whereArgs);
     }
 
-    public function getTransliterationsFulltextSearchTotalCount($queryParams)
+    public function getTransliterationsFulltextSearchTotalCount($queryParams): int
     {
         return $this->transliterationsFulltextSearch($queryParams, null, null, true)->fetch()->count;
     }