Changeset 455 for trunk/import/import.php

Timestamp:

Apr 13, 2010, 10:03:12 AM (14 years ago)

Author:

george

Message:

• Upraveno: Přístup k databázi převeden na objektový pomocí rozšířené PHP třídy mysqli. Při práci s databází použít globální objekt $System a jeho prvek $Database ($System->Database->query("SELECT ...");.
• Upraveno: Při vkládání nové zprávy do Kecátka neprovádět přesměrování, ale rovnou zobrazit výpis. U některých překladatelů toto způsobovalo opakované vložení zprávy.

File:

• trunk/import/import.php (modified) (12 diffs)

trunk/import/import.php

@@ -6 +6 @@
   var $Group;
   var $NewItemCount;
+  var $System;
+  
+  function __construct($System)
+  {
+    $this->System = &$System;
+  }
   
   function SetVersion($Version)
@@ -16 +22 @@
   
   function InsertItem($Value)
-  {
-    global $Database;
-  
+  {   
     $Columns = '';
     foreach($this->Group['Items'] as $GroupItem)
@@ -28 +32 @@
     //print_r($Value);
   
-    $DbResult2 = $Database->SQLCommand('SELECT `VersionEnd`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
+    $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');
     //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 (mysql_num_rows($DbResult2) > 0))
+    if(isset($DbResult2) and ($DbResult2->num_rows > 0))
     {
       // Update existed text
-      $DbRow2 = mysql_fetch_assoc($DbResult2);
+      $DbRow2 = $DbResult2->fetch_assoc();
       if($this->HaveSameText($this->Group, $DbRow2, $Value)) 
       {
         if($DbRow2['VersionEnd'] <> $this->Version['BuildNumber']) 
         {
-          $Database->SQLCommand('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRow2['ID']);
+          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" WHERE `ID`='.$DbRow2['ID']);
           echo(', '); 
         } else echo('. '); 
@@ -50 +54 @@
           $Values .= ', "'.$Value[$GroupItem['Column']].'"';
         }
-        $Database->SQLCommand('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+        $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
         echo('# ');
-        WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.mysql_insert_id().'">'.mysql_insert_id().'</a> ('.$DbRow2['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
+        $InsertId = $this->System->Database->insert_id;
+        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 
@@ -62 +67 @@
         // Get new unused Entry for tables without numeric id
         $Value['Entry'] = 1;
-        $DbResult = $Database->SQLCommand('SELECT MAX(`Entry`) FROM `'.$this->Group['TablePrefix'].'`');
-        if(mysql_num_rows($DbResult) > 0)
-        {
-          $DbRow = mysql_fetch_row($DbResult);
+        $DbResult = $this->System->Database->query('SELECT MAX(`Entry`) FROM `'.$this->Group['TablePrefix'].'`');
+        if($DbResult->num_rows > 0)
+        {
+          $DbRow = $DbResult->fetch_row();
           $Value['Entry'] += $DbRow[0];
         }           
@@ -76 +81 @@
         $Values .= ', "'.$Value[$GroupItem['Column']].'"';
       }
-      $Database->SQLCommand('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+      $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
+      $InsertId = $this->System->Database->insert_id;
       echo('+ ');
       $this->NewItemCount++;
-      WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.mysql_insert_id().'">'.mysql_insert_id().'</a> ('.$Value['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' přidán.', LOG_TYPE_IMPORT);
+      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);
     }
   }
@@ -85 +91 @@
   function ImportLUA()
   {
-    global $Database, $TranslationTree, $PatchVersion, $Config;
+    global $TranslationTree, $PatchVersion;
        
     echo('Načítání textů z LUA souboru...');
@@ -126 +132 @@
           }
           echo('<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />');
-          $Database->SQLCommand('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+          $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
         } else echo('Již importován pro verzi '.$this->Version['Version']);
       } else echo('Není definováno jméno zdrojového souboru');
@@ -134 +140 @@
   function UpdateTranslated()
   {
-    global $Database, $TranslationTree, $PatchVersion, $Config;
+    global $TranslationTree, $PatchVersion, $Config;
   
     echo('<br /><br />Začínám se synchronizací VersionEnd u přeložených textů<br />');
@@ -140 +146 @@
     {
       echo('<br />'.$Group['Name'].' ');     
-      $DbResult = $Database->SQLCommand('SELECT `gs_tran`.`ID`, `gs_tran`.`VersionEnd` AS `VersionEnd_tran`, `gs_orig`.`VersionEnd` AS `VersionEnd_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`');
-      while($DbRow = mysql_fetch_assoc($DbResult)) 
+      $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, `gs_tran`.`VersionEnd` AS `VersionEnd_tran`, `gs_orig`.`VersionEnd` AS `VersionEnd_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`');
+      while($DbRow = $DbResult->fetch_assoc()) 
       { 
-        $Database->SQLCommand('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].' WHERE `ID` = '.$DbRow['ID']);
+        $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].' WHERE `ID` = '.$DbRow['ID']);
         echo('. '); 
       }  
@@ -253 +259 @@
   function ImportSQL()
   {
-    global $Database, $TranslationTree, $PatchVersion, $Config;
+    global $TranslationTree, $PatchVersion;
   
     $File = new FileStream();
@@ -357 +363 @@
     }
     echo('<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />');
-  $Database->SQLCommand('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
+  $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);
   }
 }