Changeset 682

Timestamp:

Jan 1, 2014, 11:28:39 PM (11 years ago)

Author:

maron

Message:

• fixed: import

Location:

trunk

Files:

• Modules/Export/Page.php (modified) (1 diff)
• Modules/Import/Import.php (modified) (5 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/Page.php

@@ -606 +606 @@
                                 if($DbResult->num_rows > 0)
                                 {
+                                  //TODO: don't count on dbc or exe
                                         $this->System->Database->query('UPDATE `Export` SET `UsedCount` = `UsedCount` + 1 WHERE `Id`='.$Export['Id']);
                                         $Output = ExportOutput($Export['Id'], $Export['OutputType']);

trunk/Modules/Import/Import.php

@@ -72 +72 @@
       if($this->HaveSameText($this->Group, $DbRowBefore, $Value) and ($DbResultBefore->num_rows > 0) ) 
       {
-        $insert = false;
-          //echo ();
-          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRowBefore['ID']);
+          $insert = false;
+          if ($this->Group['Id'] == 1) {
+             $set = ' , EndText = "'.$Value['EndText'].'" , ObjectiveText1 = "'.$Value['ObjectiveText1'].'"'.' , ObjectiveText2 = "'.$Value['ObjectiveText2'].'"'.' , ObjectiveText3 = "'.$Value['ObjectiveText3'].'"'.' , ObjectiveText4 = "'.$Value['ObjectiveText4'].'"';
+          } else $set = ''; 
+          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" '.$set.' WHERE `ID`='.$DbRowBefore['ID']);
           echo('b '); 
-         
+          
       } else 
       if($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0)) 
       {
-        $insert = false;
-          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionStart` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRowAfter['ID']);
+          $insert = false;
+          if ($this->Group['Id'] == 1) {
+             $set = ' , EndText = "'.$Value['EndText'].'" , ObjectiveText1 = "'.$Value['ObjectiveText1'].'"'.' , ObjectiveText2 = "'.$Value['ObjectiveText2'].'"'.' , ObjectiveText3 = "'.$Value['ObjectiveText3'].'"'.' , ObjectiveText4 = "'.$Value['ObjectiveText4'].'"';
+          } else $set = ''; 
+          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionStart` = "'.$this->Version['BuildNumber'].'" '.$set.' WHERE `ID`='.$DbRowAfter['ID']);
           echo('a '); 
          
+          if ( ($Value['EndText'] <> $DbRowAfter['EndText']) 
+           or ($Value['ObjectiveText1'] <> $DbRowAfter['ObjectiveText1']) 
+           or ($Value['ObjectiveText2'] <> $DbRowAfter['ObjectiveText2']) 
+           or ($Value['ObjectiveText3'] <> $DbRowAfter['ObjectiveText3']) 
+           or ($Value['ObjectiveText4'] <> $DbRowAfter['ObjectiveText4']) )
+           echo $Value['Entry'].'='.$set.' ';  
       } else 
       { 
@@ -102 +113 @@
             //if [DEPRECATED] do not import
         foreach($this->Group['Items'] as $GroupItem) { 
-          if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED'))   
+          if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED')) {
+            echo('d '.$DbRowBefore['Entry'].' ');
             $insert = false;
+          }   
         }    
 
@@ -273 +286 @@
       $old = strtolower($old);
       $old = str_replace('$b', '', $old);
-  
+      
+      while ($part = substr($old, strpos($old, '<'), strpos($old, '>')-strpos($old, '<')))
+        if ($part <> '') { 
+          $old = str_replace($part.'>', '', $old);
+        }
   
       if (($GroupItem['MangosColumn'] <> '') and ($Group['MangosDatabase'] == 'mangos'))
@@ -294 +311 @@
       $new = strtolower($new);
       $new = str_replace('$b', '', $new);
+
+      while ($part = substr($new, strpos($new, '<'), strpos($new, '>')-strpos($new, '<')))
+        if ($part <> '') { 
+          $new = str_replace($part.'>', '', $new);
+        }
       
       if(($old == 'null') or ($old == 'NULL')) $old = '';
@@ -301 +323 @@
       {
         //  echo $old.'X'.$new;
-        $result = false;
+        if ( ($GroupItem['Column'] <> 'EndText') 
+        and ($GroupItem['Column'] <> 'ObjectiveText1') 
+        and ($GroupItem['Column'] <> 'ObjectiveText2') 
+        and ($GroupItem['Column'] <> 'ObjectiveText3') 
+        and ($GroupItem['Column'] <> 'ObjectiveText4') ) 
+          $result = false;
       }
     }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 681; // Subversion revision
+$Revision = 682; // Subversion revision
 $DatabaseRevision = 678; // Database structure revision 
 $ReleaseTime = '2014-01-01';