Changeset 867 for trunk/Modules/Export/cmdmpqexport.php

Timestamp:

Feb 6, 2016, 12:54:26 AM (8 years ago)

Author:

chronos

Message:

• Added: Export task TimeQueued time which is different to TimeStart time which is actual time when task was started to be processed.
• Fixed: Updated also export of DBC files.

File:

• trunk/Modules/Export/cmdmpqexport.php (modified) (2 diffs)

trunk/Modules/Export/cmdmpqexport.php

@@ -85 +85 @@
 
 if(array_key_exists('needgeneration', $_GET)) {
-  $DbRows = $System->Database->query('SELECT `ClientVersion`.`Version` as Version, `Export`.`Id`,`Export`.`ClientVersion`,`Export`.`OutputType`,`Export`.`Title`,`Export`.`Description` FROM `Export` JOIN `ClientVersion` as `ClientVersion` ON `ClientVersion`.`Id`=`Export`.`ClientVersion` WHERE `Featured`=1 ORDER BY `ClientVersion`.`BuildNumber` DESC');
+  $DbRows = $System->Database->query('SELECT `ClientVersion`.`Version` AS `Version`, '.
+    '`Export`.`Id`,`Export`.`ClientVersion`,`Export`.`OutputType`,`Export`.`Title`,'.
+    '`Export`.`Description` FROM `Export` '.
+    'JOIN `ClientVersion` AS `ClientVersion` ON `ClientVersion`.`Id`=`Export`.`ClientVersion` '.
+    'WHERE `Featured`=1 ORDER BY `ClientVersion`.`BuildNumber` DESC');
   while ($DbExport = $DbRows->fetch_assoc()) {
   $Export = new Export($System);
@@ -91 +95 @@
   $Output .= $Export->Init();
   if ($Export->NeedGeneration()) {
-    $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$Export->Id);
+    $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$Export->Id);
     if($DbResult->num_rows == 0)
     {
-      $System->Database->query('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$Export->Id.', NOW())');
+      $System->Database->query('INSERT INTO `ExportTask` (`Export` ,`TimeStart` ) VALUES ('.$Export->Id.', NOW())');
     } else
-      $System->Database->query('UPDATE ExportTask SET `TimeStart` = NOW(), `Progress` = 0, `TimeFinish` = NULL WHERE Export = '.$Export->Id);
+      $System->Database->query('UPDATE `ExportTask` SET `TimeStart` = NOW(), `Progress` = 0, `TimeFinish` = NULL WHERE `Export` = '.$Export->Id);
 
     $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování dbc souboru', LOG_TYPE_DOWNLOAD);