Changeset 27 for branches/lazarus/Common/UCGIApplication.pas

Timestamp:

Sep 10, 2010, 8:09:21 AM (14 years ago)

Author:

george

Message:

• Přidáno: Systém navigace pomocí "pěkných" URL.

File:

• branches/lazarus/Common/UCGIApplication.pas (modified) (7 diffs)

branches/lazarus/Common/UCGIApplication.pas

@@ -28 +28 @@
   TCGIApplication = class
   private
-    function FormatOutput(Data: string): string;
   public
     Headers: TStringList;
@@ -35 +34 @@
     Output: TStringList;
     Query: TQueryParameterList;
+    QueryParts: TStringListEx;
+    BaseURL: string;
     constructor Create;
     destructor Destroy; override;
@@ -54 +55 @@
   Output := TStringList.Create;
   Query := TQueryParameterList.Create;
+  QueryParts := TStringListEx.Create;
 end;
 
@@ -63 +65 @@
   Cookies.Free;
   Query.Free;
+  QueryParts.Free;
   inherited Destroy;
 end;
@@ -80 +83 @@
 
   // Parse query string
-  Query.Parse(EnvVars.Values['QUERY_STRING']);
+  if Length(EnvVars.Values['QUERY_STRING']) > 0 then
+  if EnvVars.Values['QUERY_STRING'][Length(EnvVars.Values['QUERY_STRING'])] = '/' then
+    EnvVars.Values['QUERY_STRING'] := Copy(EnvVars.Values['QUERY_STRING'], 1,
+      Length(EnvVars.Values['QUERY_STRING']) - 1);
+  QueryParts.Explode('/', EnvVars.Values['QUERY_STRING']);
+  if Pos('?', EnvVars.Values['REQUEST_URI']) > 0 then
+    Query.Parse(Copy(EnvVars.Values['REQUEST_URI'],
+      Pos('?', EnvVars.Values['REQUEST_URI']) + 1,
+      Length(EnvVars.Values['REQUEST_URI'])));
 
   Execute;
@@ -97 +108 @@
 
   // Emit page content
-  //Output.Text := FormatOutput(Output.Text);
   for I := 0 to Output.Count - 1 do begin
     WriteLn(Output[I]);
@@ -115 +125 @@
   Output.Add('</table>');
 end;
-
-function TCGIApplication.FormatOutput(Data: string): string;
-var
-  BlockStart, BlockEnd: Integer;
-  Indention: Integer;
-  Indention2: Integer;
-  Line: string;
-  Command: string;
-begin
-  Result := '';
-  Indention := 0;
-  Indention2 := 0;
-  while Data <> '' do begin
-    //WebWrite('.');
-    BlockStart := Pos('<', Data);
-        BlockEnd := Pos('>', Data);
-    if BlockStart > 1 then begin
-          BlockEnd := BlockStart - 1;
-          BlockStart := 1;
-        end;
-        Line := Trim(Copy(Data, BlockStart, BlockEnd));
-        //WebWriteLn(Line);
-        if Length(Line) > 0 then
-          if Line[1] = '<' then begin
-            if Data[BlockStart + 1] = '/' then begin
-              Indention := Indention - 2;
-              Indention2 := Indention;
-            end else begin
-          if Pos(' ', Line) > 0 then Command := Copy(Line, 2, Pos(' ', Line) - 2)
-                else Command := Copy(Line, 2, Length(Line) - 2);
-                  //WebWriteLn(Command + ' ' + IntToStr(Indention));
-          if Pos('</' + Command + '>', Data) > 0 then Indention := Indention + 2;
-                  //WebWriteLn(IntToStr(Indention) + ',' + IntToStr(Indention2));
-            end;
-          end;
-          if Line <> '' then Result := Result + StrRepeat(' ', Indention2) + Line + #13#10;
-          Data := Copy(Data, BlockEnd + 1, Length(Data));
-          Indention2 := Indention;
-  end;
-end;
-
 
 { TCookieList }