Changeset 291 for trunk/export/export.php

Timestamp:

Dec 27, 2009, 7:12:44 PM (15 years ago)

Author:

george

Message:

• Přidáno: Metoda Init u třídy Export, která inicializuje základní nastavení jako je cesta k dočasné složce.
• Opraveno: Načtení informací o verzi klienta pro generování exportu.
• Přidáno: Možnost předvolby směru řazení tabulek.
• Opraveno: Ukládání obecných nastavení exportů.
• Upraveno: Knihovna pro generování addonu přepsána z procedurálního na objektový zápis. Třída rozšiřuje třídu Export o další metody.
• Upraveno: Přepsáno zařazování úloh pro generování DBC exportů.

File:

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

trunk/export/export.php

@@ -13 +13 @@
   var $User;
   var $ClientVersion;
+  var $OrderByUserList;
+  
+  function Init()
+  {
+    $this->TempDir = $this->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
+    if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
+  }
   
   function LoadFilters()
@@ -33 +40 @@
       $this->SelectedUsers .= ','.$User['User'];
     $this->SelectedUsers = substr($this->SelectedUsers, 1);
-
+   
     if($this->SelectedUsers == '') $Where = 0;
       else $Where = 'ID IN ('.$this->SelectedUsers.')';
@@ -43 +50 @@
     $this->UserNames = substr($this->UserNames, 1);    
    
-    if($this->SelectedUsers == '') $WhereUsers = 1; 
-      else $this->WhereUsers = '(User IN ('.$this->SelectedUsers.'))';
-
+    if($this->SelectedUsers == '')
+    {
+      $this->WhereUsers = 1;
+      $this->OrderByUserList = '';
+    } else
+    {
+      $this->WhereUsers = '(User IN ('.$this->SelectedUsers.'))';
+      $this->OrderByUserList = ' ORDER BY FIELD(User, '.$this->SelectedUsers.')';
+    }
+    
     if($_SESSION['UserID'] != '')
     {
@@ -52 +66 @@
     } else $this->User = array('user' => 'Neznámý');
 
-    $DbResult = $this->Database->query('SELECT `BuildNumber` FROM `wow_client_version` WHERE `Id`='.$this->Export['ClientVersion']);
-    $DbRow = $DbResult->fetch_assoc();
-    $this->ClientVersion = $DbRow['BuildNumber'];
+    $DbResult = $this->Database->query('SELECT * FROM `wow_client_version` WHERE `Id`='.$this->Export['ClientVersion']);
+    $this->ClientVersion = $DbResult->fetch_assoc();    
   }
 
@@ -87 +100 @@
       if($Group['MangosTable'] != '')
       {
-        $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND VersionStart <= '.$this->ClientVersion.' AND VersionEnd >= '.$this->ClientVersion.' 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.' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';  
         //echo($Query);
         $Buffer .= "\n\n-- ".$Group['Name']."\n\n";
@@ -191 +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.' AND VersionEnd >= '.$this->ClientVersion.' AND '.$this->WhereLang.' AND '.$this->WhereUsers.' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.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);
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";
@@ -248 +261 @@
 
           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']];
+            if(GetDBCColumnIndex($Setting['Version'], $Group['DBCFileName'], $GroupItem['Column']) != '')
+          $Line[GetDBCColumnIndex($this->Export['ClientVersion'], $Group['DBCFileName'],$GroupItem['Column'])] = $DbRow[$GroupItem['Column']];
           //print_r($Line);
         }
@@ -274 +287 @@
       echo($Group['Name'].'... ');
       $File = new FileStream();
-      $File->OpenFile('../source/'.$this->ClientVersion.'/lua/'.$Group['LuaFileName'].'.lua');
+      $File->OpenFile('../source/'.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
       $File2 = new FileStream();
       $File2->CreateFile($TempDir.''.$Group['LuaFileName'].'.lua');
@@ -289 +302 @@
           $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.' AND VersionEnd >= '.$this->ClientVersion.' 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'].' ORDER BY FIELD(User, '.$this->SelectedUsers.')) AS T GROUP BY T.entry';
           //echo($Query);
           $DbResult2 = $this->Database->query($Query);