・スレタイの特定ワードを非表示にする機能に「©bbspink.com」も追加

[gikonavigoeson/gikonavi.git] / AddressHistory.pas

diff --git a/AddressHistory.pas b/AddressHistory.pas
index 44f09c9..1aba76d 100644 (file)
--- a/AddressHistory.pas
+++ b/AddressHistory.pas
@@ -4,11 +4,10 @@ interface
 
 uses
        SysUtils, Classes, {SAX, SAXHelpers, SAXComps, SAXKW,}
-       GikoSystem, {XMLIntf, XMLDoc}{, HttpApp} YofUtils;
+       GikoSystem, {XMLIntf, XMLDoc}{, HttpApp} GikoXMLDoc, YofUtils;
 
 type
        TAddressHistoryDM = class(TDataModule)
-               procedure DataModuleCreate(Sender: TObject);
        private
                { Private \90é\8c¾ }
                FReadCount: Integer;
@@ -34,13 +33,7 @@ const
 
 {$R *.dfm}
 
-procedure TAddressHistoryDM.DataModuleCreate(Sender: TObject);
-begin
-//
-end;
-
 procedure TAddressHistoryDM.ReadHistory(sl: TStrings; ReadCount: Integer);
-{
 var
        FileName: string;
        XMLDoc: IXMLDocument;
@@ -48,9 +41,8 @@ var
        HistoryNode: IXMLNode;
        i: Integer;
        s: string;
-}
 begin
-{
+
        sl.Clear;
        FReadCount := ReadCount;
 
@@ -58,26 +50,32 @@ begin
 
        if FileExists(FileName) then begin
                try
-                       XMLDoc := LoadXMLDocument(FileName);
-                       XMLNode := XMLDoc.DocumentElement;
-
-                       if XMLNode.NodeName = 'address' then begin
-                               for i := 0 to XMLNode.ChildNodes.Count - 1 do begin
-                                       HistoryNode := XMLNode.ChildNodes[i];
-                                       if HistoryNode.NodeName = 'history' then begin
-                                               if FReadCount >= sl.Count then begin
-                                                       s := Trim(HistoryNode.Attributes['url']);
-                                                       if s <> '' then
-                                                               sl.Add(s);
-                                                               //sl.Add(HttpDecode(s));
-                                               end;
-                                       end;
-                               end;
-                       end;
+            XMLDoc := IXMLDocument.Create;
+                       //XMLDoc := LoadXMLDocument(FileName);
+            LoadXMLDocument(FileName, XMLDoc);
+      try
+        XMLNode := XMLDoc.DocumentElement;
+
+        if XMLNode.NodeName = 'address' then begin
+          for i := 0 to XMLNode.ChildNodes.Count - 1 do begin
+            HistoryNode := XMLNode.ChildNodes[i];
+            if HistoryNode.NodeName = 'history' then begin
+              if FReadCount >= sl.Count then begin
+                s := Trim(HistoryNode.Attributes['url']);
+                if s <> '' then
+                  sl.Add(s);
+                  //sl.Add(HttpDecode(s));
+              end;
+            end;
+          end;
+        end;
+      finally
+        XMLDoc.Free;
+      end;
                except
                end;
        end;
-}
+
 //     AddressSAXHandler.OnStartDocument := SAXStartDocument;
 //     AddressSAXHandler.OnEndDocument := SAXEndDocument;
 //     AddressSAXHandler.OnStartElement := SAXStartElement;
@@ -103,7 +101,7 @@ var
 }
 begin
 {
-       XMLDoc :=  NewXMLDocument;
+       XMLDoc :=       NewXMLDocument;
        XMLDoc.Encoding := 'Shift_JIS';
        XMLDoc.StandAlone := 'yes';
        XMLNode := XMLDoc.AddChild('address');
@@ -130,7 +128,7 @@ begin
                SaveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
                SaveList.Add('<address>');
                for i := 0 to Count - 1 do begin
-                       SaveList.Add('<history url="' + HttpEncode(Trim(sl[i])) + '"/>');
+                       SaveList.Add('<history url="' + HtmlEncode(Trim(sl[i])) + '"/>');
                end;
                SaveList.Add('</address>');
                SaveList.SaveToFile(FileName);