Changeset 46 for trunk/www/server.php

Timestamp:

Jun 19, 2009, 9:41:07 AM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazit chybu při pokusu o zobrazení neexistujícího serveru.
• Opraveno: Při inicializace databáze použij verzi s celou databází a následně proveď aktualizaci na požadovanou verzi.

File:

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

trunk/www/server.php

@@ -69 +69 @@
       ));
     }
+    // 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.'_mangos < database/'.$this->Server['Database']['Id'].'/'.$this->Server['Database']['SourceFileName'],
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$this->Server['Database']['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_create_structure.sql',
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$this->Server['Database']['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_script_full.sql',
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < emulator/'.$this->Server['Database']['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/mangos_scriptname_full.sql',
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$this->Server['Database']['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
-      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_characters < emulator/'.$this->Server['Database']['Emulator']['Id'].'/share/mangos/sql/characters.sql',
-      'php www/shell.php ServerDatabaseChange '.$this->Id.' '.$this->Server['Database']['Id'],
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < database/'.$Database['Id'].'/'.$Database['SourceFileName'],
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_create_structure.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_script_full.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < emulator/'.$Database['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/mangos_scriptname_full.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
+      'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_characters < emulator/'.$Database['Emulator']['Id'].'/share/mangos/sql/characters.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.');
   } 
@@ -297 +308 @@
   }
   
-  function Update($DatabaseId)
+  function Update($DatabaseId, $DoBackup = true, $DoStop = true)
   {
     $this->Lock();
+    $Output = '';
     
     // Stop server before update
-    $Output = $this->Stop();
+    if($DoStop)
+    {
+      $Output .= $this->Stop();
+    }
     
     // Backup current 
-    $Backup = new Backup($this->Database, 0);
-    $Output .= '<br />'.$Backup->Create($this->Id);
+    if($DoBackup)
+    {
+      $Backup = new Backup($this->Database, 0);
+      $Output .= '<br />'.$Backup->Create($this->Id);
+    }
     
     // Do update
@@ -326 +344 @@
       {
         $Parts = explode('|', $Update); 
-        $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Database'].'/update/'.$Parts[1];
+        $Command = 'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_'.$Parts[0].' < database/'.$DbRow['Id'].'/'.$Parts[1];
         $Commands[] = $Command;
       }