* mixi.el (mixi-diary-owner-nick-regexp): Fix regexp.

(mixi-topic-owner-regexp): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 87ed83c..871ca53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-07  OHASHI Akira  <bg66@koka-in.org>
+
+       * mixi.el (mixi-diary-owner-nick-regexp): Fix regexp.
+       (mixi-topic-owner-regexp): Ditto.
+
 2006-12-05  OHASHI Akira  <bg66@koka-in.org>
 
        * sb-mixi.el (shimbun-mixi-logout-p): New user option.

diff --git a/mixi.el b/mixi.el
index af0e62c..98d8c56 100644 (file)
--- a/mixi.el
+++ b/mixi.el
@@ -962,11 +962,10 @@ Increase this value when unexpected error frequently occurs."
   `(concat "/view_diary.pl?id=" (mixi-diary-id ,diary)
           "&owner_id=" (mixi-friend-id (mixi-diary-owner ,diary))))
 
-;; FIXME: Remove `¤µ¤ó'.
 (defconst mixi-diary-closed-regexp
   "<td>ͧ¿Í\\(¤Îͧ¿Í\\)?¤Þ¤Ç¸ø³«¤Î¤¿¤áÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¡£</td></tr>")
 (defconst mixi-diary-owner-nick-regexp
-  "<td WIDTH=490 background=http://img\\.mixi\\.jp/img/bg_w\\.gif><b><font COLOR=#605048>\\(.+\\)\\(¤µ¤ó\\)?¤ÎÆüµ­</font></b></td>")
+  "<td WIDTH=490 background=http://img\\.mixi\\.jp/img/bg_w\\.gif><b><font COLOR=#605048>\\(.+?\\)\\(¤µ¤ó\\)?¤ÎÆüµ­</font></b></td>")
 (defconst mixi-diary-time-regexp
   "<td ALIGN=center ROWSPAN=2 NOWRAP WIDTH=95 bgcolor=#FFD8B0>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>\\([0-9]+\\):\\([0-9]+\\)</td>")
 (defconst mixi-diary-title-regexp
@@ -1372,9 +1371,8 @@ Increase this value when unexpected error frequently occurs."
   "<td rowspan=\"3\" width=\"110\" bgcolor=\"#ffd8b0\" align=\"center\" valign=\"top\" nowrap>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>\\([0-9]+\\):\\([0-9]+\\)</td>")
 (defconst mixi-topic-title-regexp
   "<td bgcolor=\"#fff4e0\">&nbsp;\\([^<]+\\)</td>")
-;; FIXME: Remove `¤µ¤ó'.
 (defconst mixi-topic-owner-regexp
-  "<td bgcolor=\"#fdf9f2\">&nbsp;<font color=\"#dfb479\"></font>&nbsp;<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)\\(¤µ¤ó\\)?</a>")
+  "<td bgcolor=\"#fdf9f2\">&nbsp;<font color=\"#dfb479\"></font>&nbsp;<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*?\\)\\(¤µ¤ó\\)?</a>")
 (defconst mixi-topic-content-regexp
   "<table width=\"500\" border=\"0\" cellspacing=\"0\" cellpadding=\"5\"><tr><td class=\"h120\"><table><tr>\\(<td width=\"130\" height=\"140\" align=\"center\" valign=\"middle\"><a href=\"javascript:void(0)\" onClick=\"MM_openBrWindow('show_bbs_picture\\.pl\\?id=[0-9]+&number=[0-9]+','pict','width=680,height=660,toolbar=no,scrollbars=yes,left=5,top=5')\"><img src=\"http://ic[0-9]+\\.mixi\\.jp/[^.]+\\.jpg\" border=\"0\"></a></td>\n\\)*</tr></table>\\(.+\\)</td></tr></table>")