Changeset 366 for trunk/export


Ignore:
Timestamp:
Mar 9, 2010, 1:01:14 PM (15 years ago)
Author:
george
Message:
  • Upraveno: Přejmenovány všechny tabulky textů na názvy s prvními velkými písmeny ve slovech plus pro odlišení s prefixem Text.
  • Upraveno: Další SQL dotazy doplněny o SQL uvozovky.
Location:
trunk/export
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/export/create_addon.php

    r334 r366  
    104104    $CreatedFileListCount = array();
    105105 
    106     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`TablePrefix` != ""');
     106    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`TablePrefix` != ""');
    107107    while($Group = $DbResult->fetch_assoc())
    108108    {
    … …  
    123123        $Buffer = 'CZWOW_'.$Column['AddonFileName'].'_count='.$FileIndex.';CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';
    124124   
    125         $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)';
     125        $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)';
    126126        $DbResult2 = $this->Database->query($Query);
    127127       
    128128       
    129129        if ($this->Database->affected_rows == 0) {
    130                         $ID = $this->Database->query('SELECT MAX(`VersionEnd`) FROM `'.$Group['TablePrefix'].'`');
    131                         $BuildNumber_max = $ID->fetch_assoc();
    132                         $BuildNumber_max = $BuildNumber_max['MAX(`VersionEnd`)'];
    133                        
    134                         $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)';
     130      $ID = $this->Database->query('SELECT MAX(`VersionEnd`) FROM `'.$Group['TablePrefix'].'`');
     131      $BuildNumber_max = $ID->fetch_assoc();
     132      $BuildNumber_max = $BuildNumber_max['MAX(`VersionEnd`)'];
     133     
     134      $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)';
    135135            $DbResult2 = $this->Database->query($Query);
    136                         
    137                 }
     136      
     137    }
    138138       
    139139        while($Line = $DbResult2->fetch_assoc())
    … …  
    202202  function MakeReadme()
    203203  {
    204     $DbResult = $this->Database->query('SELECT * FROM verseclient ORDER BY DATE DESC');
     204    $DbResult = $this->Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');
    205205    $Line = $DbResult->fetch_assoc();
    206206
    … …  
    216216 
    217217 Verze:
    218   Verze Addonu: '.$Line['verse'].'
     218  Verze Addonu: '.$Line['Version'].'
    219219  Tato verze je pro verzi hry '.$this->ClientVersion['Version'].'
    220220 
    … …  
    222222 
    223223    ';
    224     $DbResult = $Database->query('SELECT * FROM verseclient ORDER BY DATE
    225 DESC');
     224    $DbResult = $Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');
    226225    while($Line = $DbResult->fetch_assoc())
    227226    {
    228227      $Buffer .='
    229   Verze: '.$Line['verse'].'
     228  Verze: '.$Line['Version'].'
    230229  =============
    231230  '.$Line['text'].'

  • trunk/export/create_mpq.php

    r277 r366  
    22
    33//wine MPQEditor.exe /console script_create_mpq.txt
    4 echo (exec('wine MPQEditor.exe /console script_create_mpq.txt'));
    5 echo (exec('mkdir ../tmp/mpq'));
    6 echo ('hotovo');
     4echo(exec('wine MPQEditor.exe /console script_create_mpq.txt'));
     5echo(exec('mkdir ../tmp/mpq'));
     6echo('hotovo');
     7
    78?>

  • trunk/export/export.php

    r365 r366  
    6464
    6565
    66     $DbResult = $this->Database->query('SELECT * FROM `wow_client_version` WHERE `Id`='.$this->Export['ClientVersion']);
     66    $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
    6767    $this->ClientVersion = $DbResult->fetch_assoc();   
    6868  }
    … …  
    8686      "-- Generované tabulky: ";
    8787   
    88     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     88    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
    8989    while($Group = $DbResult->fetch_assoc())
    9090    {
    … …  
    9393    $Buffer .= "\n\n"; 
    9494
    95     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     95    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
    9696    while($Group = $DbResult->fetch_assoc())
    9797    {
    … …  
    195195    "  <translation>\n";
    196196
    197     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     197    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
    198198    while($Group = $DbResult->fetch_assoc())
    199199    {
    … …  
    233233    $this->LoadFilters();
    234234
    235     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`DBCFileName` != ""');
     235    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
    236236    while($Group = $DbResult->fetch_assoc())
    237237    {
    … …  
    278278    $this->LoadFilters();
    279279
    280     $DbResult = $this->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `group`.`LuaFileName` != ""');
     280    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`LuaFileName` != ""');
    281281    while($Group = $DbResult->fetch_assoc())
    282282    {

  • trunk/export/export_output.php

    r357 r366  
    190190  if(array_key_exists('Regenerate', $_POST))
    191191  {
    192     $Database->SQLCommand('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL');
     192    $Database->SQLCommand('UPDATE `ExportTask` SET `TimeStart` = NOW(), `TimeFinish` = NULL');
    193193    echo('Soubor zařazen znovu ke zpracování.<br/><br/>');
    194194  }
    195   $DbResult = $Database->SQLCommand('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
     195  $DbResult = $Database->SQLCommand('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
    196196  $ExportTask = mysql_fetch_assoc($DbResult);
    197197  if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
    … …  
    201201    $Export->Id = $ExportId;
    202202    $Export->Init();
    203     $DbResult = $System->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `group`.`DBCFileName` != ""');
     203    $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`DBCFileName` != ""');
    204204    while($Group = $DbResult->fetch_assoc())
    205205    {
    … …  
    234234  echo('<strong>Soubory:</strong><br/>'. 
    235235    'Souhrný archív <a href="'.$SaveFilename.'">CzWoW_Lua.zip</a><br />');
    236   $DbResult = $System->Database->query('SELECT `group`.* FROM `ExportGroup` JOIN `group` ON `group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `group`.`LuaFileName` != ""');
     236  $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`LuaFileName` != ""');
    237237  while($Group = $DbResult->fetch_assoc())
    238238  {

  • trunk/export/index.php

    r365 r366  
    127127  if(array_key_exists('ExportId', $_GET))
    128128  {
    129     $DbRows = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
     129    $DbRows = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
    130130    if(mysql_num_rows($DbRows) > 0)
    131131    {   
    … …  
    148148          if(array_key_exists('sel'.$UserId, $_POST)) $Selected = true;
    149149            else $Selected = false;
    150           $Condition = ' WHERE Export='.$_GET['ExportId'].' AND User='.$UserId;
    151           $DbResult = $Database->SQLCommand('SELECT * FROM ExportUser '.$Condition);
     150          $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `User`='.$UserId;
     151          $DbResult = $Database->SQLCommand('SELECT * FROM `ExportUser` '.$Condition);
    152152          if(mysql_num_rows($DbResult) > 0)
    153153          {
    154             if(!$Selected) $Database->SQLCommand('DELETE FROM ExportUser '.$Condition);
    155               else $Database->SQLCommand('UPDATE ExportUser SET Sequence='.$Value.$Condition);
     154            if(!$Selected) $Database->SQLCommand('DELETE FROM `ExportUser` '.$Condition);
     155              else $Database->SQLCommand('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
    156156          } else
    157157          {
    158             if($Selected) $Database->SQLCommand('INSERT INTO ExportUser (Export, User, Sequence) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
     158            if($Selected) $Database->SQLCommand('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
    159159          }         
    160160        }
    … …  
    163163      // Recalculate sequence number
    164164      $Database->SQLCommand('SET @I = 0');
    165       $Database->SQLCommand('UPDATE ExportUser SET Sequence = (@I := @I + 1) WHERE Export='.$_GET['ExportId'].' ORDER BY Sequence;');
     165      $Database->SQLCommand('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
    166166    }
    167167  }
    168168
    169169  $TableColumns = array(
    170     array('Name' => 'user', 'Title' => 'Jméno'),
     170    array('Name' => 'Name', 'Title' => 'Jméno'),
    171171    array('Name' => 'TranslatedCount', 'Title' => 'Překladů'),
    172172    array('Name' => 'XP', 'Title' => 'Úroveň'),
    … …  
    201201  echo($Order['Output']);
    202202
    203   $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
     203  $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
    204204  $Database->SQLCommand('SET @I = 0');
    205205  $DbResult = $Database->SQLCommand($Query);
    … …  
    396396  }
    397397
    398   $Query = 'SELECT `group`.*, `ExportGroup`.`Id` AS `ExportGroupId` FROM `group` LEFT JOIN `ExportGroup` ON `ExportGroup`.`Export`='.$_GET['ExportId'].' AND `Group`=`group`.`Id`';
     398  $Query = 'SELECT `Group`.*, `ExportGroup`.`Id` AS `ExportGroupId` FROM `Group` LEFT JOIN `ExportGroup` ON `ExportGroup`.`Export`='.$_GET['ExportId'].' AND `Group`=`Group`.`Id`';
    399399
    400400  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS X');
    … …  
    505505  $Export = mysql_fetch_assoc($DbResult);
    506506
    507   $Query = 'SELECT `wow_client_version`.* FROM `ExportVersion` LEFT JOIN `wow_client_version` ON `wow_client_version`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
     507  $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
    508508
    509509  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS `X`');

  • trunk/export/process_aowow_export.php

    r365 r366  
    6464
    6565// Update news date
    66 $Database2->query("UPDATE `aowow_news` SET `text_loc0` = 'Poslední aktualizace dat ".Date ("d. n. Y, H:i:s")." ', `text_loc8` = 'Poslední aktualizace dat ".Date ("d. n. Y, H:i:s")." ' WHERE `aowow_news`.`id` =3");
     66$Database2->query('UPDATE `aowow_news` SET `text_loc0` = "Poslední aktualizace dat '.date('d. n. Y, H:i:s').'", `text_loc8` = "Poslední aktualizace dat '.date('d. n. Y, H:i:s').'" WHERE `aowow_news`.`id` =3');
    6767
    6868?>

  • trunk/export/process_task.php

    r357 r366  
    1212while(1)
    1313{
    14   $DbResult = $Database->SQLCommand('SELECT ExportTask.Export, Export.Id AS ExportId FROM ExportTask LEFT JOIN Export ON Export.Id = ExportTask.Export WHERE ExportTask.TimeFinish IS NULL');
     14  $DbResult = $Database->SQLCommand('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `ExportTask`.`TimeFinish` IS NULL');
    1515  while($DbRow = mysql_fetch_assoc($DbResult))
    1616  {
    … …  
    3434          echo('Hotovo');
    3535        } else echo('Funkce pro tvorbu Zip souboru není podporována!');
    36         $Database->SQLCommand('UPDATE ExportTask SET TimeFinish=NOW() WHERE Export='.$Export->Id);
     36        $Database->SQLCommand('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$Export->Id);
    3737      } catch (Exception $e)
    3838      {
    … …  
    4141    } else
    4242    {
    43       $Database->SQLCommand('DELETE FROM ExportTask WHERE Export='.$DbRow['Export']);
     43      $Database->SQLCommand('DELETE FROM `ExportTask` WHERE `Export`='.$DbRow['Export']);
    4444      echo('Export '.$DbRow['Export'].' nenalezen. Jeho úloha smazána.'."\n");
    4545    }
Note: See TracChangeset for help on using the changeset viewer.