Changeset 292 for trunk/export/export.php

Timestamp:

Dec 27, 2009, 8:19:32 PM (15 years ago)

Author:

george

Message:

• Upraveno: Generování obrázků úrovní překladatelů přesměrováno do podsložky user ve složce tmp a týmů z teams do team.
• Upraveno: Přepracován skript pro zpracování úloh pro generování exportů DBC souborů. Nyní běží v nekončené smyčce a čeká na nové úlohy. Generování se provádí ve frontě a to i během dne.

File:

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

trunk/export/export.php

@@ -60 +60 @@
     }
     
-    if($_SESSION['UserID'] != '')
+    if(isset($_SESSION) and ($_SESSION['UserID'] != ''))
     {
       $DbResult = $this->Database->query('SELECT user FROM `user` WHERE ID='.$_SESSION['UserID']);
@@ -234 +234 @@
     $this->LoadFilters();
 
-    $TempDir = $this->Config['Web']['TempFolder'].$_SESSION['User'].'/dbc/';
-    if(!file_exists($TempDir)) mkdir($TempDir, 0777, true);
-
-  
-    foreach($TranslationTree as $Group)
-    if(in_array($Group['Id'], $Setting['groups']) and ($Group['DBCFileName'] != '')) 
-    { 
+    $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`DBCFileName` != ""');
+    while($Group = $DbResult->fetch_assoc())
+    {
       echo($Group['Name'].'... ');
       $DBCFile = new DBCFile();
-      $DBCFile->OpenFile('../source/'.$Setting['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'],$Group['DBCFileName']));
+      $DBCFile->OpenFile('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'], $Group['DBCFileName']));
       $DBCFile2 = new DBCFile();
-      $DBCFile2->CreateFile($TempDir.$Group['DBCFileName'].'.dbc', GetDBCColumns($Setting['Version'],$Group['DBCFileName']));
+      $DBCFile2->CreateFile($this->TempDir.$Group['DBCFileName'].'.dbc', GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']));
       $Count = $DBCFile->GetRecordCount();
       //if($Group['DBCFileName'] == 'Spell') $Count = 1000;
@@ -253 +249 @@
       {
         $Line = $DBCFile->GetLine($I);
-        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$WhereLang.' AND '.$WhereUsers.' AND (entry='.$Line[0].')  AND VersionStart <= '.GetBuildNumber($Setting['Version']).' AND VersionEnd >= '.GetBuildNumber($Setting['Version']).' ORDER BY FIELD(User, '.$SelectedUsers.')) AS T GROUP BY T.entry';       
-        $DbResult = $this->Database->query($Query);
-        if($DbResult->num_rows > 0)
-        {
-          $DbRow = $DbResult->fetch_assoc();
+        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (entry='.$Line[0].')  AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';       
+        $DbResult2 = $this->Database->query($Query);
+        if($DbResult2->num_rows > 0)
+        {
+          $DbRow = $DbResult2->fetch_assoc();
           //  if($Setting['Diacritics'] != 1) $Buffer = utf2ascii($Buffer);
 
-          foreach($Group['Items'] as $GroupItem)
-            if(GetDBCColumnIndex($Setting['Version'], $Group['DBCFileName'], $GroupItem['Column']) != '')
-          $Line[GetDBCColumnIndex($this->Export['ClientVersion'], $Group['DBCFileName'],$GroupItem['Column'])] = $DbRow[$GroupItem['Column']];
+          foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+            if(GetDBCColumnIndex($this->ClientVersion['Version'], $Group['DBCFileName'], $GroupItem['Column']) != '')
+          $Line[GetDBCColumnIndex($this->ClientVersion['Version'], $Group['DBCFileName'],$GroupItem['Column'])] = $DbRow[$GroupItem['Column']];
           //print_r($Line);
         }
@@ -279 +275 @@
     $this->LoadFilters();
 
-    $TempDir = $this->Config['Web']['TempFolder'].$_SESSION['User'].'/lua/';
-    if(!file_exists($TempDir)) mkdir($TempDir, 0777, true);
-  
     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`LuaFileName` != ""');
     while($Group = $DbResult->fetch_assoc())
@@ -289 +282 @@
       $File->OpenFile('../source/'.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
       $File2 = new FileStream();
-      $File2->CreateFile($TempDir.''.$Group['LuaFileName'].'.lua');
+      $File2->CreateFile($this->TempDir.''.$Group['LuaFileName'].'.lua');
  
       while(!$File->EOF())