Changeset 681 for trunk/Modules/Import

Timestamp:

Jan 1, 2014, 2:40:05 PM (11 years ago)

Author:

maron

Message:

• Added: Setting for generation in cmd
• Fixed: import old Version

File:

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

trunk/Modules/Import/Import.php

@@ -46 +46 @@
   function InsertItem($Value)
   {   
-  
+    $insert = true;
     $Columns = '';
     //$Values = '';
@@ -59 +59 @@
     //print_r($Value);
     
-    $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');
+    $DbResultMiddle = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionStart` <= '.$this->Version['BuildNumber'].' AND `VersionEnd` >= '.$this->Version['BuildNumber'].' ORDER BY `VersionEnd` DESC LIMIT 1'); 
+    $DbResultBefore = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `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`,`VersionStart`, `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(($DbResultBefore->num_rows > 0) or ($DbResultAfter->num_rows > 0))
+    if(($DbResultMiddle->num_rows > 0) or ($DbResultBefore->num_rows > 0) or ($DbResultAfter->num_rows > 0))
     {
       // Update existed text
+      $DbRowMiddle = $DbResultMiddle->fetch_assoc();
       $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']) 
-        {
+        $insert = false;
+          //echo ();
           $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRowBefore['ID']);
-          echo(', '); 
-        } else echo('. '); 
+          echo('b '); 
+         
       } else 
       if($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0)) 
       {
-        if($DbRowAfter['VersionEnd'] <> $this->Version['BuildNumber']) 
-        {
+        $insert = false;
           $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionStart` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRowAfter['ID']);
-          echo(', '); 
-        } else echo('. '); 
+          echo('a '); 
+         
       } else 
       { 
-        $inserted = false;
-        if (isset($DbRowAfter['VersionStart'])) 
-          if ($DbRowAfter['VersionStart'] == $this->Version['BuildNumber']) {
+        
+        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']) {
+            $insert = false;
+          }
+        }
+        if (isset($DbRowBefore['VersionEnd'])) {
+          if ($DbRowBefore['VersionEnd'] >= $this->Version['BuildNumber']) {
             echo('Allready imported '.$DbRowBefore['Entry'].' ');
-            $inserted = true;
-          }
-        
-        if (!$inserted) 
+            $inserted = false;
+          }
+        }       
+        
+            //if [DEPRECATED] do not import
+        foreach($this->Group['Items'] as $GroupItem) { 
+          if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED'))   
+            $insert = false;
+        }    
+
+        
+        if (isset($DbRowMiddle['Entry'])) $insert = false;
+        if (isset($DbRowAfter['Entry'])) $Value['Entry'] = $DbRowAfter['Entry'];
+        if (isset($DbRowBefore['Entry'])) $Value['Entry'] = $DbRowBefore['Entry'];
+
+        if ($insert) 
         {      
+          
           $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
           $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
@@ -109 +122 @@
           }
           $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+     
+      echo '
+      '.$Value['Entry'].' = '.$DbRowBefore['VersionStart'].'.'.$DbRowBefore['VersionEnd'].'< '.$this->Version['BuildNumber'].' <'.$DbRowAfter['VersionStart'].'.'.$DbRowAfter['VersionEnd'].'... '.$DbRowMiddle['VersionStart'].' '.$DbRowMiddle['VersionEnd'].' 
+      ';
+     
+      if (false !== strpos($Values,'[DEPRECATED'))   
+      echo $Values;
+     
           echo('# ');
           $InsertId = $this->System->Database->insert_id;
@@ -153 +174 @@
 
         $Output .= '<br />'.$this->Group['Name'].'<br />'; 
-        if($this->Group['LastVersion'] < $this->Version['BuildNumber'] + 1)
+      //  if($this->Group['LastVersion'] < $this->Version['BuildNumber'] + 1)
         {
           $File = new FileStream();
@@ -192 +213 @@
           $Output .= '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
           $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
-        } else $Output .= ShowMessage('Již importován pro verzi '.$this->Version['Version'], MESSAGE_CRITICAL);
+        }
+        // else $Output .= ShowMessage('Již importován pro verzi '.$this->Version['Version'], MESSAGE_CRITICAL);
       } else $Output .= ShowMessage('Není definováno jméno zdrojového souboru', MESSAGE_CRITICAL);
     $Output .= ShowMessage('Dokončeno.');
@@ -247 +269 @@
       $old = str_replace("Â", "", $old);
       $old = str_replace("�", "", $old);
-      $old = str_replace(" ", "", $old);
+      $old = str_replace('-', '', $old);
+      $old = str_replace(' ', '', $old);
       $old = strtolower($old);
+      $old = str_replace('$b', '', $old);
   
   
@@ -266 +290 @@
       $new = str_replace("Â", "", $new);
       $new = str_replace("�", "", $new);
-      $new = str_replace(" ", "", $new);
+      $new = str_replace('-', '', $new);
+      $new = str_replace(' ', '', $new);
       $new = strtolower($new);
+      $new = str_replace('$b', '', $new);
       
       if(($old == 'null') or ($old == 'NULL')) $old = '';
       if(($new == 'null') or ($new == 'NULL')) $new = '';
   
-      if(($old <> $new) and ($GroupItem['Column'] <> 'Comment')) 
+      if(($new <> '') and ($old <> $new) and ($GroupItem['Column'] <> 'Comment')) 
       {
         //  echo $old.'X'.$new;
@@ -278 +304 @@
       }
     }
+        
     return($result);
   }