From fdec76b4f56adb2e38875452744cb521fe229eb9 Mon Sep 17 00:00:00 2001 From: yoffy Date: Wed, 29 Sep 2004 14:03:29 +0000 Subject: [PATCH] =?utf8?q?=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89=E3=81=AE=20?= =?utf8?q?URL=20=E5=BD=A2=E5=BC=8F=E3=81=A8=E3=83=AC=E3=82=B9=E3=82=A2?= =?utf8?q?=E3=83=B3=E3=82=AB=E3=83=BC=E3=81=AE=20URL=20=E5=BD=A2=E5=BC=8F?= =?utf8?q?=E3=81=8C=E7=95=B0=E3=81=AA=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AB?= =?utf8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E5=87=BA?= =?utf8?q?=E6=9D=A5=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Giko.pas | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/Giko.pas b/Giko.pas index 45f5b68..2c98fb0 100644 --- a/Giko.pas +++ b/Giko.pas @@ -2878,12 +2878,31 @@ begin threadItem := GetActiveContent; if Pos('about:blank..', Text) = 1 then begin wkInt := LastDelimiter( '/', threadItem.URL ); - if Pos( '?', Copy( threadItem.URL, wkInt, MaxInt ) ) = 0 then - URL := Copy( threadItem.URL, 1, LastDelimiter( '/', threadItem.URL ) ) + - Copy( Text, LastDelimiter( '/', Text ) + 1, MaxInt ) - else - URL := Copy( threadItem.URL, 1, LastDelimiter( '?', threadItem.URL ) ) + - Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt ) + if Pos( '?', Copy( threadItem.URL, wkInt, MaxInt ) ) = 0 then begin + // Thread.URL ‚Í PATH_INFO “n‚µ + URL := Copy( threadItem.URL, 1, LastDelimiter( '/', threadItem.URL ) ); + wkInt := LastDelimiter( '/', Text ); + if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then + // Text ‚à PATH_INFO “n‚µ + URL := URL + Copy( Text, LastDelimiter( '/', Text ) + 1, MaxInt ) + else + // Text ‚Í QUERY_STRING “n‚µ + URL := URL + Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt ); + end else begin + // Thread.URL ‚Í QUERY_STRING “n‚µ + URL := Copy( threadItem.URL, 1, LastDelimiter( '?', threadItem.URL ) ); + wkInt := LastDelimiter( '/', Text ); + if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then begin + // Text ‚Í PATH_INFO “n‚µ + // URL ‚ɔ‚ƃL[‚ª‘«‚ç‚È‚¢‚Ì‚Å Text ‚©‚ç’¸‘Õ‚·‚é + wkInt := LastDelimiter( '/', Copy( Text, 1, wkInt - 1 ) ); + wkInt := LastDelimiter( '/', Copy( Text, 1, wkInt - 1 ) ); + URL := Copy( URL, 1, Length( URL ) - 1 ) + Copy( Text, wkInt, MaxInt ); + end else begin + // Text ‚à QUERY_STRING “n‚µ + URL := URL + Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt ) + end; + end; end else begin URL := Text; end; -- 2.11.0