Changeset 740

Timestamp:

Jan 9, 2014, 11:21:08 AM (11 years ago)

Author:

maron

Message:

• Added: Error on not working ProcessTask.php

Location:

trunk

Files:

• Modules/Export/ExportOutput.php (modified) (5 diffs)
• Modules/Export/ProcessTask.php (modified) (1 diff)
• Modules/Export/Progress.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/ExportOutput.php

@@ -192 +192 @@
   if(array_key_exists('Regenerate', $_POST))
   {
-    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
+    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(),  `Progress`=0 , TimeFinish = NULL WHERE Export = '.$ExportId);
     $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
+    $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování dbc souboru', LOG_TYPE_DOWNLOAD);
   }
 
@@ -203 +204 @@
   {
     $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);
+    $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování dbc souboru', LOG_TYPE_DOWNLOAD);
     $System->Database->query('UPDATE `ExportTask` SET `Progress`=0 WHERE `Export`='.$Export->Id);
   }  
@@ -236 +237 @@
                   '$(document).ready(function() {'.
                   'var refreshId = setInterval(function() {'.
-                  '$("#progress'.$Task['Export'].'").load("'.$System->Link('/Modules/Export/Progress.php?ExportId='.$Task['Export']).'"); '.
+                  '$("#progress'.$Task['Export'].'").load("'.$System->Link('/Modules/Export/Progress.php?RedirectId='.$_GET['ExportId'].'&ExportId='.$Task['Export']).'"); '.
                   '}, 1000);'.
                   '});'.
@@ -248 +249 @@
     
     }
+    $DbResult = $System->Database->query('SELECT * FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE '.
+    ' (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL AND `TimeStart` < NOW()-10000');
+    if($DbResult->num_rows > 0) {
+      $System->ModuleManager->Modules['Log']->WriteLog('ProcesTask nepracuje přes 2 hodiny, pravděpodobně nepracuje!', LOG_TYPE_ERROR);
+  
+    }
     return ($Output);
 }
@@ -263 +270 @@
   if(array_key_exists('Regenerate', $_POST))
   {
-    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
+    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(),  `Progress`=0,  TimeFinish = NULL WHERE Export = '.$ExportId);
     $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
-    $System->Database->query('UPDATE `ExportTask` SET `Progress`=0 WHERE `Export`='.$Export->Id);
+    $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování exe souboru', LOG_TYPE_DOWNLOAD);
   }
 

trunk/Modules/Export/ProcessTask.php

@@ -161 +161 @@
         
         // Delete old files
-        SetProgress($Export,5);
+        SetProgress($Export,1);
         echo('Delete old files...'."\n");
         DeleteOldFiles($Export->TempDir.'dbc');

trunk/Modules/Export/Progress.php

@@ -13 +13 @@
     
     if ( $Task['Progress'] > 99 )   echo '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-   'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$_GET['ExportId']).'\'", 500)'.
+   'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$_GET['RedirectId']).'\'", 500)'.
    '</script>';
 

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 739; // Subversion revision
+$Revision = 740; // Subversion revision
 $DatabaseRevision = 732; // Database structure revision 
 $ReleaseTime = '2014-01-08';