Changeset 731 for trunk/Modules/Export/ExportOutput.php

Timestamp:

Jan 8, 2014, 1:05:05 PM (11 years ago)

Author:

maron

Message:

• Modify: Change store progress from file to Database

File:

• trunk/Modules/Export/ExportOutput.php (modified) (5 diffs)

trunk/Modules/Export/ExportOutput.php

@@ -194 +194 @@
     $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
     $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
-    if (file_exists($Export->TempDir.'progress')) unlink($Export->TempDir.'progress');
   }
 
@@ -205 +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->Database->query('UPDATE `ExportTask` SET `Progress`=0 WHERE `Export`='.$Export->Id);
   }  
   
@@ -220 +220 @@
   } else {
   
-    $Line = 0;
-    if (file_exists (dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress')) {
-      $File = new FileStream();
-      $File->OpenFile(dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress');
-      $Line = $File->ReadLine();  
-    }
+
+    $DbResult = $System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$Export->Id);
+    $Task = $DbResult->fetch_assoc();
+
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
                                  'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
                                                  '</script>';
-    $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Line).'</strong>';
-    if ($Line == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+    $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Task['Progress']).'</strong>';
+    if ($Task['Progress'] == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
   } 
   return($Output);
@@ -248 +246 @@
     $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(), TimeFinish = NULL WHERE Export = '.$ExportId);
     $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
-    if (file_exists($Export->TempDir.'progress')) unlink($Export->TempDir.'progress');
+    $System->Database->query('UPDATE `ExportTask` SET `Progress`=0 WHERE `Export`='.$Export->Id);
   }
 
@@ -265 +263 @@
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {
-   // unlink($Export->TempDirRelative.'progress');
     $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 {
     
-    $Line = 0;
-    if (file_exists (dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress')) {
-      $File = new FileStream();
-      $File->OpenFile(dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress');
-      $Line = $File->ReadLine();  
-    }
+    $DbResult = $System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$Export->Id);
+    $Task = $DbResult->fetch_assoc();
+
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
                                  'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
                                                  '</script>';
-    $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Line).'</strong>';
-    if ($Line == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+    $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Task['Progress']).'</strong>';
+    if ($Task['Progress'] == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
   }
   return($Output);