Changeset 680

Timestamp:

Dec 30, 2013, 12:27:16 PM (11 years ago)

Author:

maron

Message:

• Added: import lower versions

Location:

trunk

Files:

• Modules/Import/Import.php (modified) (5 diffs)
• Modules/Import/cmd.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Import/Import.php

@@ -46 +46 @@
   function InsertItem($Value)
   {   
+  
     $Columns = '';
+    //$Values = '';
     foreach($this->Group['Items'] as $GroupItem)
     {
       $Columns .= ', `'.$GroupItem['Column'].'` ';
-    }
+     // $Values .= ', "'.$Value[$GroupItem['Column']].'"';
+    }
+   // echo $Values;
     $Columns = substr($Columns, 1);
-    $Where = ' (`'.$this->Group['PrimaryKeyItem'].'` = "'.$Value[$this->Group['PrimaryKeyItem']].'")';
+    $Where = ' (`'.$this->Group['PrimaryKeyItem'].'` = "'.$Value[$this->Group['PrimaryKeyItem']].'")  AND (`Language`=0) ' ;
     //print_r($Value);
     
-    $DbResult2 = $this->System->Database->query('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
+    $DbResultBefore = $this->System->Database->query('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionEnd` >'. $this->Version['BuildNumber'].' ORDER BY `VersionEnd` DESC LIMIT 1');
+    $DbResultAfter  = $this->System->Database->query('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionStart` <'. $this->Version['BuildNumber'].' ORDER BY `VersionStart` LIMIT 1');
     //echo('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
-    if(isset($DbResult2) and ($DbResult2->num_rows > 0))
+    if(($DbResultBefore->num_rows > 0) or ($DbResultAfter->num_rows > 0))
     {
       // Update existed text
-      $DbRow2 = $DbResult2->fetch_assoc();
-      if($this->HaveSameText($this->Group, $DbRow2, $Value) ) 
-      {
-        if($DbRow2['VersionEnd'] <> $this->Version['BuildNumber']) 
-        {
-          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRow2['ID']);
+      $DbRowAfter = $DbResultAfter->fetch_assoc();
+      $DbRowBefore = $DbResultBefore->fetch_assoc();
+      if ($DbRowAfter['ID'] == $DbRowBefore['ID']) echo('` ');
+      else
+      if($this->HaveSameText($this->Group, $DbRowBefore, $Value) and ($DbResultBefore->num_rows > 0) ) 
+      {
+        if($DbRowBefore['VersionEnd'] <> $this->Version['BuildNumber']) 
+        {
+          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRowBefore['ID']);
+          echo(', '); 
+        } else echo('. '); 
+      } else 
+      if($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0)) 
+      {
+        if($DbRowAfter['VersionEnd'] <> $this->Version['BuildNumber']) 
+        {
+          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionStart` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRowAfter['ID']);
           echo(', '); 
         } else echo('. '); 
       } else 
       { 
-        if($DbRow2['VersionEnd'] <> $this->Version['BuildNumber']) {      
+        $inserted = false;
+        if (isset($DbRowAfter['VersionStart'])) 
+          if ($DbRowAfter['VersionStart'] == $this->Version['BuildNumber']) {
+            echo('Allready imported '.$DbRowBefore['Entry'].' ');
+            $inserted = true;
+          }
+ 
+        if (isset($DbRowBefore['VersionEnd'])) 
+          if ($DbRowBefore['VersionEnd'] == $this->Version['BuildNumber']) {
+            echo('Allready imported '.$DbRowBefore['Entry'].' ');
+            $inserted = true;
+          }
+        
+        if (!$inserted) 
+        {      
           $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
-          $Values = $DbRow2['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
+          $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
           foreach($this->Group['Items'] as $GroupItem) 
           { 
@@ -81 +111 @@
           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'].' ');
+          $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.$InsertId.'">'.$InsertId.'</a> ('.$Value['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
+        }
       }       
     } else 
@@ -178 +208 @@
       $do = true;   
       while($do) 
-      { 
+      {
       $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, '.
         '`gs_tran`.`VersionEnd` AS `VersionEnd_tran`, '.
-        '`gs_orig`.`VersionEnd` AS `VersionEnd_orig` FROM `'.
+        '`gs_tran`.`VersionStart` AS `VersionStart_tran`, '.
+        '`gs_orig`.`VersionEnd` AS `VersionEnd_orig`, '.
+        '`gs_orig`.`VersionStart` AS `VersionStart_orig` FROM `'.
         $Group['TablePrefix'].'` AS `gs_tran` JOIN `'.$Group['TablePrefix'].
         '` AS `gs_orig` ON `gs_orig`.`ID` = `gs_tran`.`Take` WHERE '.
-        '`gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd`');
+        '`gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd` OR `gs_tran`.`VersionStart` <> `gs_orig`.`VersionStart`');
         $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']);
+          echo '`';
+          $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].', `VersionStart` = '.$DbRow['VersionStart_orig'].' WHERE `ID` = '.$DbRow['ID']);
           $Output .= '. '; 
         } 
@@ -214 +247 @@
       $old = str_replace("Â", "", $old);
       $old = str_replace("�", "", $old);
+      $old = str_replace(" ", "", $old);
+      $old = strtolower($old);
   
   
@@ -231 +266 @@
       $new = str_replace("Â", "", $new);
       $new = str_replace("�", "", $new);
-
+      $new = str_replace(" ", "", $new);
+      $new = strtolower($new);
+      
       if(($old == 'null') or ($old == 'NULL')) $old = '';
       if(($new == 'null') or ($new == 'NULL')) $new = '';

trunk/Modules/Import/cmd.php

@@ -47 +47 @@
   ';
   $Output .= 'id=<id_import_group> - importuje skupinu <id_import_group><br /><br />';
+  $Output .= 'version=<version> - nastaví verzi importu default: '.$System->Config['Web']['GameVersion'].'<br /><br />';
       $Output .= '    <id_import_group>:';
     foreach($TranslationTree as $Group)  
@@ -59 +60 @@
 {
  // $Output .= '<div style="font-size: xx-small;">';
+   if (array_key_exists('version', $_GET))
+     $Import->SetVersion($_GET['version']);
+   else
       $Import->SetVersion($System->Config['Web']['GameVersion']);
       $Output .= $Import->ImportGroup($_GET['id']); //$Config['Web']['GameVersion']

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 679; // Subversion revision
+$Revision = 680; // Subversion revision
 $DatabaseRevision = 678; // Database structure revision 
-$ReleaseTime = '2013-12-29';
+$ReleaseTime = '2013-12-30';