Changeset 375 for Network/CoolWeb

Timestamp:

Jun 18, 2012, 8:44:29 PM (12 years ago)

Author:

chronos

Message:

• Modified: TWebApp will not maintaing page list and produce response by itself. OnPageProduce handler have to be used.

File:

• Network/CoolWeb/WebServer/UWebApp.pas (modified) (12 diffs)

Network/CoolWeb/WebServer/UWebApp.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, CustApp, SpecializedList, UWebPage, UHTTPSessionFile,
-  UHTTPServer, Forms;
+  UHTTPServer, Forms, FileUtil;
 
 type
@@ -17 +17 @@
   end;
 
-  { TRegistredPageList }
+  { TPageList }
 
-  TRegistredPageList = class(TListObject)
+  TPageList = class(TListObject)
+    RootDir: string;
     function FindByName(Name: string): TRegistredPage;
+    procedure RegisterPage(PageClass: TWebPageClass; out Reference; Path: string);
+    function ProducePage(HandlerData: THTTPHandlerData): Boolean;
   end;
 
@@ -27 +30 @@
   TWebApp = class(TComponent)
   private
-    FOnBeforePageProduce: TOnProduceEvent;
+    FOnPageProduce: TOnProduceEvent;
     FOnInitialize: TNotifyEvent;
     FServerType: THTTPServerType;
@@ -34 +37 @@
     procedure SetServerType(AValue: THTTPServerType);
   public
-    Pages: TRegistredPageList;
     HTTPServer: THTTPServer;
     HTTPSessionStorageFile: THTTPSessionStorageFile;
     LogException: Boolean;
     procedure ShowException(E: Exception);
-    procedure RegisterPage(PageClass: TWebPageClass; out Reference; Path: string);
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure Run;
   published
-    property OnBeforePageProduce: TOnProduceEvent read FOnBeforePageProduce write FOnBeforePageProduce;
+    property OnPageProduce: TOnProduceEvent read FOnPageProduce write FOnPageProduce;
     property OnInitialize: TNotifyEvent read FOnInitialize write FOnInitialize;
     property ServerType: THTTPServerType read FServerType write SetServerType;
@@ -57 +58 @@
   UHTTPServerCGI, UHTTPServerTCP, UHTTPServerTurboPower;
 
-resourcestring
-  SPageNotFound = 'Page not found';
-
 
 procedure Register;
@@ -67 +65 @@
 
 
-{ TRegistredPageList }
+{ TPageList }
 
-function TRegistredPageList.FindByName(Name: string): TRegistredPage;
+function TPageList.FindByName(Name: string): TRegistredPage;
 var
   I: Integer;
@@ -108 +106 @@
 end;
 
-procedure TWebApp.RegisterPage(PageClass: TWebPageClass; out Reference;
+procedure TPageList.RegisterPage(PageClass: TWebPageClass; out Reference;
   Path: string);
 var
@@ -114 +112 @@
   Instance: TWebPage;
 begin
-  NewPage := TRegistredPage(Pages.AddNew(TRegistredPage.Create));
+  NewPage := TRegistredPage(AddNew(TRegistredPage.Create));
 //  NewPage.Page := PageClass.Create(Self);
   NewPage.Page := PageClass.Create(nil);
@@ -121 +119 @@
 end;
 
-procedure TWebApp.HTTPServerRequest(HandlerData: THTTPHandlerData);
+function TPageList.ProducePage(HandlerData: THTTPHandlerData): Boolean;
 var
   Page: TRegistredPage;
@@ -127 +125 @@
 begin
   with HandlerData do begin
-    //Request.QueryParts.Count := 2;
-    //Request.QueryParts[0] := 'uzivatel';
-    //Request.QueryParts[1] := 'prihlaseni';
-    if Assigned(FOnBeforePageProduce) then
-      FOnBeforePageProduce(HandlerData);
-
     if Request.QueryParts.Count > 0 then PageName := Request.QueryParts[0]
       else PageName := '';
-    Page := Pages.FindByName(PageName);
+    Page := FindByName(PageName);
     if Assigned(Page) then begin
       Page.Page.OnProduce(HandlerData);
-    end else Response.Content.WriteString(SPageNotFound);
+      Result := True;
+    end else Result := False;
   end;
+end;
+
+procedure TWebApp.HTTPServerRequest(HandlerData: THTTPHandlerData);
+begin
+  if Assigned(FOnPageProduce) then
+    FOnPageProduce(HandlerData);
 end;
 
@@ -179 +178 @@
 begin
   inherited Create(AOwner);
-  Pages := TRegistredPageList.Create;
   HTTPServer := THTTPServerCGI.Create(nil);
   HTTPServer.OnRequest := HTTPServerRequest;
@@ -186 +184 @@
 destructor TWebApp.Destroy;
 begin
-  Pages.Free;
   HTTPServer.Free;
   inherited Destroy;