Changeset 614 for trunk/includes/global.php

Timestamp:

Nov 28, 2013, 6:24:17 PM (11 years ago)

Author:

maron

Message:

• Fixed: Double colorization
• Optimalization: Faster SQL query for search translated names

File:

• trunk/includes/global.php (modified) (2 diffs)

trunk/includes/global.php

@@ -550 +550 @@
     if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].') AND (`Sub`.`Entry` = `O`.`Entry`))';
     $where .= ' AND ('; 
+    if (array_search('the' , $ArrStr)) $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
     
     $SqlOK = false;
@@ -555 +556 @@
       for($i = 0; $i < count($ArrStr); $i++)
       {
-       // if (strpos($ArrStr[$i],"'s") > 0)     $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-2);
-      //  if (strpos($ArrStr[$i],',') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-       // if (strpos($ArrStr[$i],'.') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-       // if (strpos($ArrStr[$i],'!') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-       // if (strpos($ArrStr[$i],'?') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-
-        if (strlen($ArrStr[$i]) > 4) {
-          $where .= '(`O`.`'.$Column.'` LIKE "%'.addslashes($ArrStr[$i]).'%") OR ';
+
+        //find word only if is 3 characters and more, and if starts by upper char, and search only once
+        if ((strlen($ArrStr[$i]) > 3) and (ctype_upper(substr($ArrStr[$i],0,1))) and (array_search($ArrStr[$i], $ArrStr) == $i)) {
+          $where .= '(`O`.`'.$Column.'` LIKE "'.addslashes($ArrStr[$i]).'%") OR ';
           $SqlOK = true;
         }