Changeset 63 for trunk/Modules

Timestamp:

Dec 19, 2011, 12:58:50 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Načítání nastavení z registrů nahrazeno INI souborem.

Location:

trunk

Files:

• . (modified) (1 prop)
• Modules/UMainModule.pas (modified) (4 diffs)

trunk

@@ -2 +2 @@
 bin
 lib
+Config.ini

@@ -2 +2 @@
 bin
 lib
+Config.ini

trunk/Modules/UMainModule.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, LResources, UHTTPServerCGI, UHTTPSessionMySQL,
-  UHTTPServer, USqlDatabase, URegistry, DateUtils, UWebPage, UWebApp,
+  UHTTPServer, USqlDatabase, INIFiles, DateUtils, UWebPage, UWebApp,
   UXmlClasses, UHtmlClasses, UCore, UHTTPServerTCP,
   UHTTPSessionFile, UUser, SpecializedList, Registry;
+
+const
+  ConfigFile = 'Config.ini';
 
 type
@@ -115 +118 @@
   UserOnline := TWebOnlineUser.Create;
   UserOnline.Database := Database;
+  LoadFromRegistry;
 end;
 
 destructor TMainModule.Destroy;
 begin
+  SaveToRegistry;
   HtmlDocument.Free;
   User.Free;
@@ -229 +234 @@
 
 procedure TMainModule.LoadFromRegistry;
-begin
-  with TRegistryEx.Create do
+const
+  SectionGeneral = 'General';
+  SectionDatabase = 'Database';
+begin
+  with TIniFile.Create(ConfigFile) do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(ApplicationInfo.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.LogException := not ReadBoolWithDefault('ShowException', False);
+    //RootKey := HKEY_CURRENT_USER;
+    //OpenKey(ApplicationInfo.RegistryKey, True);
+    Style := ReadString(SectionGeneral, 'Style', 'Basic');
+    BaseURL := ReadString(SectionGeneral, 'BaseURL', 'http://localhost');
+    Database.Hostname := ReadString(SectionDatabase, 'DatabaseHostName', 'localhost');
+    Database.Database := ReadString(SectionDatabase, 'DatabaseDatabase', 'web');
+    Database.UserName := ReadString(SectionDatabase, 'DatabaseUserName', 'user');
+    Database.Password := ReadString(SectionDatabase, 'DatabasePassword', 'password');
+    FormatHTML := ReadBool(SectionGeneral, 'FormatHTML', False);
+    Application.LogException := not ReadBool(SectionGeneral, 'ShowException', False);
   finally
     Free;
@@ -248 +256 @@
 
 procedure TMainModule.SaveToRegistry;
-begin
-
+const
+  SectionGeneral = 'General';
+  SectionDatabase = 'Database';
+begin
+  with TIniFile.Create(ConfigFile) do
+  try
+    //RootKey := HKEY_CURRENT_USER;
+    //OpenKey(ApplicationInfo.RegistryKey, True);
+    WriteString(SectionGeneral, 'Style', Style);
+    WriteString(SectionGeneral, 'BaseURL', BaseURL);
+    WriteString(SectionDatabase, 'DatabaseHostName', Database.Hostname);
+    WriteString(SectionDatabase, 'DatabaseDatabase', Database.Database);
+    WriteString(SectionDatabase, 'DatabaseUserName', Database.UserName);
+    WriteString(SectionDatabase, 'DatabasePassword', Database.Password);
+    WriteBool(SectionGeneral, 'FormatHTML', FormatHTML);
+    WriteBool(SectionGeneral, 'ShowException', not Application.LogException);
+  finally
+    Free;
+  end;
 end;
 
 procedure TMainModule.Run;
 begin
-  LoadFromRegistry;
   InitDatabase;
   //Database.Query('SELECT * FROM ssss');

@@ -2 +2 @@
 bin
 lib
+Config.ini