Changeset 297 for trunk/export/export.php

Timestamp:

Dec 28, 2009, 2:32:52 PM (15 years ago)

Author:

george

Message:

• Opraveno: Proces generování DBC a Lua souborů.
• Opraveno: Generování SQL pro AoWoW.
• Přidáno: Zadání popisu exportu při vytváření nového.
• Opraveno: Soubory jednotlivých formátů výstupů exportů ukládat do samostatných podsložek a z nich pak vytvářet zip balíčky.
• Přidáno: Omezení max. počtu vytvořených exportů na překladatele. Výchozí limit je 10.

File:

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

trunk/export/export.php

@@ -36 +36 @@
     // Filter selected users
     $this->SelectedUsers = '';  
-    $DbResult = $this->Database->query('SELECT * FROM `ExportUser` WHERE Export='.$this->Id.' ORDER BY Sequence');
+    $this->UserNames = '';
+    $DbResult = $this->Database->query('SELECT ExportUser.*, user.user FROM `ExportUser` LEFT JOIN user ON user.ID=ExportUser.User WHERE ExportUser.Export='.$this->Id.' ORDER BY ExportUser.Sequence');
     while($User = $DbResult->fetch_assoc())
+    {
       $this->SelectedUsers .= ','.$User['User'];
+      $this->UserNames .= ','.$User['user'];
+    }
     $this->SelectedUsers = substr($this->SelectedUsers, 1);
-   
-    if($this->SelectedUsers == '') $Where = 0;
-      else $Where = 'ID IN ('.$this->SelectedUsers.')';
-  
-    $this->UserNames = '';
-    $DbResult = $this->Database->query('SELECT user FROM `user` WHERE '.$Where);
-    while($DbRow = $DbResult->fetch_assoc())
-      $this->UserNames .= ','.$DbRow['user'];
-    $this->UserNames = substr($this->UserNames, 1);    
+    $this->UserNames = substr($this->UserNames, 1);      
    
     if($this->SelectedUsers == '')
     {
-      $this->WhereUsers = 1;
+      $this->WhereUsers = 0;
       $this->OrderByUserList = '';
     } else
@@ -60 +56 @@
     }
     
+    // Load logged user
     if(isset($_SESSION) and ($_SESSION['UserID'] != ''))
     {
@@ -101 +98 @@
       if($Group['MangosTable'] != '')
       {
-        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' AND '.$this->WhereLang.' AND '.$this->WhereUsers.' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';  
+        $Query = 'SELECT * FROM (SELECT * 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 T GROUP BY T.entry';  
         //echo($Query);
         $Buffer .= "\n\n-- ".$Group['Name']."\n\n";
@@ -129 +126 @@
   
     $Buffer = $this->ExportToMangosSQL();
- 
-    $this->LoadFilters();
-
+  
     // Data to aowow
 
@@ -137 +132 @@
     $Database2->query('SET NAMES '.$this->Config['Database']['Charset']);
     $Database2->select_db($AoWoWconf['mangos']['db']);    
-    $AoWoWTables = array('aowow_resistances' => 'Id', 'aowow_spelldispeltype' => 'Id', 'aowow_skill' => 'skillID');
+    $AoWoWTables = array(
+      'aowow_resistances' => 'Id', 
+      'aowow_spelldispeltype' => 'Id', 
+      'aowow_skill' => 'skillID',
+    );
     foreach($AoWoWTables as $AoWoWTable => $IndexColum) 
     {
@@ -147 +146 @@
       {
         $Ori_text = $Line['name'];
-        $DbResult2 = $Datbase2->query('SELECT text as en,
+        $DbResult2 = $Database2->query('SELECT text as en,
         (SELECT text FROM '.$Config['Database']['Database'].'.global_strings as tabletran
-         WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$WhereLang.'
-          AND '.$WhereUsers.' ORDER BY FIELD(User, '.$SelectedUsers.') LIMIT 1) as tran
+         WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$this->WhereLang.'
+          AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) as tran
          FROM '.$Config['Database']['Database'].'.global_strings as tableen WHERE
           text = "'.addslashes($Ori_text).'" LIMIT 1');
@@ -160 +159 @@
           (SELECT OptionText FROM '.$this->Config['Database']['Database'].'.npc_option as tabletran
            WHERE tableen.entry = tabletran.entry AND (Complete = 1) AND '.$this->WhereLang.'
-            AND '.$this->WhereUsers.' ORDER BY FIELD(User, '.$this->SelectedUsers.') LIMIT 1) as tran
+            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) as tran
           FROM '.$this->Config['Database']['Database'].'.npc_option as tableen WHERE
             OptionText = "'.addslashes($Ori_text).'" LIMIT 1');
@@ -205 +204 @@
         $Group['MangosTableIndex'] = 'entry';
       }
-      $Query = 'SELECT *,(SELECT user FROM user WHERE user.ID=T.User) as UserName FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' AND '.$this->WhereLang.' AND '.$this->WhereUsers.' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry'; 
-      //echo($Query);
+      $Query = 'SELECT *,(SELECT user FROM user WHERE user.ID=T.User) as UserName FROM (SELECT * 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 T GROUP BY T.entry'; 
+      echo($Query);
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";
       $DbResult2 = $this->Database->query($Query);
@@ -239 +238 @@
     {
       echo($Group['Name'].'... ');
+      if(file_exists('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
+      {
       $DBCFile = new DBCFile();
-      $DBCFile->OpenFile('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'], $Group['DBCFileName']));
+      $DBCFile->OpenFile('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']));
       $DBCFile2 = new DBCFile();
-      $DBCFile2->CreateFile($this->TempDir.$Group['DBCFileName'].'.dbc', GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']));
+      if(!file_exists($this->TempDir.'dbc/')) mkdir($this->TempDir.'dbc/', 0777, true);      
+      $DBCFile2->CreateFile($this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']));
       $Count = $DBCFile->GetRecordCount();
       //if($Group['DBCFileName'] == 'Spell') $Count = 1000;
@@ -267 +269 @@
       $DBCFile2->Commit();
       echo('Hotovo <br />');
+    } else echo('Zdrojový soubor '.'../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n");
     }
   }
@@ -283 +286 @@
       $File->OpenFile('../source/'.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
       $File2 = new FileStream();
-      $File2->CreateFile($this->TempDir.''.$Group['LuaFileName'].'.lua');
+      if(!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
+      $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
  
       while(!$File->EOF())
@@ -296 +300 @@
           $Value['Comment'] = addslashes(substr(trim($LineParts[1]), 3));
 
-          $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (ShortCut="'.$Value['ShortCut'].'") AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';
+          $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (ShortCut="'.$Value['ShortCut'].'") AND (VersionStart <= '.$this->ClientVersion['BuildNumber'].') AND (VersionEnd >= '.$this->ClientVersion['BuildNumber'].')'.$this->OrderByUserList.') AS T GROUP BY T.entry';
           //echo($Query);
           $DbResult2 = $this->Database->query($Query);