Changeset 662

Timestamp:

Dec 21, 2013, 2:42:22 PM (11 years ago)

Author:

maron

Message:

• Fixed: export in lua only if is all variable
• Fixed: addon name quest in quest log

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (3 diffs)
• Modules/Export/files/3.3.5a/CzWoW/CzWoW.lua (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -280 +280 @@
   }    
   
-  function HaveVarible($String1, $String2) 
+  function HaveVarible($String1, $String2, $StartChar = '$') 
   {
           //Export only if translate have same varible %
-            if (strpos($String1,'$')) {
-              while (strpos($String1,'$')) {
-                $String1 = substr($String1,strpos($String1,'$'));
+            if (strpos($String1,$StartChar)) {
+              while (strpos($String1,$StartChar)) {
+                $String1 = substr($String1,strpos($String1,$StartChar));
                 $varible = $String1;
                 if (strpos($varible,' ')) $varible = substr($varible,0,strpos($varible,' '));
                 if (strpos($varible,'.')) $varible = substr($varible,0,strpos($varible,'.'));
+                if (strpos($varible,',')) $varible = substr($varible,0,strpos($varible,','));
                 if (strpos($varible,'%')) $varible = substr($varible,0,strpos($varible,'%'));
                 if (strpos($varible,chr(10))) $varible = substr($varible,0,strpos($varible,chr(10)));
                 if (false == strpos($String2,$varible)) {
-                echo $varible; 
+              //  echo $varible; 
 
                  return(false);
@@ -337 +338 @@
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']])) {
               $CanExport = false;
-              echo '
-              NE='.$DbRow['ID'].
-              //$DbRow['En'.$Column['Column']].'-'.$DbRow[$Column['Column']].''.
-              ',';
+              $Output .= ', NE='.$DbRow['ID'];
             }  
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']])) {
               $CanExport = false;
-               echo '
-               NE='.$DbRow['ID'].
-               //$DbRow['En'.$Column['Column']].'-'.$DbRow[$Column['Column']].''.
-               ',';
+              $Output .= ', NE='.$DbRow['ID'];
             }  
           }
@@ -435 +430 @@
       $LookupTable = array();
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-      while($DbRow = $DbResult2->fetch_assoc())
-        $LookupTable[$DbRow['ShortCut']] = $DbRow;
+      while($DbRow = $DbResult2->fetch_assoc()) {
+          $CanExport = true;
+          foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
+            $DbRow[$Column['Column']] = str_replace ( '$ ','$',$DbRow[$Column['Column']]);
+            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']])) {
+              $CanExport = false;
+              $Output .= ', NE='.$DbRow['ID'];
+            }  
+            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']])) {
+              $CanExport = false;
+              $Output .= ', NE='.$DbRow['ID'];
+            }  
+            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'%')) {
+              $CanExport = false;
+              $Output .=  ', NE='.$DbRow['ID'];
+            }  
+            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'%')) {
+              $CanExport = false;
+              $Output .=  ', NE='.$DbRow['ID'];
+            }  
+          }
+
+          if ($CanExport)
+            $LookupTable[$DbRow['ShortCut']] = $DbRow;
+      }
         
       while(!$File->EOF())

trunk/Modules/Export/files/3.3.5a/CzWoW/CzWoW.lua

@@ -106 +106 @@
 --  self:RegisterEvent("SHOW_COMPARE_TOOLTIP");
   self:RegisterEvent("OnTooltipSetItem");
+  self:RegisterEvent("QUEST_LOG_UPDATE");
   
         if(GameTooltip:GetScript("OnTooltipSetItem")) then
@@ -184 +185 @@
         if QuestFrameRewardPanel:IsVisible() then QuestFrameRewardPanel_OnShow(); end
         if ItemTextFrame:IsVisible() then ItemTextFrame_OnEvent(); end
+        if ( QuestInfoFrame.questLog ) then QuestLog_Update(); end
 end
 

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 661; // Subversion revision
+$Revision = 662; // Subversion revision
 $DatabaseRevision = 646; // Database structure revision 
 $ReleaseTime = '2013-12-20';