Commit: 038c75508bdbc1a042639a9d30a895e6205511e3 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 038c75508bdbc1a042639a9d30a895e6205511e3 (tree)
• Time: 2007-02-14 01:45:18
• Author: h677 <h677>
• Commiter: h677

Log Message

作りかけの新ＮＧワード機能が入ってしまっていたので、
IFDEF/IFNDEFで取り除いた。

Change Summary

• modified: HTMLCreate.pas
• modified: gikoNavi.res

Incremental Difference

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -771,8 +771,11 @@ begin
 		end;
 
 		if (Trim(ReadList[i]) <> '') then begin
+
 			DivideStrLine(ReadList[i], @Res);
+{$IFDEF NEWNGWORD}
             if (NGWordList.IsNG(@Res) = -1) then begin
+{$ENDIF}
     			AddAnchorTag(@Res);
 	    		ConvRes(@Res, @ResLink);
 		    	Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
@@ -783,11 +786,11 @@ begin
 	    		else
 		    		// ’ʏí‚̃ŒƒX
 			    	html.Add(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
+{$IFDEF NEWNGWORD}
             end else begin
-{$IFDEF DEBUG}
                 html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
-{$ENDIF}
             end;
+{$ENDIF}
 		end;
 
 		if ThreadItem.Kokomade = (i + 1) then begin
@@ -865,7 +868,9 @@ begin
 			if (Trim(ReadList[i]) <> '') then begin
 				No := IntToStr(i + 1);
 				DivideStrLine(ReadList[i], @Res);
+{$IFDEF NEWNGWORD}
                 if (NGWordList.IsNG(@Res) = -1) then begin
+{$ENDIF}
                     AddAnchorTag(@Res);
                     ConvRes(@Res, @ResLink);
                     Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
@@ -875,13 +880,12 @@ begin
                         html.Add(Format(FORMAT_SHOWMAIL, [No, No, No, Res.FMailTo, Res.FName, Res.FMailTo, Res.FDateTime, Res.FBody]))
                     else
                         html.Add(Format(FORMAT_NOSHOW, [No, No, No, Res.FMailTo, Res.FName, Res.FDateTime, Res.FBody]));
-			    end;
-            end else begin
-{$IFDEF DEBUG}
-                html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
+{$IFDEF NEWNGWORD}
+			    end else begin
+                    html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
+                end;
 {$ENDIF}
             end;
-
 			if ThreadItem.Kokomade = (i + 1) then begin
 				html.Add('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
 			end;
@@ -935,22 +939,24 @@ begin
 		if (Trim(ReadList[i]) <> '') then begin
 			No := IntToStr(i + 1);
 			DivideStrLine(ReadList[i], @Res);
-
-			AddAnchorTag(@Res);
-			ConvRes(@Res, @ResLink);
-			Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
-			if Res.FMailTo = '' then
-				html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
-			else if GikoSys.Setting.ShowMail then
-				html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
-			else
-				html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
-        end else begin
-{$IFDEF DEBUG}
+{$IFDEF NEWNGWORD}
+            if (NGWordList.IsNG(@Res) = -1) then begin
+{$ENDIF}
+			    AddAnchorTag(@Res);
+    			ConvRes(@Res, @ResLink);
+	    		Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
+		    	if Res.FMailTo = '' then
+			    	html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+    			else if GikoSys.Setting.ShowMail then
+	    			html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+		    	else
+			    	html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
+{$IFDEF NEWNGWORD}
+            end else begin
                 html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
+            end;
 {$ENDIF}
         end;
-
 		if ThreadItem.Kokomade = (i + 1) then begin
 			html.Add('</dl>');
 			html.Add('<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>');
@@ -996,7 +1002,9 @@ begin
 						ReadList.LoadFromFile(FileName);
 						ReadList.EndUpdate;
 						GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
-						//GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
+                        {$IFNDEF NEWNGWORD}
+						GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
+                        {$ENDIF}
 						GikoSys.FSelectResFilter.Execute(ReadList); //ƒŒƒX‚̃tƒBƒ‹ƒ^ƒŠƒ“ƒO‚ð‚·‚é
 						if ThreadItem.Title = '' then begin
 							DivideStrLine(ReadList[0], @Res);

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