Changeset 62 for trunk/www/model/server.php

Timestamp:

Aug 5, 2009, 7:30:23 AM (15 years ago)

Author:

george

Message:

• Opraveno: Při aktualizaci realmu neanačítat soubory databáze serveru a naopak.
• Opraveno: Zobrazování podstránek ladících výstupů realmů.

File:

• trunk/www/model/server.php (modified) (3 diffs)

trunk/www/model/server.php

@@ -40 +40 @@
     $this->Database->query('DROP USER "server'.$this->Id.'"@"localhost"');
   }
-  
-  function ImportDatabase($Delete = false)
-  {
-    $this->Lock();
-    $CommandList = array(
-      'php www/shell.php ServerLock '.$this->Id,
-    );
-    if($Delete == true) 
-    {
-      $CommandList = array_merge($CommandList, array(
-      'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd',
-      ));
-    }
-    // Lookup nearest database with full import
-    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Server['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
-    $Database = $DbResult->fetch_assoc();
-    
-    $CommandList = array_merge($CommandList, array(
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
-      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$Database['Id'],
-      'php www/shell.php ServerUnLock '.$this->Id,
-    ));    
-    $this->Task->Add('Inicializace databáze', $CommandList);
-    
-    if($Database['Id'] != $this->Server['Database']['Id']) 
-    {
-      $NewDatabaseId = $this->Server['Database']['Id'];
-      $this->Server['Database']['Id'] = $Database['Id'];
-      $this->Update($NewDatabaseId, false, false);
-    }
-    return('Úloha načtení nové databáze zařazena do fronty.');
-  } 
   
   function Start()
@@ -228 +196 @@
   }
   
+  function ImportDatabase($Delete = false)
+  {
+    $this->Lock();
+    $CommandList = array(
+      'php www/shell.php ServerLock '.$this->Id,
+    );
+    if($Delete == true) 
+    {
+      $CommandList = array_merge($CommandList, array(
+      'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd',
+      ));
+    }
+    // Lookup nearest database with full import
+    $DbResult = $this->Database->query('SELECT * FROM `Database` WHERE (`Emulator` <> 0) AND (`Revision` <= '.$this->Server['Database']['Revision'].') AND (`SourceFileName` <> "") ORDER BY `Revision` DESC');
+    $Database = $DbResult->fetch_assoc();
+    
+    $CommandList = array_merge($CommandList, array(
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
+      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$Database['Id'],
+      'php www/shell.php ServerUnLock '.$this->Id,
+    ));    
+    $this->Task->Add('Inicializace databáze', $CommandList);
+    
+    if($Database['Id'] != $this->Server['Database']['Id']) 
+    {
+      $NewDatabaseId = $this->Server['Database']['Id'];
+      $this->Server['Database']['Id'] = $Database['Id'];
+      $this->Update($NewDatabaseId, false, false);
+    }
+    return('Úloha načtení nové databáze zařazena do fronty.');
+  } 
+
   function Update($DatabaseId, $DoBackup = true, $DoStop = true)
   {
@@ -264 +264 @@
       {
         $Parts = explode('|', $Update); 
-        $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
+        if($Parts[0] == 'realmd')
+          $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
         $Commands[] = $Command;
       }