Changeset 369 for trunk

Timestamp:

Mar 9, 2010, 3:22:30 PM (15 years ago)

Author:

maron

Message:

Export dbc souborů pomocí programu DBCExport

Location:

trunk

Files:

• export/DBCExport (added)
• export/export.php (modified) (3 diffs)
• export/export_output.php (modified) (2 diffs)
• export/process_task.php (modified) (2 diffs)
• includes/global_function.php (modified) (1 diff)

trunk/export/export.php

@@ -30 +30 @@
     $DbResult = $this->Database->query('SELECT * FROM `ExportLanguage` WHERE `Export`='.$this->Id.' ORDER BY `Sequence`');
     while($Language = $DbResult->fetch_assoc())
-      $this->WhereLang .= ' OR (`Language` = '.$Language['Language'].')'; 
+      $this->WhereLang .= ' OR (Language = '.$Language['Language'].')'; 
     if($this->WhereLang == '') $this->WhereLang = 1; 
       else $this->WhereLang = '('.substr($this->WhereLang, 4).')';
@@ -52 +52 @@
     } else
     {
-      $this->WhereUsers = '(`User` IN ('.$this->SelectedUsers.'))';
-      $this->OrderByUserList = ' ORDER BY FIELD(`User`, '.$this->SelectedUsers.')';
+      $this->WhereUsers = '(User IN ('.$this->SelectedUsers.'))';
+      $this->OrderByUserList = ' ORDER BY FIELD(User, '.$this->SelectedUsers.')';
     }
     
@@ -237 +237 @@
     {
       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($this->ClientVersion['Version'], $Group['DBCFileName']));
-      $DBCFile2 = new DBCFile();
-      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;
-      $Line = $DBCFile->GetLine(0);
-      $DBCFile2->SetRecordCount($Count);   
-      for($I = 0; $I < $Count; $I++)
-      {
-        $Line = $DBCFile->GetLine($I);
-        $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($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);
-        }
-        $DBCFile2->SetLine($I, $Line);
-        echo('.');
-      }
-      $DBCFile2->Commit();
-      echo('Hotovo <br />');
-    } else echo('Zdrojový soubor '.'../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n");
+        if(file_exists('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) {
+                  
+         $i = 1;
+         $columns = '';
+         foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+           $columns .= ' T.'.$Column['Column'].' as text'.$i.',';
+           $i = $i+1;
+         }
+         
+         $querty = '"SELECT '.$columns.' T.entry as entry FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].') AS T GROUP BY T.entry"';
+      
+       $params = ' -f ../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc -n '.$this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc -c '.GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']).' -q '.$querty;
+      
+       exec('./DBCExport '.$params);
+       
+      echo('Hotovo <br />
+');
+      } else echo('Zdrojový soubor '.'../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n");
     }
   }

trunk/export/export_output.php

@@ -179 +179 @@
   
   echo('<form action="?Action=View&amp;Tab=6&amp;ExportId='.$ExportId.'" method="post"><input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />');
-  echo('U DBC souborů export textů funguje jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br />DBC soubory je nutné zabalit do souboru patch-enGB-5.MPQ uvnitř složky "DBFilesClient" a hru spouštět přes program wowme.exe (WoW Model Edit). Zabalit je můžete pomocí programu <a href="../download/mpqediten32.zip">Ladik\'s MPQ Editor</a>. Stav vygenerování můžete sledovat na této stránce.<br /><br />');
+  echo('U DBC souborů export textů funguje jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br />DBC soubory je nutné zabalit do souboru patch-enGB-5.MPQ uvnitř složky "DBFilesClient" a hru spouštět přes program wowme.exe (WoW Model Edit) u verzí klienta starší než 3.2.0. Od této verze již wowme není potřeba. Zabalit je můžete pomocí programu <a href="../download/mpqediten32.zip">Ladik\'s MPQ Editor</a>. Stav vygenerování můžete sledovat na této stránce.<br /><br />');
     
   $DbResult = $Database->SQLCommand('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
@@ -190 +190 @@
   if(array_key_exists('Regenerate', $_POST))
   {
-    $Database->SQLCommand('UPDATE `ExportTask` SET `TimeStart` = NOW(), `TimeFinish` = NULL');
+    $Database->SQLCommand('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
     echo('Soubor zařazen znovu ke zpracování.<br/><br/>');
   }

trunk/export/process_task.php

@@ -8 +8 @@
 include_once('export_output.php');    
 
-LoadCommandLineParameters();
+//LoadCommandLineParameters();
 
 while(1)
@@ -27 +27 @@
           echo('Generování DBC souborů pro export '.$Export->Id.'.. '."\n");
           $Export->ExportToDBC();
-          $SaveFilename = $Export->TempDir.'/CzWoW_DBC.zip';          
+      /*    $SaveFilename = $Export->TempDir.'/CzWoW_DBC.zip';          
           $Zip = new zipfile();
           CreateZipFromDir($Zip, $Export->TempDir.'dbc/', 'DBFilesClient/');
           $Buffer = $Zip->file();
-          file_put_contents($SaveFilename, $Buffer);
+          file_put_contents($SaveFilename, $Buffer);  */
+          echo ('Archivuji..');
+          exec('zip -r '.$Export->TempDir.'/CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
           echo('Hotovo');
         } else echo('Funkce pro tvorbu Zip souboru není podporována!');

trunk/includes/global_function.php

@@ -262 +262 @@
     $Result[$DbRow['Id']] = $DbRow;
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem`');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY DBCColumnIndex');
   while($DbRow = mysql_fetch_assoc($DbResult))
   {