提交: 1ef4698cd75c4317670ba7c19e2a99aef9c32b15 - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修訂: 1ef4698cd75c4317670ba7c19e2a99aef9c32b15 (tree)
• 時間: 2005-11-03 03:10:55
• 作者: h677 <h677>
• Commiter: h677

Log Message

ConvRes内の最適化

Change Summary

• modified: HTMLCreate.pas

差異

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -43,7 +43,6 @@ type
 		function LoadFromSkin(fileName: string; ThreadItem: TThreadItem; SizeByte: Integer): string;
 		function SkinedRes(skin: string; Res: TResRec; No: string): string;
 		function ConvRes(const Body, Bbs, Key,	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue : string; DatToHTML: boolean = false): string; overload;
-		function ConvRes(const Body, Bbs, Key,	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue, FullURL : string): string; overload;
 		procedure CreateHTML2(doc: IDispatch; ThreadItem: TThreadItem; var sTitle: string);
 		procedure CreateHTML3(var html: TStringList; ThreadItem: TThreadItem; var sTitle: string);
 	end;
@@ -326,7 +325,6 @@ function THTMLCreate.ConvRes(const Body, Bbs, Key,
 const
 	GT	= '>';
 	SN	= '0123456789';
-	ZN	= '‚O‚P‚Q‚R‚S‚T‚U‚V‚W‚X';
 	FORMAT_LINK = '<a href="../test/read.cgi?%s=%s&%s=%s&%s=%s&%s=%s&%s=%s" target="_blank">';
 var
 	i : integer;
@@ -341,7 +339,7 @@ var
 	token : array[0..5] of string;
 	ch : string;
 	db : boolean;
-
+	len : integer;
 begin
 	//s ‚É–{•¶‚ð‘S•”“ü‚ê‚é
 	s	 :=	Body;
@@ -356,10 +354,10 @@ begin
 	token[5] := '<A ';
 
 	//
-	while Length(s) > 0 do begin
+	while Length(s) > 2 do begin
 		pmin := Length(s) + 1;
-		i	:= length(token);
-		for j := 0 to length(token) - 1 do begin
+		i	:= Length(token);
+		for j := 0 to Length(token) - 1 do begin
 			pos := AnsiPos(token[j], s);
 			if pos <> 0 then begin
 				if pos < pmin then begin
@@ -375,7 +373,7 @@ begin
 		Result := Result + Copy(s, 1, pmin - 1);
 		Delete(s, 1, pmin - 1);
 
-		if i = length(token) then begin
+		if i = 6 then begin
 			//ƒqƒbƒg‚È‚µ
 		end else if (i = 4) or (i = 5) then begin
 			//'<a ' or '<A' ‚Ńqƒbƒg '</a>' or '</A>' ‚܂ŃRƒs[
@@ -397,7 +395,8 @@ begin
 			No := '';
 			sw := false;
 			db := false;
-			while j <= Length(s) do begin
+			len := Length(s);
+			while j <= len do begin
 				if (ByteType(s, j) = mbSingleByte) then begin
 					//1byte•¶Žš
 					ch := s[j];
@@ -410,7 +409,7 @@ begin
 					db := true;
 				end;
 
-				if AnsiPos(ch, SN) > 0 then begin
+				if System.Pos(ch, SN) > 0 then begin
 					No := No + ch;
 				end else if (ch = '-') then begin
 					if sw then break;
@@ -421,7 +420,7 @@ begin
 				end;
 			end;
 			//I’[‚܂ōs‚Á‚Ă̏I—¹‚©ƒ`ƒFƒbƒN
-			if j <= Length(s) then begin
+			if j <= len then begin
 				if db then j := j - 2
 				else j := j - 1;
 			end;
@@ -433,387 +432,16 @@ begin
 
 				if not DatToHTML then begin
 					Result := Result + Format(FORMAT_LINK,
-								[ParamBBS, Bbs, ParamKey, Key, ParamStart, st, ParamTo, et, ParamNoFirst, ParamTrue])
-							+ Copy(s, 1, j - 1) + '</a>';
+								[ParamBBS, Bbs, ParamKey, Key, ParamStart, st, ParamTo, et, ParamNoFirst, ParamTrue]);
 				end else begin
-					Result := Result + Format('<a href="#%s">', [st])
-							+ Copy(s, 1, j - 1) + '</a>';
+					Result := Result + Format('<a href="#%s">', [st]);
 				end;
+				Result := Result + Copy(s, 1, j - 1) + '</a>';
 			end;
 			Delete(s, 1, j - 1);
 		end;
 	end;
-end;
-{
-function THTMLCreate.ConvRes(const Body, Bbs, Key,
-	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue : string;
-	DatToHTML: boolean = false): string;
-type
-	PIndex = ^TIndex;
-	TIndex = record
-		FIndexFrom	: integer;
-		FIndexTo		: integer;
-		FNo				 : string;
-	end;
-const
-	GT	= '&gt;';
-	SN	= '0123456789-';
-	ZN	= '‚O‚P‚Q‚R‚S‚T‚U‚V‚W‚X|';
-	FORMAT_LINK = '<a href="../test/read.cgi?%s=%s&%s=%s&%s=%s&%s=%s&%s=%s" target="_blank">';
-var
-	i : integer;
-	s : string;
-	b : TMbcsByteType;
-	sw: boolean;
-	sp: integer;
-	No: string;
-	sx: string;
-	List: TList;
-	oc	: string;
-	st, et: string;
-	chk : boolean;
-	al : boolean;
-	procedure Add(IndexFrom, IndexTo: integer; const No: string);
-	var
-		FIndex : PIndex;
-	begin
-		New(FIndex);
-		FIndex.FIndexFrom	:= IndexFrom;
-		FIndex.FIndexTo		:= IndexTo;
-		FIndex.FNo				 := No;
-		List.Add(FIndex);
-	end;
-	procedure separateNumber(var st: String; var et: String; const Text, Separator: String);
-	var
-		p : Integer;
-	begin
-		p := Pos(Separator, Text);
-		if (p > 0 ) then begin
-			st := Copy(Text, 1, p - 1);
-			et := Copy(Text, p + Length(Separator), Length(Text));
-		end else begin
-			st := Text;
-			et := Text;
-		end;
-	end;
-begin
-	s	 :=	Body;
-	Result	 :=	Body;
-	i	 :=	1;
-	sw	:=	False;
-	No	:=	'';
-	List:=	TList.Create;
-	oc	:=	'';
-	sp	:=	0;
-	chk :=	False;
-	al	:=	False;
-	while true	do	begin
-		b :=	ByteType(s, i);
-		case	b of
-			mbSingleByte	: begin
-				if	(not sw) and (Copy(s,i,8) = GT + GT) then	begin
-					if	(Pos('<A HREF', oc) = 0) then	begin
-						sw	:=	True;
-						sp	:=	i;
-						i :=	i + 7;
-						oc:='';
-						chk :=	True;
-					end;
-				end else
-				if	(not sw) and (Copy(s,i,8) = GT + GT) then	begin
-					if	(Pos('<A HREF', oc) = 1) then	begin
-						i :=	i + 7;
-						oc:='';
-						chk :=	True;
-					end;
-				end else
-				if	(not sw) and (Copy(s,i,4) = GT) then	begin
-					if	(Pos('<A HREF', oc) = 0) then	begin
-						sw	:=	True;
-						sp	:=	i;
-						i :=	i + 3;
-						oc:='';
-						chk :=	True;
-					end;
-				end else
-				if	((not sw) and (Copy(s,i,1) = ',')) or
-						((not sw) and (Copy(s,i,1) = '=')) then	begin
-					if	((not Chk) and (oc = '</A>')) or
-							((Chk) and	(oc = '')) or
-							((not Chk) and (al)) then
-					begin
-						sw	:=	True;
-						sp	:=	i;
-						oc:='';
-					end;
-				end else
-				if	(sw) then begin
-					sx	:=	Copy(s,i,1);
-					if	(AnsiPos(sx, SN) > 0)	then	begin
-						No	:=	No	+ sx;
-					end else begin
-						if	(No <> '') and (No <> '-')	 then	begin
-							Add(sp, i, No);
-							al := True;
-						end;
-						sw	:=	False;
-						Dec(i);
-						No	:= '';
-						oc:='';
-					end;
-				end else begin
-					if	Copy(s,i,1) = '<' then	begin
-						oc	:=	'<';
-					end else begin
-						oc	:=	oc + AnsiUpperCase(Copy(s,i,1));
-					end;
-					chk :=	False;
-					al	:=	False;
-				end;
-			end;
-			mbLeadByte	: begin
-				if	(not sw) and (Copy(s,i,4) = '„„') then	begin
-					sw	:=	True;
-					sp	:=	i;
-					i :=	i + 3;
-					chk :=	True;
-				end else
-				if	(not sw) and (Copy(s,i,2) = '„') then	begin
-					sw	:=	True;
-					sp	:=	i;
-					Inc(i);
-					chk :=	True;
-				end else
-				if	(sw) then begin
-					sx	:=	Copy(s,i,2);
-					if	(AnsiPos(sx, ZN) > 0)	then	begin
-						No	:=	No	+ ZenToHan(sx);
-					end else begin
-						if	(No <> '') and (No <> '-')	and (No <> '|') then	begin
-							Add(sp, i, No);
-						end;
-						sw	:=	False;
-						Dec(i);
-						No	:=	'';
-					end;
-				end else begin
-					oc	:=	'';
-					chk :=	False;
-				end;
-				al	:=	False;
-			end;
-		end;
-		inc(i);
-		if	(i > Length(Body))	then	begin
-			if	(sw)	then	begin
-				if	(No <> '')	then	Add(sp, i, No);
-			end;
-			Break;
-		end;
-	end;
-	for i :=	List.Count - 1	downto	0 do	begin
-		separateNumber(st, et, PIndex(List[i]).FNo, '-');
-		if not DatToHTML then
-			Result :=	Copy(Result,1, PIndex(List[i]).FIndexFrom - 1) +
-					Format(FORMAT_LINK, [ParamBBS, Bbs, ParamKey, Key, ParamStart, st, ParamTo, et, ParamNoFirst, ParamTrue]) +
-					Copy(Result,PIndex(List[i]).FIndexFrom, PIndex(List[i]).FIndexTo - PIndex(List[i]).FIndexFrom) + '</A>' +
-					Copy(Result,PIndex(List[i]).FIndexTo,Length(Result))
-		else
-			Result :=	Copy(Result,1, PIndex(List[i]).FIndexFrom - 1) +
-					Format('<a href="#%s">', [st]) +
-					Copy(Result,PIndex(List[i]).FIndexFrom, PIndex(List[i]).FIndexTo - PIndex(List[i]).FIndexFrom) + '</A>' +
-					Copy(Result,PIndex(List[i]).FIndexTo,Length(Result));
-
-		Dispose(PIndex(List[i]));
-	end;
-	List.Free;
-end;
-}
-function THTMLCreate.ConvRes(
-	const Body, Bbs, Key, ParamBBS, ParamKey,
-	ParamStart, ParamTo, ParamNoFirst,
-	ParamTrue, FullURL : string
-): string;
-type
-	PIndex = ^TIndex;
-	TIndex = record
-		FIndexFrom	: integer;
-		FIndexTo		: integer;
-		FNo				 : string;
-	end;
-const
-	GT	= '&gt;';
-	SN	= '0123456789-';
-	ZN	= '‚O‚P‚Q‚R‚S‚T‚U‚V‚W‚X|';
-var
-	i : integer;
-	s : string;
-	b : TMbcsByteType;
-	sw: boolean;
-	sp: integer;
-	No: string;
-	sx: string;
-	List: TList;
-	oc	: string;
-	st, et: string;
-	chk : boolean;
-	al : boolean;
-	procedure Add(IndexFrom, IndexTo: integer; const No: string);
-	var
-		FIndex : PIndex;
-	begin
-		New(FIndex);
-		FIndex.FIndexFrom	:= IndexFrom;
-		FIndex.FIndexTo		:= IndexTo;
-		FIndex.FNo				 := No;
-		List.Add(FIndex);
-	end;
-	function ChooseString(const Text, Separator: string; Index: integer): string;
-	var
-		S : string;
-		i, p : integer;
-	begin
-		S :=	Text;
-		for i :=	0 to	Index - 1 do	begin
-			if	(AnsiPos(Separator, S) = 0) then	S :=	''
-			else	S :=	Copy(S, AnsiPos(Separator, S) + Length(Separator), Length(S));
-		end;
-		p :=	AnsiPos(Separator, S);
-		if	(p > 0) then	Result	:=	Copy(S, 1, p - 1) else Result :=	S;
-	end;
-begin
-	{ v1.0 b2 - 03 }
-	s	 :=	Body;
-	Result	 :=	Body;
-	i	 :=	1;
-	sw	:=	False;
-	No	:=	'';
-	List:=	TList.Create;
-	oc	:=	'';
-	sp	:=	0;
-	chk :=	False;
-	al	:=	False;
-	while true	do	begin
-		b :=	ByteType(s, i);
-		case b of
-			mbSingleByte	: begin
-				if	(not sw) and (Copy(s,i,8) = GT + GT) then	begin
-					if	(Pos('<A HREF', AnsiUpperCase(oc)) = 0) then	begin
-						sw	:=	True;
-						sp	:=	i;
-						i :=	i + 7;
-						oc:='';
-						chk :=	True;
-					end;
-				end else
-				if	(not sw) and (Copy(s,i,8) = GT + GT) then	begin
-					if	(Pos('<A HREF', AnsiUpperCase(oc)) = 1) then	begin
-						i :=	i + 7;
-						oc:='';
-						chk :=	True;
-					end;
-				end else
-				if	(not sw) and (Copy(s,i,4) = GT) then	begin
-					if	(Pos('<A HREF', AnsiUpperCase(oc)) = 0) then	begin
-						sw	:=	True;
-						sp	:=	i;
-						i :=	i + 3;
-						oc:='';
-						chk :=	True;
-					end;
-				end else
-				if	((not sw) and (Copy(s,i,1) = ',')) or
-						((not sw) and (Copy(s,i,1) = '=')) then	begin
-					if	((not Chk) and (AnsiLowerCase(oc) = '</a>')) or
-							((Chk) and	(oc = '')) or
-							((not Chk) and (al)) then
-					begin
-						sw	:=	True;
-						sp	:=	i;
-						//i :=	i + 1;
-						oc:='';
-					end;
-				end else
-				if	(sw) then begin
-					sx	:=	Copy(s,i,1);
-					if	(Pos(sx, SN) > 0)	then	begin
-						No	:=	No	+ sx;
-					end else begin
-						if	(No <> '') and (No <> '-')	 then	begin
-							Add(sp, i, No);
-							al := True;
-						end;
-						sw	:=	False;
-						//
-						i := i - 1;
-						//
-						No	:= '';
-						oc:='';
-						//chk :=	False;
-					end;
-				end else begin
-					if	Copy(s,i,1) = '<' then	oc	:=	'';
-					oc	:=	oc + Copy(s,i,1);
-					chk :=	False;
-					al	:=	False;
-				end;
-			end;
-			mbLeadByte	: begin
-				if	(not sw) and (Copy(s,i,4) = '„„') then	begin
-					sw	:=	True;
-					sp	:=	i;
-					i :=	i + 3;
-					chk :=	True;
-				end else
-				if	(not sw) and (Copy(s,i,2) = '„') then	begin
-					sw	:=	True;
-					sp	:=	i;
-					i :=	i + 1;
-					chk :=	True;
-				end else
-				if	(sw) then begin
-					sx	:=	Copy(s,i,2);
-					if	(AnsiPos(sx, ZN) > 0)	then	begin
-						No	:=	No	+ ZenToHan(sx);
-					end else begin
-						if	(No <> '') and (No <> '-')	and (No <> '|') then	begin
-							Add(sp, i, No);
-						end;
-						sw	:=	False;
-						i := i - 1;
-						No	:=	'';
-					end;
-				end else begin
-					oc	:=	'';
-					chk :=	False;
-				end;
-				al	:=	False;
-			end;
-		end;
-		inc(i);
-		if	(i > Length(Body))	then	begin
-			if	(sw)	then	begin
-				if	(No <> '')	then	Add(sp, i, No);
-			end;
-			Break;
-		end;
-	end;
-	for i :=	List.Count - 1	downto	0 do	begin
-		if	(AnsiPos('-', PIndex(List[i]).FNo) > 0) then	begin
-			st	:=	ChooseString(PIndex(List[i]).FNo, '-', 0);
-			et	:=	ChooseString(PIndex(List[i]).FNo, '-', 1);
-		end else begin
-			st	:=	PIndex(List[i]).FNo;
-			et	:=	PIndex(List[i]).FNo;
-		end;
-		Result :=	Copy(Result,0, PIndex(List[i]).FIndexFrom - 1) +
-					Format('<a href="%s&%s=%s&%s=%s&%s=%s" target="_blank">',
-								[FullURL, ParamStart, st, ParamTo, et, ParamNoFirst, ParamTrue]) +
-					Copy(Result,PIndex(List[i]).FIndexFrom, PIndex(List[i]).FIndexTo - PIndex(List[i]).FIndexFrom) + '</A>' +
-					Copy(Result,PIndex(List[i]).FIndexTo,Length(Result));
-		Dispose(PIndex(List[i]));
-	end;
-	List.Free;
+	Result := Result + s;
 end;
 
 function THTMLCreate.ConvertResAnchor(res: string): string;
@@ -881,13 +509,9 @@ begin
 			UserOptionalStyle := GikoSys.SetUserOptionalStyle;
 			html.BeginUpdate;
 			try
-				//doc.open;
 				// ƒwƒbƒ_
-				//doc.Write( boardPlugIn.GetHeader( DWORD( threadItem ),
 				html.Append( boardPlugIn.GetHeader( DWORD( threadItem ),
 					'<style type="text/css">body {' + UserOptionalStyle + '}</style>' ));
-				//	'<style type="text/css">body {' + UserOptionalStyle + '}</style>' ) + #13#10 );
-				//doc.Write('<p id="idSearch"></p>' + #13#10 );
 				html.Add('<p id="idSearch"></p>');
 				for i := 0 to threadItem.Count - 1 do begin
 					// 1 ‚Í•K‚¸•\Ž¦
@@ -911,32 +535,24 @@ begin
 						try
 							if GikoSys.Setting.UseSkin then begin
 								if FileExists( GikoSys.GetSkinNewmarkFileName ) then
-									//doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
 									html.Append( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
 								else
 									//doc.Write( '<a name="new"></a>' + #13#10 );
 									html.Append( '<a name="new"></a>' );
 							end else if GikoSys.Setting.UseCSS then begin
-								//doc.Write('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>' + #13#10);
 								html.Append('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>');
 							end else begin
-								//doc.Write('</dl>');
 								html.Append('</dl>');
-								//doc.Write('<a name="new"></a>');
 								html.Append('<a name="new"></a>');
-								//doc.Write('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
 								html.Append('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
-								//doc.Write('<dl> + #13#10');
 								html.Append('<dl>');
 							end;
 						except
-							//doc.Write( '<a name="new"></a>' + #13#10);
 							html.Append( '<a name="new"></a>');
 						end;
 					end;
 
 					// ƒŒƒX
-					//doc.Write( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ) + #13#10 );
 					html.Append( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ) );
 
 					if ThreadItem.Kokomade = (i + 1) then begin
@@ -944,24 +560,17 @@ begin
 						try
 							if GikoSys.Setting.UseSkin then begin
 								if FileExists( GikoSys.GetSkinBookmarkFileName ) then
-									//doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
 									html.Append( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) )
 								else
-									//doc.Write( '<a name="koko"></a>' + #13#10 );
 									html.Append( '<a name="koko"></a>' );
 							end else if GikoSys.Setting.UseCSS then begin
-								//doc.Write('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>' + #13#10 );
 								html.Append('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>' );
 							end else begin
-								//doc.Write('</dl>');
 								html.Append('</dl>');
-								//doc.Write('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
 								html.Append('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
-								//doc.Write('<dl>' + #13#10 );
 								html.Append('<dl>' );
 							end;
 						except
-							//doc.Write( '<a name="koko"></a>' + #13#10 );
 							html.Append( '<a name="koko"></a>' );
 						end;
 					end;
@@ -969,10 +578,8 @@ begin
 
 
 				// ƒXƒLƒ“(ƒtƒbƒ^)
-				//doc.Write( boardPlugIn.GetFooter( DWORD( threadItem ), '<a name="bottom"></a>' ) + #13#10 );
 				html.Append( boardPlugIn.GetFooter( DWORD( threadItem ), '<a name="bottom"></a>' ) );
 			finally
-				//doc.Close;
 				html.EndUpdate;
 			end;
 
@@ -993,10 +600,7 @@ var
 	SkinNewRes: string;
 	SkinRes: string;
 	strTmp : string;
-	function ReplaceRes( skin: string ): string;
-	begin
-		Result := SkinedRes( skin, Res, No );
-	end;
+	threadKey : string;
 begin
 	if ThreadItem <> nil then begin
 		// ƒXƒLƒ“Žg—p
@@ -1005,7 +609,8 @@ begin
 			// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
 			UserOptionalStyle := GikoSys.SetUserOptionalStyle;
 			CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
-			//doc.open;
+
+			threadKey := ChangeFileExt(ThreadItem.FileName, '');
 			html.BeginUpdate;
 			try
 				//doc.charset := 'Shift_JIS';
@@ -1016,7 +621,6 @@ begin
 					if Length( UserOptionalStyle ) > 0 then
 						SkinHeader := CustomStringReplace( SkinHeader, '</head>',
 							'<style type="text/css">body {' + UserOptionalStyle + '}</style></head>');
-					//doc.Write( SkinHeader + #13#10);
 					html.Append( SkinHeader);
 				except
 				end;
@@ -1031,9 +635,7 @@ begin
 				except
 				end;
 
-				//doc.Write('<p id="idSearch"></p>' + #13#10);
 				html.Append('<p id="idSearch"></p>');
-				//doc.Write('<a name="top"></a>' + #13#10);
 				html.Append('<a name="top"></a>');
 
 				for i := 0 to ReadList.Count - 1 do begin
@@ -1052,18 +654,14 @@ begin
 								Continue;
 						end;
 					end;
-
 					// V’…ƒ}[ƒN
 					if (NewReceiveNo = i + 1) or ((NewReceiveNo = 0) and (i = 0)) then begin
 						try
 							if FileExists( GikoSys.GetSkinNewmarkFileName ) then
-								//doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size )  + #13#10)
 								html.Append( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ) )
 							else
-								//doc.Write( '<a name="new"></a>' + #13#10 );
 								html.Append( '<a name="new"></a>' );
 						except
-							//doc.Write( '<a name="new"></a>' + #13#10 );
 							html.Append( '<a name="new"></a>' );
 						end;
 					end;
@@ -1072,18 +670,17 @@ begin
 						No := IntToStr(i + 1);
 
 						Res := DivideStrLine(ReadList[i]);
-						Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, ChangeFileExt(ThreadItem.FileName, ''), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
+						Res.FBody := ConvRes(AddAnchorTag(Res.FBody), ThreadItem.ParentBoard.BBSID, threadKey, 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
 						Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
 
 						try
 							if NewReceiveNo <= (i + 1) then
 								// V’…ƒŒƒX
-								strTmp := ReplaceRes( SkinNewRes )
+								strTmp := SkinedRes( SkinNewRes, Res, No )
 							else
 								// ’ʏí‚̃ŒƒX
-								strTmp := ReplaceRes( SkinRes );
+								strTmp := SkinedRes( SkinRes, Res, No  );
 
-							//doc.Write( strTmp + #13#10 );
 							html.Append( strTmp );
 						except
 						end;
@@ -1093,28 +690,22 @@ begin
 						// ‚±‚±‚Ü‚Å“Ç‚ñ‚¾
 						try
 							if FileExists( GikoSys.GetSkinBookmarkFileName ) then
-								//doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
 								html.Append( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) )
 							else
-								//doc.Write( '<a name="koko"></a>' + #13#10 );
 								html.Append( '<a name="koko"></a>' );
 						except
-							//doc.Write( '<a name="koko"></a>' + #13#10 );
 							html.Append( '<a name="koko"></a>' );
 						end;
 					end;
 				end;
 
-				//doc.Write('<a name="bottom"></a>' + #13#10);
 				html.Append('<a name="bottom"></a>' );
 				// ƒXƒLƒ“(ƒtƒbƒ^)
 				try
-					//doc.Write( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) + #13#10 );
 					html.Append( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) );
 				except
 				end;
 			finally
-				//doc.close;
 				html.EndUpdate;
 			end;
 		end;
@@ -1325,6 +916,7 @@ begin
 
 				ReadList := TStringList.Create;
 				try
+					ReadList.BeginUpdate;
 					if ThreadItem.IsLogFile then begin
 						FileName := ThreadItem.GetThreadFileName;
 						ReadList.LoadFromFile(FileName);
@@ -1350,6 +942,7 @@ begin
 						CreateDefaultHTML(html, ThreadItem, ReadList, sTitle);
 					end;
 				finally
+                    ReadList.EndUpdate;
 					ReadList.Free;
 				end;
 			end;