Changeset 695 for trunk/Modules/Export/Export.php

Timestamp:

Jan 3, 2014, 11:09:37 AM (11 years ago)

Author:

maron

Message:

• Added: selection groupitems in export

File:

• trunk/Modules/Export/Export.php (modified) (3 diffs)

trunk/Modules/Export/Export.php

@@ -72 +72 @@
   }
   
-  function BuildQuery($Group, $Columns = '', $Version = '')
+  function BuildQuery($Group, $Version = '')
   {
     global $TranslationTree;
@@ -80 +80 @@
     else
       $ExportVersion = $this->ClientVersion['BuildNumber'];
-    
-    $Query = 'SELECT * FROM (SELECT `T`.*, '.$Columns.'`User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
+
+          $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$this->Id);
+                while($GroupItem = $DbResultItem->fetch_assoc())
+                {
+                  $GroupItems[$GroupItem['GroupItem']] = 1;
+    }
+    // Build selected columns
+    $Columns = '';
+    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+      if (!isset($GroupItems[$Column['Id']])) $Columns .= ' `T`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
+    }
+  //  $Columns = substr($Columns, 0, -2);
+
+    
+    $Query = 'SELECT * FROM (SELECT '.$Columns.' T.`ID`,T.`Language`,T.`User`,T.`Entry`,T.`VersionEnd`,T.`VersionStart`, `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`'.
@@ -90 +103 @@
     // Build columns for english texts
     $OriginalColumns = '';
-    foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
+    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
       $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `En'.$Column['Column'].'`, ';
+      if (isset($GroupItems[$Column['Id']])) 
+        $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
+    }
     $OriginalColumns = substr($OriginalColumns, 0, -2);