Changeset 720

Timestamp:

Jan 5, 2014, 11:39:40 PM (11 years ago)

Author:

maron

Message:

• Fixed: insert values separate by \n in sql import

Location:

trunk

Files:

• Modules/Import/Import.php (modified) (4 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Import/Import.php

@@ -113 +113 @@
         }    
 
+        if ($insert) {
+          $insert = false;
+          foreach($this->Group['Items'] as $GroupItem)
+          { 
+            if ($Value[$GroupItem['Column']] <> '') $insert = true;
+          }
+        }
         
         if (isset($DbRowMiddle['Entry'])) $insert = false;
@@ -130 +137 @@
           $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'].' 
-      ';
+          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;
+          if (false !== strpos($Values,'[DEPRECATED'))   
+          echo $Values;
      
           echo('# ');
@@ -159 +166 @@
       $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
       $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
+      $insert = false;
       foreach($this->Group['Items'] as $GroupItem)
       { 
         $Columns .= ', `'.$GroupItem['Column'].'`';
         $Values .= ', "'.$Value[$GroupItem['Column']].'"';
-      }
-      $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
-      $InsertId = $this->System->Database->insert_id;
-      echo('+ ');
-      $this->NewItemCount++;
-      $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'].' přidán.', LOG_TYPE_IMPORT);
+        if ($Value[$GroupItem['Column']] <> '') $insert = true;
+      }
+      if ($insert) {
+        $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+        $InsertId = $this->System->Database->insert_id;
+        echo('+ ');
+        $this->NewItemCount++;
+        $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'].' přidán.', LOG_TYPE_IMPORT);
+      }
     }
   }
@@ -436 +447 @@
       if((strpos($Line, 'INSERT INTO `'.$this->Group['MangosTable'].'`') !== false) and (isset($structure)))
       { 
+        while ((strpos($Line, ');') === false) or ($File->EOF()))
+          $Line = $Line.$File->ReadLine();
+        $Line = str_replace("),\n(", '),(', $Line);
+        
         $Line = substr($Line, strpos($Line, '(') + 1);
         $Line = substr($Line, 0, strpos($Line, ');'));
         $LineParts = explode('),(', $Line);
+        
         unset($Line);
-      
+        
         foreach($LineParts as $LinePart)
         {
+          
           unset($Value, $value_buff);
           foreach($structure as $i => $column)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 719; // Subversion revision
+$Revision = 720; // Subversion revision
 $DatabaseRevision = 716; // Database structure revision 
 $ReleaseTime = '2014-01-05';