Changeset 830 for trunk

Timestamp:

Aug 24, 2015, 6:55:04 PM (9 years ago)

Author:

chronos

Message:

• Modified: Single SQL query per translation table for user translation xp calculation.

Location:

trunk

Files:

• Modules/Translation/UserLevel.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/UserLevel.php

@@ -21 +21 @@
 function GetXPFromTranslation($UserId)
 {
-  global $System, $TranslationTree, $xp_from_word, $from_diakrit;
+  global $System, $TranslationTree, $xp_from_word, $from_diakrit, $Config;
 
   $xp = 0;
@@ -29 +29 @@
     {
       $GroupBy = 'GROUP BY ';
+      $TakeColumns = '';
       foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
       {
-        $GroupBy .= '`'.$TextItem['Column'].'`, ';
+        $GroupBy .= '`T`.`'.$TextItem['Column'].'`, ';
+        $TakeColumns .= ', `T2`.`'.$TextItem['Column'].'` AS `'.$TextItem['Column'].'_Take`';
       }
       $GroupBy = substr($GroupBy, 0, -2);
 
-      $IDtran = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE '.
-        '(`User` = '.$UserId.') AND (`Complete` = 1) AND (`Take` IS NOT NULL) '.$GroupBy);
+      $IDtran = $System->Database->query('SELECT *, `T2`.`Language` AS `Language_Take`'.$TakeColumns.' FROM `'.$Group['TablePrefix'].'` AS `T` '.
+        'LEFT JOIN `'.$Group['TablePrefix'].'` AS `T2` ON `T2`.`ID` = `T`.`Take` '.
+        'WHERE (`T`.`User` = '.$UserId.') AND (`T`.`Complete` = 1) AND (`T`.`Take` IS NOT NULL) '.$GroupBy);
       while($Line = $IDtran->fetch_array())
       {
-        $DbResult = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE `ID` = '.$Line['Take']);
-        $LineComparison = $DbResult->fetch_assoc();
         $xp_translation = 0;
         $translated = true;
         foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
         {
-          if(($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and
-            (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']]) * 0.5)))
+          if(($Line[$TextItem['Column']] <> $Line[$TextItem['Column'].'_Take']) and
+            (strlen($Line[$TextItem['Column']]) > (strlen($Line[$TextItem['Column'].'_Take']) * 0.5)))
           {
             $TextArr = explode(' ', $Line[$TextItem['Column']]);
@@ -57 +58 @@
           } else
           {
-            if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and
-              ('0' == $LineComparison['Language']) and ($LineComparison[$TextItem['Column']] <> '') and
+            if (($Line[$TextItem['Column']] == $Line[$TextItem['Column'].'_Take']) and
+              ($Config['OriginalLanguage'] == $Line['Language_Take']) and ($Line[$TextItem['Column'].'_Take'] <> '') and
               ($TextItem['Column'] <> 'ShortCut')) $translated = false;
           }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 829; // Subversion revision
+$Revision = 830; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2015-03-25';
+$ReleaseTime = '2015-08-24';