Commit: e65842accac2bc118eb9e3e46360536efdb0d0ca - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: e65842accac2bc118eb9e3e46360536efdb0d0ca (tree)
• Time: 2009-02-09 00:39:34
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_60_0_780'.

Change Summary

• modified: BoardGroup.pas
• modified: GikoBayesian.pas
• modified: GikoSystem.pas
• modified: HTMLCreate.pas
• modified: UpdateCheck.pas
• modified: gikoNavi.res
• modified: readme/gikoSetup.iss
• modified: readme/gikoUSetup.iss
• modified: readme/readme.txt

Incremental Difference

--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -279,7 +279,7 @@ type
 	public
 		constructor Create(const inPlugIn : TBoardPlugIn; const inBoard : TBoard; inURL : string ); overload;
 		constructor Create(const inPlugIn : TBoardPlugIn; const inBoard : TBoard;
-					 inURL : string; inExist: Boolean; const inFilename: string ); overload;
+					 const inURL : string; inExist: Boolean; const inFilename: string ); overload;
 
 		destructor Destroy; override;
 
@@ -1574,7 +1574,7 @@ end;
 constructor TThreadItem.Create(
 	const inPlugIn : TBoardPlugIn;
 	const inBoard : TBoard;
-	inURL : string;
+	const inURL : string;
 	inExist: Boolean;
 	const inFilename: string
 );
@@ -1589,7 +1589,7 @@ begin
 		// dat ‚Ì•Û‘¶ƒpƒX‚ðÝ’è
 		FileName	:= inFilename;
 		IsLogFile	:= inExist;
-		URL				:= GikoSys.Get2chBrowsableThreadURL( inURL );
+        URL				:= inURL;
 	end else begin
 		// ƒvƒ‰ƒOƒCƒ“‚É TThreadItem ‚ªì¬‚³‚ꂽ‚±‚Æ‚ð“`‚¦‚é
 		inPlugIn.CreateThreadItem( DWORD( Self ) );

--- a/GikoBayesian.pas
+++ b/GikoBayesian.pas
@@ -5,7 +5,7 @@ unit GikoBayesian;
 \brief	ƒxƒCƒWƒAƒ“ƒtƒBƒ‹ƒ^
 
 
-$Id: GikoBayesian.pas,v 1.21 2006/06/26 14:57:15 h677 Exp $
+$Id: GikoBayesian.pas,v 1.22 2009/01/31 15:47:15 h677 Exp $
 }
 
 //! •½‰¼–¼‚ðŽ«‘‚ÉŠÜ‚ß‚È‚¢
@@ -310,12 +310,12 @@ begin
 
 		for i := 1 to sl.Count - 1 do begin
 			s := sl[ i ];
-			name := RemoveToken( s, #1 );
+			name := GikoBayesian.RemoveToken( s, #1 );
 			info := TWordInfo.Create;
-			info.NormalWord			:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
-			info.ImportantWord	:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
-			info.NormalText 		:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
-			info.ImportantText	:= StrToIntDef( '$' + RemoveToken( s, #1 ), 0 );
+			info.NormalWord			:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
+			info.ImportantWord	:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
+			info.NormalText 		:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
+			info.ImportantText	:= StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 );
 
 			AddObject( name, info );
 		end;

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -181,7 +181,7 @@ type
 
 		procedure MenuFont(Font: TFont);
 
-		function RemoveToken(var s:string; const delimiter:string):string;
+//		function RemoveToken(var s:string; const delimiter:string):string;
 		function GetTokenIndex(s: string; delimiter: string; index: Integer): string;
 
 		function GetShortName(const LongName: string; ALength: integer): string;
@@ -264,7 +264,7 @@ const
 	ZERO_DATE: Integer	= 25569;
 	BETA_VERSION_NAME_E = 'beta';
 	BETA_VERSION_NAME_J = 'ÊÞÀ';
-	BETA_VERSION				= 59;
+	BETA_VERSION				= 60;
 	BETA_VERSION_BUILD	= '';				//!< debug”Å‚È‚Ç
 	APP_NAME						= 'gikoNavi';
 	BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
@@ -645,7 +645,7 @@ begin
 					end;
 				end;
 
-				ThreadItem.BeginUpdate;
+				//ThreadItem.BeginUpdate;
 				if (datFileCheck) and (islog) then
 					FileList.Delete( Index );
 
@@ -670,7 +670,7 @@ begin
 				Node := FavoriteDM.TreeView.Items.AddChildObject( FavoriteDM.TreeView.Items.Item[0], ThreadItem.Title, FavoThreadItem);
 				*}
 
-				ThreadItem.EndUpdate;
+				//ThreadItem.EndUpdate;
 				Board.Add(ThreadItem);
 
 				if (ThreadItem.UnRead) and (ThreadItem.IsLogFile) then
@@ -699,7 +699,7 @@ begin
 	Board.IsThreadDatRead := True;
 {$IFDEF DEBUG}
 	rt := GetTickCount - st;
-	Writeln('Read Done.' + IntToStr(rt) + ' ms');
+	Writeln('Read Done.' + Board.Title + ':' + IntToStr(rt) + ' ms');
 {$ENDIF}
 end;
 {!
@@ -943,7 +943,7 @@ begin
 	Result.FLastModified := IntToDateTime(StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), ZERO_DATE));
 	Result.FKokomade := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), -1);
 	Result.FNewReceive := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0);
-	RemoveToken(Line, #1);//9: ;	//–¢Žg—p
+	MojuUtils.RemoveToken(Line, #1);//9: ;	//–¢Žg—p
 	Result.FUnRead := IntToBool(StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0));
 	Result.FScrollTop := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0);
 	Result.FAllResCount := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0);
@@ -1098,8 +1098,8 @@ begin
 		Delim := ','
 	else
 		Delim := '<>';
-	Result.FFileName := RemoveToken(Line, Delim);
-	Result.FTitle := Trim(RemoveToken(Line, Delim));
+	Result.FFileName := MojuUtils.RemoveToken(Line, Delim);
+	Result.FTitle := Trim(MojuUtils.RemoveToken(Line, Delim));
 
 	ws := Result.FTitle;
 	if Copy(ws, Length(ws), 1) = ')' then begin
@@ -1363,7 +1363,7 @@ end;
 
 ‚Ç‚±‚©‚̃TƒCƒg‚©‚ç‚̃pƒNƒŠ
 }
-function TGikoSys.RemoveToken(var s: string;const delimiter: string): string;
+{function TGikoSys.RemoveToken(var s: string;const delimiter: string): string;
 var
 	p: Integer;
 begin
@@ -1374,7 +1374,7 @@ begin
 		Result := Copy(s, 1, p - 1);
 	Delete(s, 1, Length(Result) + Length(delimiter));
 end;
-
+}
 
 {!
 \brief n ŒÂ–ڂ̃g[ƒNƒ“‚ðØ‚èo‚µ
@@ -1390,7 +1390,7 @@ var
 begin
 	Result := '';
 	for i := 0 to index do
-		Result := RemoveToken(s, delimiter);
+		Result := MojuUtils.RemoveToken(s, delimiter);
 end;
 
 
@@ -1632,7 +1632,7 @@ begin
 	SI.cbReserved2 := 0;
 	SI.lpReserved2 := nil;
 	SI.dwysize		 := 0;
-	Windows.CreateProcess(nil,
+    if Windows.CreateProcess(nil,
 								PChar(Path),
 								nil,
 								nil,
@@ -1641,7 +1641,11 @@ begin
 								nil,
 								nil,
 								SI,
-								PI);
+								PI) then
+    begin
+        CloseHandle(PI.hProcess);
+    end;
+
 end;
 
 {!

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -1459,10 +1459,10 @@ begin
 		Line := CustomStringReplace(Line, '—M', ',');
 	end;
 	//Trim‚µ‚Ä‚Í‚¢‚¯‚È‚¢‹C‚ª‚·‚é@by‚à‚¶‚ã
-	PRes.FName := RemoveToken(Line, delimiter);
-	PRes.FMailTo := RemoveToken(Line, delimiter);
-	PRes.FDateTime := RemoveToken(Line, delimiter);
-	PRes.FBody := RemoveToken(Line, delimiter);
+	PRes.FName := MojuUtils.RemoveToken(Line, delimiter);
+	PRes.FMailTo := MojuUtils.RemoveToken(Line, delimiter);
+	PRes.FDateTime := MojuUtils.RemoveToken(Line, delimiter);
+	PRes.FBody := MojuUtils.RemoveToken(Line, delimiter);
 	//‚Q‚¿‚á‚ñ‚Ë‚é‚Æ‚©‚¾‚ƁA–{•¶‚̐擪‚É‚P‚”¼Šp‹ó”’‚ª“ü‚Á‚Ä‚¢‚é‚̂ō폜‚·‚é
 	//‘¼‚ÌŒfŽ¦”‚ŁAƒŒƒXŽ©‘Ì‚Ì‹ó”’‚©‚à‚µ‚ê‚È‚¢‚¯‚Ç‚»‚ê‚Í’ú‚ß‚é
 	PRes.FBody := TrimLeft(PRes.FBody);
@@ -1470,7 +1470,7 @@ begin
 	if PRes.FBody = '' then
 		PRes.FBody := ' ';
 
-	PRes.FTitle := RemoveToken(Line, delimiter);
+	PRes.FTitle := MojuUtils.RemoveToken(Line, delimiter);
 end;
 
 {!

--- a/UpdateCheck.pas
+++ b/UpdateCheck.pas
@@ -80,7 +80,7 @@ const
 	CHECK_URL = 'http://gikonavi.sourceforge.jp/updater/latest.txt';
 {$ENDIF}
 var
-    value : string;
+    value, url : string;
    	ResStream: TMemoryStream;
     downResult, current, newest: TStringList;
     newgiko: Boolean;
@@ -129,8 +129,10 @@ begin
                         newgiko := false;
                         // night build‚́Aƒrƒ‹ƒh”ԍ†‚¾‚¯‚Å”»’è‚·‚é
                         if (nightbuild) then begin
+                            url := downResult.Values[ 'n_url' ];
                             newgiko := StrToInt(current[3]) < StrToInt(newest[3]);
                         end else begin
+                            url := downResult.Values[ 'url' ];
                             newgiko := ( StrToInt(current[1]) < StrToInt(newest[1]) ) or
                                         ( (StrToInt(current[1]) = StrToInt(newest[1]))) and
                                             ((StrToInt(current[2]) < StrToInt(newest[2])) );
@@ -138,9 +140,8 @@ begin
                         if (newgiko) then begin
                             if GikoUtil.MsgBox(Handle, 'V‚µ‚¢ƒMƒRƒiƒr‚ª‚ ‚è‚Ü‚·Bƒ_ƒEƒ“ƒ[ƒh‚µ‚Ü‚·‚©H', 'XVŠm”F',
                                 MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin
-
-                                ResultMemo.Lines.Add('V‚µ‚¢ƒMƒRƒiƒr‚ª‚ ‚è‚Ü‚·Bƒ_ƒEƒ“ƒ[ƒh‚ðŠJŽn‚µ‚Ü‚·B' + downResult.Values[ 'url' ]);
-                                DonwloadUpdate(Trim(downResult.Values[ 'url' ]));
+                                ResultMemo.Lines.Add('V‚µ‚¢ƒMƒRƒiƒr‚ª‚ ‚è‚Ü‚·Bƒ_ƒEƒ“ƒ[ƒh‚ðŠJŽn‚µ‚Ü‚·B' + url);
+                                DonwloadUpdate(Trim(url));
                                 Result := True;
                             end;
                         end else begin

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -13,8 +13,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.58.1.764
-OutputBaseFilename=gikoNavi_b58_setup
+VersionInfoVersion=1.59.1.778
+OutputBaseFilename=gikoNavi_b59_setup
 
 
 [Tasks]

--- a/readme/gikoUSetup.iss
+++ b/readme/gikoUSetup.iss
@@ -18,8 +18,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.59.0.778
-OutputBaseFilename=gikoNavi_b59_778_usetup
+VersionInfoVersion=1.60.0.779
+OutputBaseFilename=gikoNavi_b60_779_usetup
 CreateUninstallRegKey=no
 
 [Tasks]

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ59 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ60 Readme.txt
 
 
 ------------------------------
@@ -108,8 +108,19 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2008/XX/XX
+2009/XX/YY
+  Version ÊÞÀ60
+
+
+2009/02/01
   Version ÊÞÀ59
+  ƒŒƒX–{•¶’†‚ÉAƒ^ƒOˆÈŠO‚̃^ƒO‚ªŠÜ‚Ü‚ê‚é‚ƁAƒŒƒXƒ|ƒbƒvƒAƒbƒv‚ŁA–{•¶‚ªŒ‡‚¯‚é•s‹ï‡‚̏C³ 
+  ƒMƒRƒiƒrXV‹@”\’ljÁ
+  ƒƒCƒ“ƒtƒH[ƒ€‚Å—˜—p‚µ‚Ä‚¢‚éƒAƒCƒRƒ“‚̉摜‚ð·‚µ‘Ö‚¦‚ê‚é‚悤‚ɏC³
+  •Û‘¶‚µ‚½ƒ^ƒu‚̃ƒO‚ª‘¶Ý‚µ‚È‚¢ê‡‚É‚±‚¯‚é–â‘è‚̏C³
+  RoundBoard.2chARoundItem.2ch‚Ì“à—e‚ª‚Ps‚à‚È‚¢ê‡ƒNƒ‰ƒbƒVƒ…‚·‚éƒoƒO‚̏C³
+  ‘O‰ñ“ŠeŽž‚ÆIPƒAƒhƒŒƒXiƒzƒXƒg–¼j‚ª•Ï‚í‚Á‚Ä‚¢‚é‚Æ‚«‚ɁACookieî•ñ‚ª‹ó‚É‚È‚é•s‹ï‡‚̏C³
+  ‚µ‚½‚ç‚ÎJBBS‚̉ߋŽƒƒO‚ŁA“Še“ú+ID‚Ì‘O‚É"“Še“úF"‚Ì•¶Žš—ñ‚ª‚È‚¢ê‡‚ɑΉž
   
 2008/09/16
   Version ÊÞÀ58