Revize 75df6b2e

Re #7327 Regexp pro doplňující hledaná slova. Seřazení řádků v detailu

app/model/repository/LineRepository.php

@@ -35 +35 @@
                          LEFT JOIN transliteration t on s.id_transliteration = t.id_transliteration
                          LEFT JOIN object_type o on s.id_object_type = o.id_object_type
                   WHERE t.id_transliteration = ?
-                  ORDER BY st.sorter ASC, line_number ASC",
+                  ORDER BY st.sorter ASC, id_line ASC",
             $transliterationId
         );
     }

app/model/repository/TransliterationRepository.php

@@ -46 +46 @@
         }
         else
         {
-            $splitWord = preg_split('//u', $queryParams['word1'], -1, PREG_SPLIT_NO_EMPTY);
-            $regex = implode("[\[\]⌈⌉?!><\.₁₂₃₄₅₆₇₈₉₀\-\s]*?", $splitWord);
             $where .= "l.transliteration REGEXP ? ";
-            $whereArgs[] = $regex;
+            $whereArgs[] = $this->prepareSearchRegExp($queryParams['word1']);
         }
 
         if($queryParams['word2_condition'])
         {
-            $where .= ELogicalConditions::$whereCondition[$queryParams['word2_condition']] . " l.transliteration LIKE ? ";
-            $whereArgs[] = "%" . $queryParams['word2'] . "%";
+            if($queryParams['exact_match'])
+            {
+                $where .= ELogicalConditions::$whereCondition[$queryParams['word2_condition']] . " l.transliteration LIKE ? ";
+                $whereArgs[] = "%" . $queryParams['word2'] . "%";
+            }
+            else
+            {
+                $where .= ELogicalConditions::$whereCondition[$queryParams['word2_condition']] . " l.transliteration REGEXP ? ";
+                $whereArgs[] = $this->prepareSearchRegExp($queryParams['word2']);
+            }
         }
 
         if($queryParams['word3_condition'])
         {
-            $where .= ELogicalConditions::$whereCondition[$queryParams['word3_condition']] . " l.transliteration LIKE ? ";
-            $whereArgs[] = "%" . $queryParams['word3'] . "%";
+            if($queryParams['exact_match'])
+            {
+                $where .= ELogicalConditions::$whereCondition[$queryParams['word3_condition']] . " l.transliteration LIKE ? ";
+                $whereArgs[] = "%" . $queryParams['word3'] . "%";
+            }
+            else
+            {
+                $where .= ELogicalConditions::$whereCondition[$queryParams['word3_condition']] . " l.transliteration REGEXP ? ";
+                $whereArgs[] = $this->prepareSearchRegExp($queryParams['word3']);
+            }
         }
 
         $query = "SELECT 
@@ -79 +93 @@
         return $this->context->queryArgs($query, $whereArgs);
     }
 
+    private function prepareSearchRegExp($word)
+    {
+        $splitWord = preg_split('//u',$word, -1, PREG_SPLIT_NO_EMPTY);
+        $regex = implode("[\[\]⌈⌉?!><\.₁₂₃₄₅₆₇₈₉₀\-\s]*?", $splitWord);
+        return $regex;
+    }
+
     public function getTransliterationDetail($id)
     {
         return $this->context->query(