Changeset 361

Timestamp:

May 8, 2012, 10:24:35 PM (13 years ago)

Author:

chronos

Message:

• Added: Demo for PersistentData package.

Location:

PersistentData

Files:

• Backend/UPDClientINI.pas (modified) (2 diffs)
• Backend/UPDClientMemory.pas (added)
• Backend/UPDClientMySQL.pas (modified) (4 diffs)
• Backend/UPDClientRegistry.pas (modified) (2 diffs)
• Backend/UPDClientXMLRPC.pas (modified) (2 diffs)
• Demo (added)
• Demo/Demo.ico (added)
• Demo/Demo.lpi (added)
• Demo/Demo.lpr (added)
• Demo/Demo.lps (added)
• Demo/Demo.res (added)
• Demo/UFormMain.lfm (added)
• Demo/UFormMain.pas (added)
• PersistentData.lpk (modified) (2 diffs)
• PersistentData.pas (modified) (2 diffs)
• UPDClient.pas (modified) (6 diffs)
• UPersistentData.pas (added)

PersistentData/Backend/UPDClientINI.pas

@@ -13 +13 @@
 
   TPDClientINI = class(TPDClient)
+  public
     IniFile: TIniFile;
     //procedure GetItemList(Condition: TCondition; ItemList: TItemList); override;
     //procedure SetItemList(Condition: TCondition; ItemList: TItemList); override;
     FileName: string;
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure Connect; override;
@@ -39 +40 @@
 end;*)
 
-constructor TPDClientINI.Create;
+constructor TPDClientINI.Create(AOwner: TComponent);
 begin
-  inherited Create;
+  inherited;
+  BackendName := 'INI';
 end;
 

PersistentData/Backend/UPDClientMySQL.pas

@@ -14 +14 @@
   TPDClientMySQL = class(TPDClient)
   protected
+    FHost: string;
+    FPort: Word;
+    FUser: string;
+    FPassword: string;
+    FDatabase: TSqlDatabase;
     procedure InitSystemTypes; override;
     function GetConnected: Boolean; override;
     procedure Init; override;
   public
-    Database: TSqlDatabase;
     procedure ObjectLoad(AObject: TObjectProxy); override;
     procedure ObjectSave(AObject: TObjectProxy); override;
@@ -29 +33 @@
     procedure Install;
     procedure Uninstall;
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure Connect; override;
     procedure Disconnect; override;
+  published
+    property Database: TSqlDatabase read FDatabase write FDatabase;
+    property Host: string read FHost write FHost;
+    property Port: Word read FPort write FPort;
+    property User: string read FUser write FUser;
+    property Password: string read FPassword write FPassword;
   end;
 
@@ -236 +246 @@
 end;
 
-constructor TPDClientMySQL.Create;
+constructor TPDClientMySQL.Create(AOwner: TComponent);
 begin
   inherited;
-  Database := TSqlDatabase.Create(nil);
+  FDatabase := TSqlDatabase.Create(nil);
+  BackendName := 'MySQL';
 end;
 
 destructor TPDClientMySQL.Destroy;
 begin
-  FreeAndNil(Database);
+  FreeAndNil(FDatabase);
   inherited Destroy;
 end;
@@ -250 +261 @@
 procedure TPDClientMySQL.Connect;
 begin
-  Database.Port := Port;
-  Database.UserName := User;
-  Database.Password := Password;
-  Database.HostName := Host;
-  Database.Database := Schema;
-  Database.Connect;
-  Init;
+  if not Connected then begin
+    Database.Port := Port;
+    Database.UserName := User;
+    Database.Password := Password;
+    Database.HostName := Host;
+    Database.Database := Schema;
+    Database.Connect;
+    Init;
+  end;
 end;
 
 procedure TPDClientMySQL.Disconnect;
 begin
-  Database.Disconnect;
+  if Connected then Database.Disconnect;
 end;
 

PersistentData/Backend/UPDClientRegistry.pas

@@ -16 +16 @@
     //procedure GetItemList(Condition: TCondition; ItemList: TItemList); override;
     //procedure SetItemList(Condition: TCondition; ItemList: TItemList); override;
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
@@ -36 +36 @@
 end;*)
 
-constructor TPDClientRegistry.Create;
+constructor TPDClientRegistry.Create(AOwner: TComponent);
 begin
+  inherited;
   Reg := TRegistry.Create;
-  inherited Create;
+  BackendName := 'Windows registry';
 end;
 

PersistentData/Backend/UPDClientXMLRPC.pas

@@ -13 +13 @@
 
   TPDClientXMLRPC = class(TPDClient)
+    constructor Create(AOwner: TComponent); override;
   end;
 
@@ -18 +19 @@
 
 
+{ TPDClientXMLRPC }
+
+constructor TPDClientXMLRPC.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  BackendName := 'XMLRPC';
+end;
+
 end.
 

PersistentData/PersistentData.lpk

@@ -10 +10 @@
       <SearchPaths>
         <OtherUnitFiles Value="Backend"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <CodeGeneration>
@@ -30 +30 @@
     <License Value="GNU/GPL"/>
     <Version Minor="1"/>
-    <Files Count="6">
+    <Files Count="8">
       <Item1>
         <Filename Value="UPDServer.pas"/>
-        <UnitName Value="UChronisServer"/>
+        <UnitName Value="UPDServer"/>
       </Item1>
       <Item2>
         <Filename Value="UPDClient.pas"/>
-        <UnitName Value="UChronisClient"/>
+        <UnitName Value="UPDClient"/>
       </Item2>
       <Item3>
         <Filename Value="Backend\UPDClientXMLRPC.pas"/>
-        <UnitName Value="UChronisClientXMLRPC"/>
+        <UnitName Value="UPDClientXMLRPC"/>
       </Item3>
       <Item4>
         <Filename Value="Backend\UPDClientINI.pas"/>
-        <UnitName Value="UChronisClientDirect"/>
+        <UnitName Value="UPDClientINI"/>
       </Item4>
       <Item5>
         <Filename Value="Backend\UPDClientMySQL.pas"/>
-        <UnitName Value="UChronisClientMySQL"/>
+        <UnitName Value="UPDClientMySQL"/>
       </Item5>
       <Item6>
         <Filename Value="Backend\UPDClientRegistry.pas"/>
-        <UnitName Value="UChronisClientDirect"/>
+        <UnitName Value="UPDClientRegistry"/>
       </Item6>
+      <Item7>
+        <Filename Value="UPersistentData.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UPersistentData"/>
+      </Item7>
+      <Item8>
+        <Filename Value="Backend\UPDClientMemory.pas"/>
+        <UnitName Value="UPDClientMemory"/>
+      </Item8>
     </Files>
     <Type Value="RunAndDesignTime"/>

PersistentData/PersistentData.pas

@@ -9 +9 @@
 uses
   UPDServer, UPDClient, UPDClientXMLRPC, UPDClientINI, UPDClientMySQL, 
-  UPDClientRegistry, LazarusPackageIntf;
+  UPDClientRegistry, UPersistentData, UPDClientMemory, LazarusPackageIntf;
 
 implementation
@@ -15 +15 @@
 procedure Register;
 begin
+  RegisterUnit('UPersistentData', @UPersistentData.Register);
 end;
 

PersistentData/UPDClient.pas

@@ -80 +80 @@
   { TPDClient }
 
-  TPDClient = class
+  TPDClient = class(TComponent)
   private
+    FSchema: string;
+    procedure SetConnected(AValue: Boolean);
   protected
     procedure InitSystemTypes; virtual;
     procedure Init; virtual;
     function GetConnected: Boolean; virtual;
+    function GetConnectionString: string; virtual;
+    procedure SetConnectionString(AValue: string); virtual;
   public
-    Host: string;
-    Port: Word;
-    Schema: string;
-    User: string;
-    Password: string;
     Types: TPDTypeList;
     Version: string;
+    BackendName: string;
     procedure ObjectLoad(AObject: TObjectProxy); virtual; abstract;
     procedure ObjectSave(AObject: TObjectProxy); virtual; abstract;
@@ -104 +104 @@
     procedure CheckTypes;
     function TypeExists(Name: string): Boolean; virtual; abstract;
-    constructor Create; virtual;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure Connect; virtual;
@@ -111 +111 @@
     procedure Uninstall; virtual;
     procedure Update; virtual;
-    property Connected: Boolean read GetConnected;
-  end;
+  published
+    property Schema: string read FSchema write FSchema;
+    property Connected: Boolean read GetConnected write SetConnected;
+    property ConnectionString: string read GetConnectionString
+      write SetConnectionString;
+  end;
+
+  TPDClientClass = class of TPDClient;
 
 implementation
@@ -238 +244 @@
 
 { TPDClient }
+
+function TPDClient.GetConnectionString: string;
+begin
+  Result := '';
+end;
+
+procedure TPDClient.SetConnectionString(AValue: string);
+begin
+
+end;
+
+procedure TPDClient.SetConnected(AValue: Boolean);
+begin
+  if AValue then Connect else Disconnect;
+end;
 
 procedure TPDClient.InitSystemTypes;
@@ -330 +351 @@
 end;
 
-constructor TPDClient.Create;
-begin
+constructor TPDClient.Create(AOwner: TComponent);
+begin
+  inherited;
   Types := TPDTypeList.Create;
   Types.Client := Self;
@@ -345 +367 @@
 procedure TPDClient.Connect;
 begin
-  raise Exception.Create(SNotSupported);
 end;
 
 procedure TPDClient.Disconnect;
 begin
-  raise Exception.Create(SNotSupported);
 end;