Changeset 403 for trunk

Timestamp:

Mar 24, 2010, 8:18:48 AM (15 years ago)

Author:

george

Message:

• Opraveno: Export DBC souborů

Location:

trunk/export

Files:

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

trunk/export/export.php

@@ -39 +39 @@
   }
   
-  function BuildQuery($Group, $Columns = '`T`.*')
-  {
-    $Query = 'SELECT * FROM (SELECT '.$Columns.', `User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
+  function BuildQuery($Group, $Columns = '')
+  {
+    $Query = 'SELECT * FROM (SELECT `T`.*, '.$Columns.'`User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
     ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$this->Id.') '.
     ' JOIN `User` ON `User`.`ID`=`T`.`User`'.
@@ -240 +240 @@
           $I = $I + 1;
         }
-        $Columns = substr($Columns, 0, -2);
 
         $Query = $this->BuildQuery($Group, $Columns);

trunk/export/process_task.php

@@ -21 +21 @@
       {
         $Export = new Export($System);
-        $Export->Id = $DbRow['Export'];
+        $Export->Id = $DbRow['ExportId'];
         $Export->Init();
         echo('Mazání starých souborů...'."\n");
@@ -41 +41 @@
           $Export->ExportToDBC();
           echo('Komprese...'."\n");
-          exec('zip -r -j '.$Export->TempDir.'/CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
+          exec('zip -r -j '.$Export->TempDir.'CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
           echo('Hotovo'."\n");
         } else echo('Funkce pro tvorbu Zip souboru není podporována!'."\n");