Commit: 8fb597d13cdad42f021017653d7c60ba8939e37b - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 8fb597d13cdad42f021017653d7c60ba8939e37b (tree)
• Time: 2008-05-10 23:05:32
• Author: h677 <h677>
• Commiter: h677

Log Message

IDポップアップの処理見直し
件数取得を廃止

Change Summary

• modified: Giko.pas
• modified: GikoDataModule.pas
• modified: GikoSystem.pas

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -6771,11 +6771,9 @@ var
     doc : IHTMLDocument2;
     FOleInPlaceActiveObject: IOleInPlaceActiveObject;
 	p : TPoint;
-	AID: string;
-	stlist : TStringList;
-	i, count: Integer;
-	body : String;
-    limited : Integer;
+	AID, body: string;
+	stlist,	numbers : TStringList;
+    i, limited : Integer;
 begin
 	result := true;
     if not Assigned(FActiveContent) then
@@ -6823,22 +6821,26 @@ begin
 					stList.Free;
 				end;
 			end;
-			
-			count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
-			limited := LIMIT;
-			if not (GikoSys.Setting.LimitResCountMessage) then begin
-				limited := -1;
-			end else if (count > LIMIT) then begin
-				if (GikoUtil.MsgBox(Handle,
-						IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
-						'IDƒ|ƒbƒvƒAƒbƒvŒx',
-						MB_YESNO or MB_ICONQUESTION) = ID_YES) then begin
-					limited := -1;
-				end
-			end;
-
-			body := GikoSys.GetSameIDResAnchor(AID, FActiveContent.Thread, limited);
-			FActiveContent.IDAnchorPopup(body);
+			numbers := TStringList.Create;
+            try
+
+                GikoSys.GetSameIDRes(AID, FActiveContent.Thread, numbers);
+                limited := LIMIT;
+                if not (GikoSys.Setting.LimitResCountMessage) then begin
+                    limited := -1;
+                end else if (numbers.Count > LIMIT) then begin
+                    if (GikoUtil.MsgBox(Handle,
+                            IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
+                            'IDƒ|ƒbƒvƒAƒbƒvŒx',
+                            MB_YESNO or MB_ICONQUESTION) = ID_YES) then begin
+                        limited := -1;
+                    end
+                end;
+                body := GikoSys.CreateSameIDResAnchor(numbers, FActiveContent.Thread, limited);
+                FActiveContent.IDAnchorPopup(body);
+            finally
+                numbers.Free;
+            end;
 		end;
 	except
 	end;

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -2404,28 +2404,34 @@ const
     LIMIT = 20;
 var
 	ThreadItem : TThreadItem;
-	No, count: Integer;
+	No : Integer;
 	body : string;
 	limited: Integer;
+    numbers : TStringList;
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
 	ThreadItem := GikoForm.GetActiveContent(True);
 	if ThreadItem = nil then Exit;
-	count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread);
-	limited := LIMIT;
-    if not (GikoSys.Setting.LimitResCountMessage) then begin
-        limited := -1;
-    end else if count > LIMIT then begin
-		if ( GikoUtil.MsgBox(GikoForm.Handle,
-				IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
-				'IDƒ|ƒbƒvƒAƒbƒvŒx',
-				MB_YESNO or MB_ICONQUESTION) = ID_YES ) then begin
+    numbers := TStringList.Create;
+    try
+        GikoSys.GetSameIDRes(No, GikoForm.ActiveContent.Thread, numbers);
+        limited := LIMIT;
+        if not (GikoSys.Setting.LimitResCountMessage) then begin
             limited := -1;
+        end else if numbers.Count > LIMIT then begin
+            if ( GikoUtil.MsgBox(GikoForm.Handle,
+                    IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
+                    'IDƒ|ƒbƒvƒAƒbƒvŒx',
+                    MB_YESNO or MB_ICONQUESTION) = ID_YES ) then begin
+                limited := -1;
+            end;
         end;
-	end;
-	body := GikoSys.GetSameIDResAnchor(No, ThreadItem, limited);
-	GikoForm.ActiveContent.IDAnchorPopup(body);
+        body := GikoSys.CreateSameIDResAnchor(numbers, ThreadItem, limited);
+        GikoForm.ActiveContent.IDAnchorPopup(body);
+    finally
+        numbers.Free;
+    end;
 end;
 // *************************************************************************
 //! ‚±‚̃ŒƒX‚ ‚ځ`‚ñ@i’ʏíj

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -213,12 +213,9 @@ type
 		procedure GetPopupResNumber(URL : string; var stRes, endRes : Int64);
 
 		property Bayesian : TGikoBayesian read FBayesian write FBayesian;
-		function GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: Integer):string; overload;
-		function GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: Integer):string; overload;
+        function CreateSameIDResAnchor(var Numbers: TStringList; ThreadItem: TThreadItem; limited: Integer):string;
 		procedure GetSameIDRes(const AID : string; ThreadItem: TThreadItem;var body: TStringList); overload;
 		procedure GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList); overload;
-		function GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer; overload;
-		function GetSameIDResCount(AIDNum : Integer; ThreadItem: TThreadItem):Integer; overload;
         function GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
 		//! ’PŒê‰ðÍ
 		procedure SpamCountWord( const text : string; wordCount : TWordCount );
@@ -2751,20 +2748,18 @@ function TGikoSys.GetSambaFileName : string;
 begin
 	Result := Setting.GetSambaFileName;
 end;
-
 {!
-\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒAƒ“ƒJ[‚É‚µ‚Ä—ñ‹“
-\param AID        ŒÂl‚ð“Á’è‚·‚é“Še ID
+\brief —ñ‹“‚³‚ꂽƒŒƒX”ԍ†‚ւ̃Aƒ“ƒJ[—pHTMLì¬
+\param Numbers    —ñ‹“‚³‚ꂽƒŒƒX”ԍ†
 \param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
 \param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç1ˆÈã
 \return           —ñ‹“‚³‚ꂽƒŒƒXƒAƒ“ƒJ[
 }
-function TGikoSys.GetSameIDResAnchor(
-    const AID : string; ThreadItem: TThreadItem;
+function TGikoSys.CreateSameIDResAnchor(
+    var Numbers: TStringList; ThreadItem: TThreadItem;
     limited: Integer):string;
 var
 	i: integer;
-	body: TStringList;
     Res: TResRec;
     ResLink : TResLinkRec;
 begin
@@ -2772,29 +2767,22 @@ begin
     Res.FBody := '';
     Res.FType := glt2chNew;
 
-		Result := '';
-		if (not IsNoValidID(AID)) and
-			(ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
-				body := TStringList.Create;
-				try
-						GetSameIDRes(AID, ThreadItem, body);
-						if (limited > 0) and (body.Count > limited) then begin
-								for i := body.Count - limited to body.Count - 1 do begin
-										Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
-								end;
-						end else begin
-								for i := 0 to body.Count - 1 do begin
-										Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
-								end;
-						end;
-				finally
-						body.Free;
-				end;
+	Result := '';
+	if (Numbers <> nil) and (Numbers.Count > 0) then begin
+        if (limited > 0) and (Numbers.Count > limited) then begin
+            for i := Numbers.Count - limited to Numbers.Count - 1 do begin
+                Res.FBody := Res.FBody + '&gt;' + Numbers[i] + ' ';
+            end;
+        end else begin
+            for i := 0 to Numbers.Count - 1 do begin
+                Res.FBody := Res.FBody + '&gt;' + Numbers[i] + ' ';
+            end;
+        end;
         ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
         ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
         HTMLCreater.ConvRes(@Res, @ResLink, false);
         Result := Res.FBody;
-		end;
+    end;
 end;
 
 {!
@@ -2809,6 +2797,22 @@ var
 	ReadList: TStringList;
 	Res: TResRec;
 	boardPlugIn : TBoardPlugIn;
+
+    procedure CheckSameID(const AID:String; const Target: String; no: Integer);
+    var
+        pos: Integer;
+    begin
+        pos := AnsiPos('id:', LowerCase(Target));
+        if (pos > 0) then begin
+            if(AnsiPos(AID, Copy(Target, pos-1, Length(Target))) > 0) then begin
+                body.Add(IntToStr(no));
+            end;
+        end else begin
+            if(AnsiPos(AID, Target) > 0) then begin
+                body.Add(IntToStr(no));
+            end;
+        end;
+    end;
 begin
 	if (not IsNoValidID(AID)) and
     	(ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
@@ -2821,9 +2825,7 @@ begin
 			for i := 0 to threadItem.Count - 1 do begin
 				// ƒŒƒX
 				THTMLCreate.DivideStrLine(boardPlugIn.GetDat(DWORD( threadItem ), i + 1), @Res);
-				if(AnsiPos(AID, Res.FDateTime) > 0) then begin
-					body.Add(IntToStr(i+1));
-				end;
+                CheckSameID(AID, Res.FDateTime, i+1);
 			end;
 		end else begin
 			ReadList := TStringList.Create;
@@ -2831,9 +2833,7 @@ begin
 				ReadList.LoadFromFile(ThreadItem.GetThreadFileName);
 				for i := 0 to ReadList.Count - 1 do begin
 					THTMLCreate.DivideStrLine(ReadList[i], @Res);
-					if AnsiPos(AID, Res.FDateTime) > 0 then begin
-						body.Add(IntToStr(i+1));
-					end;
+                    CheckSameID(AID, Res.FDateTime, i+1);
 				end;
 			finally
 				ReadList.Free;
@@ -2846,50 +2846,6 @@ end;
 \brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ð—ñ‹“
 \param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
 \param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
-\param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç1ˆÈã
-\return
-}
-function TGikoSys.GetSameIDResAnchor(AIDNum : Integer;
-     ThreadItem: TThreadItem;
-     limited: Integer):string;
-var
-	i: integer;
-	body: TStringList;
-    Res: TResRec;
-    ResLink : TResLinkRec;
-begin
-    // bodyˆÈŠO‚ÍŽg—p‚µ‚È‚¢‚̂ŏ‰Šú‰»‚µ‚È‚¢
-    Res.FBody := '';
-    Res.FType := glt2chNew;
-
-	Result := '';
-	if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
-		body := TStringList.Create;
-		try
-			GetSameIDRes(AIDNum, ThreadItem, body);
-            if (limited > 0) and ( body.Count > limited) then begin
-                for i := body.Count - 20 to body.Count - 1 do begin
-                    Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
-                end;
-            end else begin
-    			for i := 0 to body.Count - 1 do begin
-	    			Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
-		    	end;
-            end;
-		finally
-			body.Free;
-		end;
-        ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
-        ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
-        HTMLCreater.ConvRes(@Res, @ResLink, false);
-        Result := Res.FBody;
-	end;
-end;
-
-{!
-\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ð—ñ‹“
-\param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
-\param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
 \param body       OUT:—ñ‹“‚³‚ꂽƒŒƒX”ԍ†‚ª•Ô‚é
 }
 procedure TGikoSys.GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList);
@@ -2950,51 +2906,6 @@ begin
 		end;
 	end;
 end;
-{!
-\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒJƒEƒ“ƒg
-\param AID        ŒÂl‚ð“Á’è‚·‚é“Še ID
-\param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
-\return           “¯‚¶ ID ‚ðŽ‚ÂƒŒƒX‚̐”
-}
-function TGikoSys.GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer;
-var
-	body: TStringList;
-begin
-    Result := 0;
-	if (not IsNoValidID(AID))
-     and (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
-		body := TStringList.Create;
-		try
-			GetSameIDRes(AID, ThreadItem, body);
-			Result := body.Count;
-		finally
-			body.Free;
-		end;
-	end;
-
-end;
-
-{!
-\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒJƒEƒ“ƒg
-\param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
-\param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
-\return           “¯‚¶ ID ‚ðŽ‚ÂƒŒƒX‚̐”
-}
-function TGikoSys.GetSameIDResCount(AIDNum : Integer; ThreadItem: TThreadItem):Integer;
-var
-	body: TStringList;
-begin
-	Result := 0;
-	if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
-		body := TStringList.Create;
-		try
-			GetSameIDRes(AIDNum, ThreadItem, body);
-            Result := body.Count;
-		finally
-			body.Free;
-		end;
-	end;
-end;
 
 {!
 \brief Žž‚ðŽ¦‚·•¶Žš—ñ‚Å‚Í–³‚¢‚©‚Ç‚¤‚©
@@ -3485,8 +3396,10 @@ begin
 end;
 
 procedure TGikoSys.ShowRefCount(msg: String; unk: IUnknown);
+{$IFDEF DEBUG}
 var
     count : integer;
+{$ENDIF}
 begin
     if not Assigned(unk) then
         Exit;