Changeset 398 for branches/Modular/Common/Module.php

Timestamp:

Mar 13, 2012, 4:08:31 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Seznam závislostí modulů načítán do samostatné tabulky.
• Upraveno: V základu načíst jen základní moduly a umožnit doinstalaci dalších.

File:

• branches/Modular/Common/Module.php (modified) (7 diffs)

branches/Modular/Common/Module.php

@@ -5 +5 @@
 class Module
 {
+  var $Id;
   var $Name;
   var $Version;
@@ -127 +128 @@
   `Installed` int(11) NOT NULL,
   `Description` text COLLATE utf8_czech_ci NOT NULL,
-  `Dependencies` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModuleDependency` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Module` int(11) NOT NULL,
+  `DependencyModule` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY (`Module`),
+  KEY (`DependencyModule`),
+  UNIQUE (`Module` , `DependencyModule`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    $this->Database->query('ALTER TABLE `SystemModuleDependency` ADD FOREIGN KEY ( `Module` ) REFERENCES `SystemModule` (`Id`)');
+    $this->Database->query('ALTER TABLE `SystemModuleDependency` ADD FOREIGN KEY ( `DependencyModule` ) REFERENCES `SystemModule` (`Id`)');
+    
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModel` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
@@ -137 +150 @@
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    $this->Database->query('ALTER TABLE `SystemModel` ADD FOREIGN KEY ( `Module` ) REFERENCES `SystemModule` (`Id`)');
+    
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemModelProperty` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
@@ -145 +160 @@
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
+    $this->Database->query('ALTER TABLE `SystemModelProperty` ADD FOREIGN KEY ( `Model` ) REFERENCES `SystemModel` (`Id`)');
+    
     $this->ReloadList();
     $this->LoadModules(false);
-    foreach($this->Modules as $Index => $Module)
-    {      
-      $this->Modules[$Index]->Install();
-    }
+    $this->Modules['System']->Install();
+    //foreach($this->Modules as $Index => $Module)
+    //{      
+    //  $this->Modules[$Index]->Install();
+    //}
   }
   
@@ -162 +180 @@
     $this->Database->query('DROP TABLE IF EXISTS `SystemModelProperty`');
     $this->Database->query('DROP TABLE IF EXISTS `SystemModel`');
+    $this->Database->query('DROP TABLE IF EXISTS `SystemModuleDependency`');
     $this->Database->query('DROP TABLE IF EXISTS `SystemModule`');
   }
@@ -195 +214 @@
           'Version' => $Module->Version, 'Creator' => $Module->Creator, 
           'Description' => $Module->Description, 'License' => $Module->License,
-          'Installed' => 0, 'Dependencies' => implode(',', $Module->Dependencies)));
+          'Installed' => 0));
         unset($Module);
       } else throw new Exception('Missing class '.$ModuleClassName.' in module '.$ModuleName);
@@ -207 +226 @@
       $this->Database->query('DELETE FROM `SystemModule` WHERE `Id` = '.$Module['Id']);
     }
+    
+    // Reload dependencies
+    $this->LoadModules(false);
+    foreach($this->Modules as $Module)
+    {
+      foreach($Module->Dependencies as $Dependency)
+      {
+        $this->Database->insert('SystemModuleDependency', array('Module' => $Module->Id, 
+          'DependencyModule' => $this->Modules[$Dependency]->Id));
+      }
+    }
   }
 }