OSDN Git Service

This commit was manufactured by cvs2svn to create branch 'Bb62'.
[gikonavigoeson/gikonavi.git] / ExternalThreadItem.pas
index bd5da1e..18d2c10 100644 (file)
@@ -31,7 +31,8 @@ type
                tipDownloadHost,                                // : string                     // \8d¡\82Ì\83z\83X\83g\82Æ\88á\82¤\8fê\8d\87\82Ì\83z\83X\83g
                tipAgeSage,                                                     // : TThreadAgeSage     // \83A\83C\83e\83\80\82Ì\8fã\82°\89º\82°
                tipURL,                                                                 // : string                     // \83X\83\8c\83b\83h\82ð\83u\83\89\83E\83U\82Å\95\\8e¦\82·\82é\8dÛ\82Ì URL
-               tipFilePath                                                     // : string                     // \82±\82Ì\83X\83\8c\82ª\95Û\91\82³\82ê\82Ä\82¢\82é\83p\83X
+               tipFilePath,                                                    // : string                     // \82±\82Ì\83X\83\8c\82ª\95Û\91\82³\82ê\82Ä\82¢\82é\83p\83X
+               tipJumpAddress                                                  // : Integer            // JUMP\90æ\83\8c\83X\94Ô\8d\86
        );
 
        // *************************************************************************
@@ -168,6 +169,8 @@ begin
                        Result := DWORD( CreateResultString( threadItem.URL ) );
                tipFilePath:                                                                                                            // \82±\82Ì\83X\83\8c\82ª\95Û\91\82³\82ê\82Ä\82¢\82é\83p\83X
                        Result := DWORD( CreateResultString( threadItem.FilePath ) );
+               tipJumpAddress:
+                       Result := threadItem.JumpAddress;
        else
                Result := 0;
        end;
@@ -228,6 +231,8 @@ begin
                        threadItem.URL                                  := string( PChar( param ) );
                //tipFilePath:                                          // : string                     // \82±\82Ì\83X\83\8c\82ª\95Û\91\82³\82ê\82Ä\82¢\82é\83p\83X
                //      threadItem.FilePath                     := string( PChar( param ) );
+               tipJumpAddress:
+                       threadItem.JumpAddress          := param;
        end;
 
 end;
@@ -290,32 +295,35 @@ var
        threadItem : TThreadItem;
        res : TResRec;
        no : string;
+       resLink : TResLinkRec;
 begin
 
        threadItem      := TThreadItem( inInstance );
        // \88ø\90\94\82ð\95ª\89ð
-       res                                     := DivideStrLine( string( inDatRes ) );
-    if AnsiCompareStr( string( inDatRes ) , '' ) <> 0 then begin
-               res.FBody               := GikoSys.DeleteLink(res.FBody);
-               res.FBody               := GikoSys.AddAnchorTag( res.FBody );
-               res.FBody               := HTMLCreater.ConvRes( res.FBody, threadItem.ParentBoard.BBSID, ChangeFileExt( threadItem.FileName, '' ), 'bbs', 'key', 'st', 'to', 'nofirst', 'true');
-
-        no                                     := IntToStr( inResNo );
-
-        try
-            if GikoSys.Setting.UseSkin then begin
-                // \83X\83L\83\93
-                if inIsNew then
+       THTMLCreate.DivideStrLine( string( inDatRes ) , @res);
+       if AnsiCompareStr( string( inDatRes ) , '' ) <> 0 then begin
+               res.FBody               := THTMLCreate.DeleteLink(res.FBody);
+               resLink.FBbs    := threadItem.ParentBoard.BBSID;
+               resLink.FKey    := ChangeFileExt( threadItem.FileName, '' );
+               HTMLCreater.AddAnchorTag( @res );
+               HTMLCreater.ConvRes( @res, @resLink );
+
+               no                                      := IntToStr( inResNo );
+
+               try
+                       if GikoSys.Setting.UseSkin then begin
+                               // \83X\83L\83\93
+                               if inIsNew then
                                        Result := CreateResultString( HTMLCreater.SkinedRes(
                                                HTMLCreater.LoadFromSkin(
-                            GikoSys.Setting.GetSkinNewResFileName, threadItem, threadItem.Size
-                        ), res, no
+                            GikoSys.GetSkinNewResFileName, threadItem, threadItem.Size
+                                               ), @res, no
                     ) )
                 else
                                        Result := CreateResultString( HTMLCreater.SkinedRes(
                                                HTMLCreater.LoadFromSkin(
-                            GikoSys.Setting.GetSkinResFileName, threadItem, threadItem.Size
-                        ), res, no
+                            GikoSys.GetSkinResFileName, threadItem, threadItem.Size
+                        ), @res, no
                     ) );
             end else if GikoSys.Setting.UseCSS then begin
                 // CSS
@@ -387,7 +395,7 @@ begin
        try
                if GikoSys.Setting.UseSkin then begin
                        // \83X\83L\83\93
-                       skinHeader := HTMLCreater.LoadFromSkin( GikoSys.Setting.GetSkinHeaderFileName, threadItem, threadItem.Size );
+                       skinHeader := HTMLCreater.LoadFromSkin( GikoSys.GetSkinHeaderFileName, threadItem, threadItem.Size );
                        if Length( optionalHeader ) > 0 then
                                skinHeader :=
                                        StringReplace( skinHeader, '</head>', optionalHeader + '</head><a name="top"></a>', [] );
@@ -443,7 +451,7 @@ begin
        try
                if GikoSys.Setting.UseSkin then begin
                        // \83X\83L\83\93
-                       skinFooter := HTMLCreater.LoadFromSkin( GikoSys.Setting.GetSkinFooterFileName, threadItem, threadItem.Size );
+                       skinFooter := HTMLCreater.LoadFromSkin( GikoSys.GetSkinFooterFileName, threadItem, threadItem.Size );
                        if Length( optionalFooter ) > 0 then
                                skinFooter :=
                                        StringReplace( skinFooter, '</body>', optionalFooter + '</body>', [] );