X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=HTMLCreate.pas;h=ce950e16a4291aed01e09f28aecbfcf0bc738a4b;hb=400aff3fe001b58e9851a505be6866e685baf779;hp=8b9cfebeda115114614e508a92afc595ebf14606;hpb=81eb408750ae78b89e0ace879c7114d2896754d3;p=gikonavigoeson%2Fgikonavi.git

diff --git a/HTMLCreate.pas b/HTMLCreate.pas
index 8b9cfeb..ce950e1 100644
--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -600,6 +600,7 @@ const
 	_END: string = '&END=';
 var
 	i, j, k: Integer;
+    hpos, qpos : Integer;
 	tmp: string;
 	res: string;
 begin
@@ -627,10 +628,21 @@ begin
 		end else begin
 			k := LastDelimiter('/', tmp);
 			Delete(tmp, 1, k);
-			if AnsiPos('-', tmp) < AnsiPos('"', tmp) then
-				Delete(tmp, AnsiPos('-', tmp), Length(tmp))
-			else
-				Delete(tmp, AnsiPos('"', tmp), Length(tmp));
+            hpos := AnsiPos('-', tmp);
+            qpos := AnsiPos('"', tmp);
+            if ( (hpos > 0) and (qpos > 0) ) then begin
+                if ( qpos < hpos ) then begin
+                    Delete(tmp, qpos, Length(tmp));
+                end else begin
+                    Delete(tmp, hpos, Length(tmp));
+                end;
+            end else begin
+                if ( qpos > 0 ) then begin
+                    Delete(tmp, qpos, Length(tmp));
+                end else if ( qpos > 0 ) then begin
+                    Delete(tmp, hpos, Length(tmp));
+                end;
+            end;
 
 			PRes.FBody := PRes.FBody + '<a href="#' + tmp + '">';
 		end;
@@ -1459,10 +1471,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 +1482,7 @@ begin
 	if PRes.FBody = '' then
 		PRes.FBody := '&nbsp;';
 
-	PRes.FTitle := RemoveToken(Line, delimiter);
+	PRes.FTitle := MojuUtils.RemoveToken(Line, delimiter);
 end;
 
 {!
@@ -1489,7 +1501,7 @@ begin
     s1 := s;
     idx := AnsiPos(mark, s1);
     while idx <> 0 do begin
-        Result := Copy(s1, 1, idx - 1);
+        Result := Result + Copy(s1, 1, idx - 1);
         Delete(s1, 1, idx);
         // ƒ^ƒO‚̃Gƒ“ƒh‚ð’T‚·
         idx := AnsiPos('">', s1);