Changeset 407 for trunk

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.

Location:

trunk/export

Files:

• create_addon.php (modified) (2 diffs)
• export.php (modified) (5 diffs)

trunk/export/create_addon.php

@@ -123 +123 @@
         $Buffer = 'CZWOW_'.$Column['AddonFileName'].'_count='.$FileIndex.';CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';
     
-        $Query = 'SELECT `T2`.`'.$Column['Column'].'` AS `Translation`, `T3`.`'.$Column['Column'].'` AS `Original` FROM (SELECT `T1`.`Entry`, `T1`.`'.$Column['Column'].'` FROM (SELECT `Entry`,`'.$Column['Column'].'` FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS `T1` GROUP BY `T1`.`Entry`) AS `T2` JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T2`.`Entry` = `T3`.`Entry`) AND (`T3`.`Language` = 0)';
-        $DbResult2 = $this->Database->query($Query);
-        
-        
-        if ($this->Database->affected_rows == 0) {
-      $ID = $this->Database->query('SELECT MAX(`VersionEnd`) FROM `'.$Group['TablePrefix'].'`');
-      $BuildNumber_max = $ID->fetch_assoc();
-      $BuildNumber_max = $BuildNumber_max['MAX(`VersionEnd`)'];
-      
-      $Query = 'SELECT `T2`.`'.$Column['Column'].'` AS `Translation`, `T3`.`'.$Column['Column'].'` AS `Original` FROM (SELECT `T1`.`Entry`, `T1`.`'.$Column['Column'].'` FROM (SELECT `Entry`,`'.$Column['Column'].'` FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND (`VersionStart` <= '.$BuildNumber_max.') AND (`VersionEnd` >= '.$BuildNumber_max.') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS `T1` GROUP BY `T1`.`Entry`) AS `T2` JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T2`.`Entry` = `T3`.`Entry`) AND (`T3`.`Language` = 0)';
-            $DbResult2 = $this->Database->query($Query);
-      
-    }
+        $DbResult2 = $this->Database->query($this->BuildQuery($Group));
         
         while($Line = $DbResult2->fetch_assoc()) 
         {
-          $en = trim($this->ReplaceEnText($Line['Original']));  
-          $cz = $this->ReplaceCzText($Line['Translation']);
+          $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));  
+          $cz = $this->ReplaceCzText($Line[$Column['Column']]);
           if(($en <> '') and ($cz <> '') and ($this->NotCancel($en))) 
           {
@@ -174 +162 @@
     $Group = $TranslationTree[14]; // client table
     $Column['Column'] = 'Text';
-    $Query = 'SELECT `T2`.`'.$Column['Column'].'` AS `Translation`, `T3`.`'.$Column['Column'].'` AS `Original`, `T3`.`ShortCut` FROM (SELECT `T1`.`Entry`, `T1`.`'.$Column['Column'].'` FROM (SELECT `Entry`,`'.$Column['Column'].'` FROM '.$Group['TablePrefix'].' WHERE (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS `T1` GROUP BY `T1`.`Entry`) AS `T2` JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T2`.`Entry` = `T3`.`Entry`) AND (`T3`.`Language` = 0)';
-    $DbResult = $this->Database->query($Query);
+    
+    $DbResult = $this->Database->query($this->BuildQuery($Group));
     while($Line = $DbResult->fetch_array()) 
     {
-      $Original = $this->my_trim($Line['Original']);
-      $Translated = $this->my_trim($Line['Translation']);
-      if ($this->ClientVersion['Version'] == '2.4.3') 
+      $Original = $this->my_trim($Line['En'.$Column['Column']]);
+      $Translated = $this->my_trim($Line[$Column['Column']]);
+      if($this->ClientVersion['Version'] == '2.4.3') 
       {
         $Original = str_replace("|Hchannel:%d|h[%s]|h", '[%s]', $Original);

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)
           {