Changeset 666 for trunk/Modules/Export

Timestamp:

Dec 24, 2013, 3:04:01 PM (11 years ago)

Author:

maron

Message:

• Fixed: dbc export task
• Added: EXE file task
• Moved: Instalace_CzechWoW.nsi

Location:

trunk/Modules/Export

Files:

• ExportOutput.php (modified) (2 diffs)
• Instalace_CzechWoW.nsi (deleted)
• ProcessTask.php (modified) (2 diffs)
• files/3.3.5a/Instalace_CzechWoW.nsi (added)

trunk/Modules/Export/ExportOutput.php

@@ -206 +206 @@
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {
-    $Output .= '<strong>Souhrný balík: <a href="../tmp/Export/'.$ExportTask['Export'].'/CzWoW_DBC.zip">CzWoW_DBC.zip</a></strong><br/>';
     $Export = new Export($System);
     $Export->Id = $ExportId;
     $Export->Init();
+    $Output .= '<strong>Souhrný balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_DBC.zip').'">CzWoW_DBC.zip</a></strong><br/>';
     $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`DBCFileName` != ""');
     while($Group = $DbResult->fetch_assoc())
     {
       if(file_exists($Export->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc')) 
-        $Output .= '<a href="'.$Export->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc">'.$Group['DBCFileName'].'.dbc</a><br/>';
+        $Output .= '<a href="'.$System->Link('/'.$Export->TempDirRelative.'dbc/'.$Group['DBCFileName'].'.dbc').'">'.$Group['DBCFileName'].'.dbc</a><br/>';
     }
+  } else $Output .= '<strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+  return($Output);
+}
+function OutputEXEToFile($ExportId)
+{
+  global $System;
+  
+  $Output = '';
+  if(array_key_exists('Regenerate', $_POST))
+  {
+    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
+    $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
+  }
+
+  $Output .= '<form action="?Action=View&amp;Tab=7&amp;ExportId='.$ExportId.'" method="post"><input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />';
+  $Output .= 'U souhrné instalace češtiny funguje export textů jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br />';
+    
+  $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
+  if($DbResult->num_rows == 0)
+  {
+    $System->Database->query('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$ExportId.', NOW())');
+    $this->System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování dbc souboru', LOG_TYPE_DOWNLOAD);
+  }  
+  
+  $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
+  $ExportTask = $DbResult->fetch_assoc();
+  if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
+  {
+    $Export = new Export($System);
+    $Export->Id = $ExportId;
+    $Export->Init();
+    $Export->LoadFilters();
+    $Output .= '<strong>Souhrný EXE balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe').'">Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe</a></strong><br/>';
+
   } else $Output .= '<strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
   return($Output);
@@ -265 +299 @@
   else if($Type == 8) $Output = OutputLua($ExportId);
   else if($Type == 9) $Output = OutputDBCToFile($ExportId);
+  else if($Type == 10) $Output = OutputEXEToFile($ExportId);
   else $Output = ShowMessage('Nebyl vybrán žádný formát výstupu.', MESSAGE_CRITICAL);
   return($Output);

trunk/Modules/Export/ProcessTask.php

@@ -3 +3 @@
 ini_set('memory_limit', '100M');
 
-include_once('../includes/global.php');
-include_once('../includes/zip.lib.php');
+include_once(dirname(__FILE__).'/../../includes/global.php');
+include_once(dirname(__FILE__).'/../../includes/zip.lib.php');
+
 include_once('Export.php');    
 include_once('ExportOutput.php');    
 
 //LoadCommandLineParameters();
+  $System = new System();
+  $System->DoNotShowPage = true;
+        $System->Run();
 
 while(1)
 {
-  $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `ExportTask`.`TimeFinish` IS NULL');
+  //DBC files
+  $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 9 AND `ExportTask`.`TimeFinish` IS NULL');
   while($DbRow = $DbResult->fetch_assoc()) 
   {
@@ -55 +60 @@
     }
   }
+
+  //EXE files
+  $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 10 AND `ExportTask`.`TimeFinish` IS NULL');
+  while($DbRow = $DbResult->fetch_assoc()) 
+  {
+    echo(StrFTime("%d/%m/%Y %H:%M:%S", time()).': Generování EXE souboru pro export '.$DbRow['ExportId'].'.. '."\n");
+    if($DbRow['ExportId'] != '') 
+    {     
+      echo shell_exec('"'.dirname(__FILE__).'./client_cz_export.sh" '.$DbRow['ExportId'].'');
+      $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$DbRow['Export']);
+    } else
+    {
+      $System->Database->query('DELETE FROM `ExportTask` WHERE `Export`='.$DbRow['Export']);
+      echo('Export '.$DbRow['Export'].' nenalezen. Jeho úloha smazána.'."\n");
+    }
+  }
   sleep($Config['ExportTaskProcessPeriod']);
 }