Changeset 104 for Network

Timestamp:

Dec 31, 2010, 9:59:19 PM (13 years ago)

Author:

george

Message:

• Přidáno: Třídy THtmlForm. THtmlInput a THtmlLineBreak.

Location:

Network/CoolWeb

Files:

• Common/UHtmlClasses.pas (modified) (7 diffs)
• Common/UPool.pas (modified) (1 diff)
• Common/UXmlClasses.pas (modified) (1 diff)
• CoolWeb.lpk (modified) (2 diffs)
• Persistence/USqlDatabase.pas (modified) (1 diff)
• WebServer/UHTTPServer.pas (modified) (6 diffs)
• WebServer/UHTTPServerCGI.pas (modified) (2 diffs)

Network/CoolWeb/Common/UHtmlClasses.pas

@@ -6 +6 @@
 
 uses
-  UXmlClasses, Classes, SysUtils, SpecializedList, SpecializedObjectList;
+  UXmlClasses, Classes, SysUtils, SpecializedList;
 
 type
@@ -90 +90 @@
   end;
 
+  { THtmlLineBreak }
+
+  THtmlLineBreak = class(THtmlElement)
+  private
+    function GetAsXmlElement: TXmlElement; override;
+  public
+    constructor Create;
+  end;
+
   THtmlBlock = class(THtmlElement)
   private
@@ -125 +134 @@
     Source: TURL;
     AlternateText: string;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  THtmlInputType = (itText, itComboBox, itRadioButton, itReset, itPassword,
+    itSubmit, itHidden, itFileSelect, itButton, itCheckBox);
+
+  { THtmlInput }
+
+  THtmlInput = class(THtmlElement)
+  private
+    function GetAsXmlElement: TXmlElement; override;
+  public
+    InputType: THtmlInputType;
+    Value: Variant;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { THtmlForm }
+
+  THtmlForm = class(THtmlBlock)
+  private
+  public
+    Method: string;
+    Action: TURL;
+    function GetAsXmlElement: TXmlElement; override;
     constructor Create;
     destructor Destroy; override;
@@ -211 +247 @@
     Result := False;
   end;
+end;
+
+{ THtmlLineBreak }
+
+function THtmlLineBreak.GetAsXmlElement: TXmlElement;
+begin
+  Result := inherited GetAsXmlElement;
+  TXmlTag(Result).Name := 'br';
+end;
+
+constructor THtmlLineBreak.Create;
+begin
+end;
+
+{ THtmlInput }
+
+function THtmlInput.GetAsXmlElement: TXmlElement;
+var
+  InputTypeString: string;
+begin
+  Result := TXmlTag.Create;
+  with TXmlTag(Result) do begin
+    Name := 'input';
+    case InputType of
+      itButton: InputTypeString := 'button';
+      itRadioButton: InputTypeString := 'radio';
+      itCheckBox: InputTypeString := 'checkbox';
+      itText: InputTypeString := 'text';
+      itFileSelect: InputTypeString := 'file';
+      itSubmit: InputTypeString := 'submit';
+      itHidden: InputTypeString := 'hidden';
+      itPassword: InputTypeString := 'password';
+    end;
+    Attributes.Add('type', InputTypeString);
+    Attributes.Add('value', Value);
+    Attributes.Add('name', Name);
+  end;
+end;
+
+constructor THtmlInput.Create;
+begin
+
+end;
+
+destructor THtmlInput.Destroy;
+begin
+  inherited Destroy;
+end;
+
+{ THtmlForm }
+
+function THtmlForm.GetAsXmlElement: TXmlElement;
+begin
+  Result := TXmlTag.Create;
+  with TXmlTag(Result) do begin
+    Name := 'form';
+    Attributes.Add('action', Action.AsString);
+    Attributes.Add('method', Method);
+  end;
+end;
+
+constructor THtmlForm.Create;
+begin
+  inherited;
+  Action := TURL.Create;
+  BlockType := btBlockLevel;
+  Method := 'get';
+end;
+
+destructor THtmlForm.Destroy;
+begin
+  Action.Free;
+  inherited Destroy;
 end;
 
@@ -294 +403 @@
 constructor THtmlBlock.Create;
 begin
+  inherited;
   SubItems := TListObject.Create;
 end;
@@ -323 +433 @@
 function THtmlElement.GetAsXmlElement: TXmlElement;
 begin
-
+  Result := TXmlTag.Create;
+  with TXmlTag(Result).Attributes do begin
+    if Name <> '' then Add('name', Name);
+    if Style <> '' then Add('style', Style);
+    if ClassId <> '' then Add('class', ClassId);
+    if Id <> '' then Add('id', Id);
+  end;
 end;
 
@@ -472 +588 @@
     StrArray.Explode(Value, '.', StrToStr);
     SetLength(Levels, StrArray.Count);
-    for I := 0 to StrArray.Count do
-      Levels[StrArray.Count - I] := StrArray[I];
+    for I := 0 to StrArray.Count - 1 do
+      Levels[StrArray.Count - 1 - I] := StrArray[I];
   finally
     StrArray.Free;

Network/CoolWeb/Common/UPool.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, syncobjs, SpecializedObjectList;
+  Classes, SysUtils, syncobjs, SpecializedList;
 
 type

Network/CoolWeb/Common/UXmlClasses.pas

@@ -5 +5 @@
 interface
 
-uses Classes, SysUtils, StrUtils, SpecializedList, SpecializedObjectList,
+uses Classes, SysUtils, StrUtils, SpecializedList,
   SpecializedDictionary;
 

Network/CoolWeb/CoolWeb.lpk

@@ -8 +8 @@
       <SearchPaths>
         <OtherUnitFiles Value="WebServer;Persistence;Network;Modules;Common"/>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
@@ -87 +87 @@
       <Item1>
         <PackageName Value="TemplateGenerics"/>
+        <MaxVersion Minor="3" Valid="True"/>
+        <MinVersion Minor="3" Valid="True"/>
       </Item1>
       <Item2>

Network/CoolWeb/Persistence/USqlDatabase.pas

@@ -3 +3 @@
 {$mode Delphi}{$H+}
 
-// Upraveno: 28.10.2010
+// Modified: 2010-12-24
 
 interface
 
 uses
-  SysUtils, Classes, Dialogs, mysql50, TypInfo, SpecializedObjectList,
+  SysUtils, Classes, Dialogs, mysql50, TypInfo,
   SpecializedDictionary, SpecializedList;
 

Network/CoolWeb/WebServer/UHTTPServer.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, UTCPServer, UCommon, UMemoryStreamEx, UMIMEType,
-  Synautil, SpecializedObjectList, SpecializedList;
+  Synautil, SpecializedList;
 
 type
@@ -113 +113 @@
   SEmptyHTTPHandler = 'No handler defined for HTTP server.';
   SFileNotFound = 'File %s not found.';
+  SPageNotFound = 'Page %s not found.';
 
 implementation
@@ -163 +164 @@
 begin
   with HandlerData, Response.Stream do begin
-    WriteString('<html><body>Page ' + Request.Path + ' not found.</body></html>');
+    WriteString('<html><body>' + Format(SPageNotFound, [Request.Path]) + '</body></html>');
   end;
 end;
@@ -194 +195 @@
     with Response.Stream do begin
       WriteLn(Format(SFileNotFound, [Request.Path]));
-      WriteString('<html><body>File ' + Request.Path + ' not found.</body></html>');
+      WriteString('<html><body>' + Format(SFileNotFound, [Request.Path]) + '</body></html>');
     end;
   end;
@@ -386 +387 @@
   WriteLn(hstdout^, 'Content-type: text/html');
   WriteLn(hstdout^);
-  Writeln(hstdout^, 'An unhandled exception occurred at $', HexStr(PtrUInt(Addr), SizeOf(PtrUInt) * 2), ' :');
+  Writeln(hstdout^, 'An unhandled exception occurred at $', HexStr(PtrUInt(Addr), SizeOf(PtrUInt) * 2), ' :<br/>');
   if Obj is exception then
    begin
      Message := Exception(Obj).ClassName + ' : ' + Exception(Obj).Message;
-     Writeln(hstdout^, Message);
+     Writeln(hstdout^, Message + '<br/>');
    end
   else
-    Writeln(hstdout^, 'Exception object ', Obj.ClassName, ' is not of class Exception.');
-  Writeln(hstdout^, BackTraceStrFunc(Addr));
+    Writeln(hstdout^, 'Exception object ', Obj.ClassName, ' is not of class Exception.<br/>');
+  Writeln(hstdout^, BackTraceStrFunc(Addr) + '<br/>');
   if (FrameCount > 0) then
     begin
       for i := 0 to FrameCount - 1 do
         if I < Length(TArrayOfPointer(Frames)) then
-          Writeln(hstdout^, BackTraceStrFunc(TArrayOfPointer(Frames)[i]));
-    end;
-  Writeln(hstdout^,'');
+          Writeln(hstdout^, BackTraceStrFunc(TArrayOfPointer(Frames)[i]) + '<br/>');
+    end;
+  Writeln(hstdout^, '');
 end;
 
@@ -433 +434 @@
           Writeln(hstderr^, BackTraceStrFunc(TArrayOfPointer(Frames)[i]));
     end;
-  Writeln(hstderr^,'');
+  Writeln(hstderr^, '');
 end;
 

Network/CoolWeb/WebServer/UHTTPServerCGI.pas

@@ -22 +22 @@
 
 implementation
+
+resourcestring
+  SEnvironmentVariables = 'Environment variables:';
 
 { THTTPServerCGI }
@@ -107 +110 @@
   inherited;
   with HandlerData, Response.Stream do begin
-    WriteString('<h5>Environment variables:</h5>');
+    WriteString('<h5>' + SEnvironmentVariables + '</h5>');
     WriteString('<table border="1">');
     for I := 0 to EnvVars.Count - 1 do begin