Commit: 8b9cdb000bccef82f5e9a23e879158c3cdfabe76 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 8b9cdb000bccef82f5e9a23e879158c3cdfabe76 (tree)
• Time: 2008-07-06 22:29:17
• Author: h677 <h677>
• Commiter: h677

Log Message

まちBBSの新URL（PATH_INFO）に対応

Change Summary

• modified: res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
• modified: res/ExternalBoardPlugIn/MachiBBSPlugIn.res

Incremental Difference

--- a/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
@@ -83,7 +83,7 @@ const
 	MAJOR_VERSION			= 1;
 	MINOR_VERSION			= 0;
 	RELEASE_VERSION		= 'beta';
-	REVISION_VERSION	= 18;
+	REVISION_VERSION	= 19;
 
 // =========================================================================
 // ŽG—pŠÖ”
@@ -269,6 +269,7 @@ var
 const
 	BBS_HOST		= 'machi.to';
 	THREAD_MARK	= '/bbs/read.pl';
+    THREAD_MARK2= '/bbs/read.cgi';
 begin
 
 	try
@@ -280,6 +281,10 @@ begin
 			foundPos := AnsiPos( BBS_HOST, uri.Host );
 			if (foundPos > 0) and (Length( uri.Host ) - foundPos + 1 = Length( BBS_HOST )) then begin
 				foundPos := Pos( THREAD_MARK, inURL );
+                if (foundPos = 0) then begin
+                    // VURL‘Ήž
+                    foundPos := Pos( THREAD_MARK2, inURL );
+                end;
 				if foundPos > 0 then
 					Result := atThread
 				else if (uriList.Count > 1) and (uri.Path <> '/') then	// ÅŒã‚ª '/' ‚ŕ‚߂ç‚ê‚Ä‚é‚È‚ç 3
@@ -309,9 +314,10 @@ procedure OnExtractBoardURL(
 var
 	uri			: TIdURI;
 	uriList		: TStringList;
-	URL			: String;
+	URL         : String;
 const
 	THREAD_MARK	= '/bbs/read.pl';
+    THREAD_MARK2= '/bbs/read.cgi';
 begin
 	URL := string(inURL);
 	if AnsiPos(THREAD_MARK, URL) > 0 then begin
@@ -333,6 +339,27 @@ begin
 			uri.Free;
 			uriList.Free;
 		end;
+    end else if AnsiPos(THREAD_MARK2, URL) > 0 then begin
+		if Copy( inURL, Length( inURL ), 1 ) = '/' then
+			uri := TIdURI.Create( URL )
+		else
+			uri := TIdURI.Create( URL + '/' );
+
+        uriList := TStringList.Create;
+		try
+			// http://kanto.machi.to/bbs/read.cgi/kana/1215253035/l50
+			// http://kanto.machi.to/kana/
+            uriList.Delimiter := '/';
+            uriList.DelimitedText  := uri.Path;
+			URL := uri.Protocol + '://' + uri.Host + '/';
+            if (uriList.Count >= 4) then begin
+                URL := URL + uriList[3] + '/';
+            end;
+			outURL := CreateResultString(URL);
+		finally
+			uri.Free;
+            uriList.Free;
+		end;
 	end else begin
     	outURL := CreateResultString(URL);
 	end;
@@ -873,6 +900,8 @@ var
 	uri				: TIdURI;
 	uriList		: TStringList;
 	foundPos	: Integer;
+const
+    THREAD_MARK2= '/bbs/read.cgi';
 begin
 
 	foundPos := AnsiPos( '?', URL );
@@ -888,7 +917,26 @@ begin
 			uri.Free;
 			uriList.Free;
 		end;
-	end;
+	end else begin
+        // VŒ`Ž® ?
+        foundPos := AnsiPos(THREAD_MARK2, URL);
+    	if (foundPos > 0) then begin
+            uri := TIdURI.Create( URL );
+            uriList := TStringList.Create;
+            try
+                uriList.Delimiter := '/';
+                uriList.DelimitedText  := uri.Path;
+                if (uriList.Count >= 5) then begin
+    			    Result :=
+	    			    uri.Protocol + '://' + uri.Host + '/bbs/read.pl?' +
+		    		    'BBS=' + uriList[3] + '&KEY=' + uriList[4];
+                end;
+            finally
+    			uri.Free;
+	    		uriList.Free;
+            end;
+        end;
+    end;
 
 end;
 

Binary files a/res/ExternalBoardPlugIn/MachiBBSPlugIn.res and b/res/ExternalBoardPlugIn/MachiBBSPlugIn.res differ