Changeset 630 for trunk/Modules/Import/Import.php

Timestamp:

Dec 8, 2013, 6:43:40 PM (11 years ago)

Author:

maron

Message:

• Fixed: Load data from arrays only if array exists
• Fixed: Import/cmd.php
• Fixed: patch in Import/Import.php
• Fixed: Can compare text with not complete

File:

• trunk/Modules/Import/Import.php (modified) (9 diffs)

trunk/Modules/Import/Import.php

@@ -15 +15 @@
                 $this->License = 'GNU/GPL';
                 $this->Description = 'Support for import of data.';
-                $this->Dependencies = array();
+                $this->Dependencies = array(); 
         }
 
@@ -61 +61 @@
       // Update existed text
       $DbRow2 = $DbResult2->fetch_assoc();
-      if($this->HaveSameText($this->Group, $DbRow2, $Value)) 
+      if($this->HaveSameText($this->Group, $DbRow2, $Value) ) 
       {
         if($DbRow2['VersionEnd'] <> $this->Version['BuildNumber']) 
@@ -69 +69 @@
         } else echo('. '); 
       } else 
-      {       
-        $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
-        $Values = $DbRow2['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
-        foreach($this->Group['Items'] as $GroupItem) 
-        { 
-          $Columns .= ', `'.$GroupItem['Column'].'`';
-          $Values .= ', "'.$Value[$GroupItem['Column']].'"';
-        }
-        $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
-        echo('# ');
-        $InsertId = $this->System->Database->insert_id;
-        $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.$InsertId.'">'.$InsertId.'</a> ('.$DbRow2['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
+      { 
+        if($DbRow2['VersionEnd'] <> $this->Version['BuildNumber']) {      
+          $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
+          $Values = $DbRow2['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
+          foreach($this->Group['Items'] as $GroupItem) 
+          { 
+            $Columns .= ', `'.$GroupItem['Column'].'`';
+            $Values .= ', "'.$Value[$GroupItem['Column']].'"';
+          }
+          $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+          echo('# ');
+          $InsertId = $this->System->Database->insert_id;
+          $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.$InsertId.'">'.$InsertId.'</a> ('.$DbRow2['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
+        } else echo('Allready imported '.$DbRow2['Entry'].' ');
       }       
     } else 
@@ -115 +117 @@
   {
     global $TranslationTree, $PatchVersion;
-       
     $Output = 'Načítání textů z LUA souboru...';
+                               
     if(($this->Group['LuaFileName'] != '') and ($this->Group['TablePrefix'] != ''))
     {
+
         $Output .= '<br />'.$this->Group['Name'].'<br />'; 
         if($this->Group['LastVersion'] < $this->Version['BuildNumber'] + 1)
         {
           $File = new FileStream();
-          $File->OpenFile('../source/'.$this->Version['Version'].'/lua/'.$this->Group['LuaFileName'].'.lua');
+                                             
+          $File->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/lua/'.$this->Group['LuaFileName'].'.lua');
           $this->NewItemCount = 0;
           $Count = 0;
@@ -161 +165 @@
       } else $Output .= ShowMessage('Není definováno jméno zdrojového souboru', MESSAGE_CRITICAL);
     $Output .= ShowMessage('Dokončeno.');
+    return ($Output);
   }
   
@@ -170 +175 @@
     foreach($TranslationTree as $Group)  
     {
-      $Output .= '<br />'.$Group['Name'].' ';     
+      $Output .= '<br />'.$Group['Name'].' ';  
+      $do = true;   
+      while($do) 
+      { 
       $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, '.
         '`gs_tran`.`VersionEnd` AS `VersionEnd_tran`, '.
@@ -177 +185 @@
         '` AS `gs_orig` ON `gs_orig`.`ID` = `gs_tran`.`Take` WHERE '.
         '`gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd`');
-      while($DbRow = $DbResult->fetch_assoc()) 
-      { 
-        $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].' WHERE `ID` = '.$DbRow['ID']);
-        $Output .= '. '; 
-      }  
+        $do = ($DbResult->num_rows > 0);
+        while($DbRow = $DbResult->fetch_assoc()) 
+        { 
+          $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].' WHERE `ID` = '.$DbRow['ID']);
+          $Output .= '. '; 
+        } 
+      } 
       $Output .= '<strong>Dokončeno.</strong>';
     }
@@ -255 +265 @@
       
       $DBCFile = new DBCFile();
-      $DBCFile->OpenFile('../source/'.$this->Version['Version'].'/dbc/'.$this->Group['DBCFileName'].'.dbc', $ColumnFormat);
+      $DBCFile->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/dbc/'.$this->Group['DBCFileName'].'.dbc', $ColumnFormat);
       $ItemCount = $DBCFile->GetRecordCount();
       $this->NewItemCount = 0;
@@ -305 +315 @@
     $Output= '';
     $File = new FileStream();
-    $File->OpenFile('../source/'.$this->Version['Version'].'/sql/'.$this->Group['MangosTable'].'.sql');
+    $File->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/sql/'.$this->Group['MangosTable'].'.sql');
     $this->NewItemCount = 0;
     $Count = 0;