Changeset 407 for trunk/export/export.php

Timestamp:

Mar 28, 2010, 6:09:33 PM (15 years ago)

Author:

george

Message:

• Opraveno: Exportování addonu. Funkce BuildQuery rozšířena pro načítání anglických originálů. Názvy sloupců s anglickými texty jsou prefixovýny pomocí En.

File:

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

trunk/export/export.php

@@ -41 +41 @@
   function BuildQuery($Group, $Columns = '')
   {
+    global $TranslationTree;
+    
     $Query = 'SELECT * FROM (SELECT `T`.*, '.$Columns.'`User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
     ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$this->Id.') '.
@@ -46 +48 @@
     ' JOIN `ExportLanguage` ON (`ExportLanguage`.`Export`='.$this->Id.')'.
     ' WHERE (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.
-    ' ORDER BY `ExportLanguage`.`Sequence`, `ExportUser`.`Sequence`) AS `TT` GROUP BY `TT`.`Entry`';  
+    ' ORDER BY `ExportLanguage`.`Sequence`, `ExportUser`.`Sequence`) AS `TT` GROUP BY `TT`.`Entry`';
+    
+    $OriginalColumns = '';
+    foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
+      $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `En'.$Column['Column'].'`, ';
+    $OriginalColumns = substr($OriginalColumns, 0, -2);
+    
+    $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);
   }
-
+  
   function ExportToMangosSQL()
   {
@@ -82 +93 @@
         $Buffer .= "\n\n-- ".$Group['Name']."\n\n";
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
+        if($DbResult2->num_rows > 0)
         while($Line = $DbResult2->fetch_array()) 
         {
@@ -269 +281 @@
       if(!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
       $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
- 
+      
+      $DbResult2 = $this->Database->query($this->BuildQuery($Group));
+        
       while(!$File->EOF())
       {
@@ -281 +295 @@
           $Value['Comment'] = substr(trim($LineParts[1]), 3);
 
-          $DbResult2 = $this->Database->query($this->BuildQuery($Group));
           if($DbResult2->num_rows > 0)
           {