Changeset 614

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

Location:

trunk

Files:

• Modules/Translation/Form.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)

trunk/Modules/Translation/Form.php

@@ -3 +3 @@
 class PageTranslationForm extends Page
 {
+  function ReplaceTranslated($orig,$tran,$Text,$ID,$Group) {
+         $tran_replace = str_replace(' ',' ',$tran);
+         $orig_replace = str_replace(' ',' ',$orig);
+                                  $Text = str_replace(' '.$orig,' <span Title="Přelož jako: '.$tran_replace.'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
+                                 return ($Text);
+  }
+  function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group) {
+         $orig_replace = str_replace(' ','&nbsp;',$orig);
+                                 $Text = str_replace($orig,' <span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
+                                 return ($Text);
+  }
+  
         function ColorNames($Text, $names)
         {
-                // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+    $Text = ' '.$Text;
                 foreach($names as $Line) {
                         if ($Line[3] <> '') {
-                          if (strpos($Text, '>'.$Line[2]) == 0)
-                                  $Text = str_replace($Line[2],'<span Title="Přelož jako: '.$Line[3].'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
-                                if (strpos($Text, '>'.$Line[2]) == 0)
-          $Text = str_replace(strtolower($Line[2]),'<span Title="Překládej jako: '.$Line[3].'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
+        $Text = $this->ReplaceTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
+        
                         } else {
-                          if (strpos($Text, '>'.$Line[2]) == 0)
-                                $Text = str_replace($Line[2],'<span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
-                                if (strpos($Text, '>'.$Line[2]) == 0)
-          $Text = str_replace(strtolower($Line[2]),'<span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
+        $Text = $this->ReplaceNotTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
                         }
                 }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 613; // Subversion revision
+$Revision = 614; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
 $ReleaseTime = '2013-11-27';

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;
         }