Changeset 91 for trunk/UCore.pas

Timestamp:

Sep 7, 2012, 8:36:13 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Modulární systém přepracován tak, aby podporoval metody Install, Uninstall a Upgrade použitelné pro persistentní data. Původní metody Install a Uninstall přejmenovýny na Start a Stop.

File:

• trunk/UCore.pas (modified) (6 diffs)

trunk/UCore.pas

@@ -51 +51 @@
     procedure RegisterModules;
   public
+    CommonDatabase: TSqlDatabase;
     ModuleManager: TModuleManager;
     Load: string;
@@ -110 +111 @@
   SessionStorage.Free;
   Database.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -173 +174 @@
   ModuleManager := TModuleManager.Create(nil);
   Pages := TPageList.Create;
-
-  RegisterModules;
-  ModuleManager.InstallMarked;
+  CommonDatabase := TSqlDatabase.Create(nil);
 
   LoadFromRegistry;
@@ -188 +187 @@
     RegisterPage(TServerInfoPage, ServerInfoPage, 'serverinfo');
     RegisterPage(TWebCamPage, WebCamPage, 'kamery');
-    //RegisterPage(TUserControlPage, UserControlPage, 'uzivatel');
     RegisterPage(TPlansPage, PlansPage, 'plany');
     RegisterPage(TNetworkPage, NetworkPage, 'sit');
     RegisterPage(TProjectsPage, ProjectsPage, 'projekty');
     RegisterPage(TAboutPage, AboutPage, '');
-    //RegisterPage(TUserControlPage, UserControlPage, '');
   end;
   with WebApp1 do begin
@@ -207 +204 @@
 begin
   //SaveToRegistry;
-  Pages.Free;
-  inherited Destroy;
+  FreeAndNil(CommonDatabase);
+  FreeAndNil(ModuleManager);
+  FreeAndNil(Pages);
+  inherited;
 end;
 
@@ -419 +418 @@
 procedure TCore.Run;
 begin
+  CommonDatabase.UserName := DatabaseUserName;
+  CommonDatabase.HostName := DatabaseHostname;
+  CommonDatabase.Database := DatabaseSchema;
+  CommonDatabase.Password := DatabasePassword;
+  CommonDatabase.Connect;
+
+  RegisterModules;
+  ModuleManager.StartInstalled;
+
   WebApp1.HTTPServer.DocumentRoot := ExtractFileDir(ParamStrUTF8(0));
   WebApp1.Run;