Changeset 55 for trunk/Modules

Timestamp:

Jul 23, 2011, 11:23:39 PM (13 years ago)

Author:

george

Message:

• Upraveno: Stránky rozděleny do samostatných jednotek.
• Upraveno: Konfigurace staticky přikompilovaná nahrazena načítanou z registrů (na linuxu xml soubor) .

Location:

trunk/Modules

Files:

• UMainModule.pas (modified) (6 diffs)
• UPagesModule.lfm (deleted)
• UPagesModule.lrs (deleted)
• UPagesModule.pas (deleted)

trunk/Modules/UMainModule.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, LResources, UHTTPServerCGI, UHTTPSessionMySQL,
-  UHTTPServer, USqlDatabase, UConfig, DateUtils, UWebPage, UWebApp,
+  UHTTPServer, USqlDatabase, URegistry, DateUtils, UWebPage, UWebApp,
   UXmlClasses, UHtmlClasses, UCore, UHTTPServerTCP,
-  UHTTPSessionFile, UUser, SpecializedList;
+  UHTTPSessionFile, UUser, SpecializedList, Registry;
+
+const
+  RegistryKey = '\Software\Chronosoft\ZdechovNET';
 
 type
@@ -39 +42 @@
     User: TWebUser;
     UserOnline: TWebOnlineUser;
+    FormatHTML: Boolean;
+    procedure LoadFromRegistry;
+    procedure SaveToRegistry;
     procedure GeneratePage(HandlerData: THTTPHandlerData; Page: TWebPage);
     procedure Run;
@@ -62 +68 @@
   UserOnline.Update;
   with HandlerData do begin
-    Style := Config.Style;
-    BaseURL := Config.BaseURL;
-
     HtmlDocument.ContentLanguage := 'cs';
     GlobalTitle := 'ZděchovNET';
@@ -81 +84 @@
       with HtmlDocument.AsXmlDocument do
       try
-        Formated := Config.FormatHTML;
+        Formated := FormatHTML;
         Response.Stream.WriteString(AsString);
       finally
@@ -94 +97 @@
 begin
   with Database do begin
-    Hostname := Config.DatabaseHostName;
-    Database := Config.DatabaseDatabase;
-    UserName := Config.DatabaseUserName;
-    Password := Config.DatabasePassword;
     Connect;
   end;
@@ -229 +228 @@
 end;
 
+procedure TMainModule.LoadFromRegistry;
+begin
+  with TRegistryEx.Create do
+  try
+    RootKey := HKEY_CURRENT_USER;
+    OpenKey(RegistryKey, True);
+    Style := ReadStringWithDefault('Style', 'Basic');
+    BaseURL := ReadStringWithDefault('BaseURL', 'http://localhost');
+    Database.Hostname := ReadStringWithDefault('DatabaseHostName', 'localhost');
+    Database.Database := ReadStringWithDefault('DatabaseDatabase', 'web');
+    Database.UserName := ReadStringWithDefault('DatabaseUserName', 'user');
+    Database.Password := ReadStringWithDefault('DatabasePassword', 'password');
+    FormatHTML := ReadBoolWithDefault('FormatHTML', False);
+    Application.HTTPServer.ShowExceptions := ReadBoolWithDefault('ShowException', False);
+
+  finally
+    Free;
+  end;
+end;
+
+procedure TMainModule.SaveToRegistry;
+begin
+
+end;
+
 procedure TMainModule.Run;
 begin
+  LoadFromRegistry;
+  //Application.HTTPServer.ShowExceptions := True;
   InitDatabase;
-  Application.HTTPServer.ShowExceptions := Config.ShowException;
   //Database.Query('SELECT * FROM ssss');
 end;