Changeset 390 for trunk

Timestamp:

Mar 15, 2010, 7:30:08 PM (15 years ago)

Author:

george

Message:

• Opraveno: Mazání starých generovaných DBC souborů a starého ZIP archívu a generování nového archívu s relativními cestami.

Location:

trunk/export

Files:

• export.php (modified) (1 diff)
• process_task.php (modified) (2 diffs)

trunk/export/export.php

@@ -239 +239 @@
   
     $this->LoadFilters();
-
+        
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
     echo('Počet generovaných skupin: '.$DbResult->num_rows.'<br/>'."\n");

trunk/export/process_task.php

@@ -16 +16 @@
   {
     if($DbRow['ExportId'] != '') 
-    {
+    {     
       try 
       {
@@ -22 +22 @@
         $Export->Id = $DbRow['Export'];
         $Export->Init();
-    
+        
+        // Delete old files
+        $Dir = opendir($Export->TempDir.'dbc/') ;
+        while(($File = readdir($Dir)) !== false) 
+        {
+          if(($File != '..') and ($File != '.')) unlink($Export->TempDir.'dbc/'.$File);
+        }
+        closedir($Dir);
+        if(file_exists($Export->TempDir.'CzWoW_DBC.zip')) unlink($Export->TempDir.'CzWoW_DBC.zip');
+
         if(function_exists('gzcompress')) 
         {
           echo(' <br />'.StrFTime("%d/%m/%Y %H:%M:%S", Time()).': Generování DBC souborů pro export '.$Export->Id.'.. '."\n");
           $Export->ExportToDBC();
-      /*    $SaveFilename = $Export->TempDir.'/CzWoW_DBC.zip';          
-          $Zip = new zipfile();
-          CreateZipFromDir($Zip, $Export->TempDir.'dbc/', 'DBFilesClient/');
-          $Buffer = $Zip->file();
-          file_put_contents($SaveFilename, $Buffer);  */
-          echo ('Archivuji..');
-          exec('zip -r '.$Export->TempDir.'/CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
+          exec('zip -r -j '.$Export->TempDir.'/CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
           echo('Hotovo <br />
 ');