Changeset 776 for trunk

Timestamp:

Feb 2, 2014, 8:28:37 PM (11 years ago)

Author:

maron

Message:

• Added: Export last 2 version in addon
• Fixed: Export text only once in addon
• Added: 100% done in progress

Location:

trunk

Files:

• Modules/Export/CreateAddon.php (modified) (2 diffs)
• Modules/Export/ProcessTask.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/CreateAddon.php

@@ -133 +133 @@
 
         $Buffer = 'CZWOW_'.$Column['AddonFileName'].'_count='.$FileIndex.';CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';
-    
-        $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));
+        $TableTexts = array();
+    
+        //old version
+        //get version before
+        $BuildNumber = $ExportVersion;
+        if ($ExportVersion == '') $BuildNumber = $this->ClientVersion['BuildNumber'];
+        $ID = $this->Database->query('SELECT `BuildNumber` FROM `ClientVersion` WHERE '.
+        ' `Imported` = 1 AND `BuildNumber` < '.$BuildNumber.' ORDER BY  `BuildNumber` DESC LIMIT 1');  
+        if($ID->num_rows > 0) {        
+          $ExportVersionOld = $ID->fetch_assoc();
+          $ExportVersionOld = $ExportVersionOld['BuildNumber'];
         
+          echo 'old:'.$ExportVersionOld.' last:'.$ExportVersion;
+
+          $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersionOld));        
+          while($Line = $DbResult2->fetch_assoc()) 
+          {
+            $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));  
+            $cz = $this->ReplaceCzText($Line[$Column['Column']]);
+            if(($en <> '') and ($cz <> '') and ($this->NotCancel($en))) 
+            {
+               $TableTexts[$en] = $cz; 
+            }
+          }
+        }
+                //last version
+       
+        $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));        
         while($Line = $DbResult2->fetch_assoc()) 
         {
@@ -142 +167 @@
           if(($en <> '') and ($cz <> '') and ($this->NotCancel($en))) 
           {
-            $Buffer .= "\n".'["'.$en.'"]="'.$cz.'",';
-            $i++;
+             $TableTexts[$en] = $cz; 
           }
         }
+        
+        foreach($TableTexts as $key => $value) {
+            $Buffer .= "\n".'["'.$key.'"]="'.$value.'",';
+            $i++;
+        }
+        
     
         $Buffer = $Buffer."\n};if not CZWOW_".$Column['AddonFileName']." then CZWOW_".$Column['AddonFileName']."=0; end; CZWOW_".$Column['AddonFileName']."=CZWOW_".$Column['AddonFileName']."+".$i.";\n";

trunk/Modules/Export/ProcessTask.php

@@ -41 +41 @@
   if (file_exists($dst)) DeleteOldFiles($dst);
   if (is_dir($src)) {
-    if (!file_exists($dst)) mkdir($dst);
+    if (!file_exists($dst)) mkdir($dst, 0777, true); 
     $files = scandir($src);
     foreach ($files as $file)
@@ -133 +133 @@
         echo 'Caught exception: ',  $e->getMessage(), "\n";
       }
+      SetProgress($Export,100);
     } else
     {

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 775; // Subversion revision
+$Revision = 776; // Subversion revision
 $DatabaseRevision = 748; // Database structure revision
 $ReleaseTime = '2014-02-02';