Changeset 731 for trunk/Modules/Export/Export.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/Export.php (modified) (3 diffs)

trunk/Modules/Export/Export.php

@@ -302 +302 @@
 
   function AddProgress($add = 2) {
-    if (file_exists($this->TempDir.'progress')) {  
-      $File = new FileStream();
-      $File->OpenFile($this->TempDir.'progress');
-      $Line = $File->ReadLine();  
-    
-      $File = new FileStream();
-      $File->CreateFile($this->TempDir.'progress');
-      $Line+=$add;
-      $File->WriteLine($Line);
-    }
+
+    $DbResult = $this->System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$this->Id);
+    $Task = $DbResult->fetch_assoc();
+    $per = $Task['Progress']+$add;
+    $this->System->Database->query('UPDATE `ExportTask` SET `Progress`='.$per.' WHERE `Export`='.$this->Id);
   }
 
@@ -411 +406 @@
           if($Progress != $OldProgress)
           {
-            if ($Group['Id'] == 13) $this->AddProgress(0.01);
+            if (($Group['Id'] == 13) and ($Progress <> 100)) $this->AddProgress(0.01);
             $Output .= $Progress."%\r";
             echo($Output);
@@ -436 +431 @@
     while($Group = $DbResult->fetch_assoc())
     {
+      $this->AddProgress(1);
     //  $this->AddProgress();
       $Output .= $Group['Name'].'... ';