Changeset 408 for trunk

Timestamp:

Mar 28, 2010, 6:19:16 PM (15 years ago)

Author:

george

Message:

• Opraveno: Export Lua souborů. Chybně se zde opakovalo načítání textů z databáze pro každý řádek Lua souborů.

File:

• trunk/export/export.php (modified) (4 diffs)

trunk/export/export.php

@@ -50 +50 @@
     ' ORDER BY `ExportLanguage`.`Sequence`, `ExportUser`.`Sequence`) AS `TT` GROUP BY `TT`.`Entry`';
     
+    // Build columns for english texts
     $OriginalColumns = '';
     foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
@@ -55 +56 @@
     $OriginalColumns = substr($OriginalColumns, 0, -2);
     
+    // Expand query for loading english texts
     $Query = 'SELECT `T4`.*, '.$OriginalColumns.' FROM ('.$Query.') AS `T4` '.
     ' LEFT JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T3`.`Entry` = `T4`.`Entry`) AND (`T3`.`Language` = 0) AND (`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';  
-    echo($Query);
+
     return($Query);
   }
@@ -282 +284 @@
       $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
       
+      $LookupTable = array();
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
+      while($DbRow = $DbResult2->fetch_assoc())
+        $LookupTable[$DbRow['ShortCut']] = $DbRow;
         
       while(!$File->EOF())
@@ -295 +300 @@
           $Value['Comment'] = substr(trim($LineParts[1]), 3);
 
-          if($DbResult2->num_rows > 0)
+          if(array_key_exists($Value['ShortCut'], $LookupTable))
           {
-            $DbRow = $DbResult2->fetch_assoc();
+            $DbRow = $LookupTable[$Value['ShortCut']];
             $Value['Text'] = addslashes($DbRow['Text']);
             // Escape new line control characters