Changeset 628 for trunk/includes/global.php

Timestamp:

Dec 6, 2013, 7:07:56 PM (11 years ago)

Author:

maron

Message:

• Fixed: Longest name first
• Fixed: Search names in every translate group

File:

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

trunk/includes/global.php

@@ -538 +538 @@
   foreach($TablesColumn as $Table => $Column) 
   {  
-    $sql = 'SELECT `ID`,`'.$Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
+    $sql = 'SELECT `ID`, (SELECT CONCAT(  \''.GetIDbyName($Table).'\' )) AS  `GoupId`,`'.$Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
       '(`O`.`Entry` = `T`.`Entry`) AND (`Language` <> '.$Config['OriginalLanguage'].') LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
     $groupby = ' GROUP BY `'.$Column.'` ';
-                                       // ORDER BY LENGTH('.$Column.') DESC
+    $orderby = ' ORDER BY LENGTH(Orig) DESC ';
 
     $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
@@ -563 +563 @@
       $where .= ')';
     }
-      if ($SqlOK) {
-        $DbResult = $System->Database->query($sql.$where.$groupby.'  ORDER BY LENGTH(Orig) DESC');
+      if ($SqlOK) {                                                       
+        //$sql.$where.$groupby.$orderby
+//          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
+        if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
+        else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
+      }
+
+  }    
+        $DbResult = $System->Database->query($sqlall.$orderby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
         while($Line = $DbResult->fetch_assoc()) 
         {
-          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
+          $buff[] = array($Line['ID'], $Line['GoupId'], $Line['Orig'], $Line['Tran']);
         }
-      }
-
-   // if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
-  //  else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
-  }
+   
     return $buff;
 }