From: bg66 <bg66>
Date: Tue, 9 Oct 2007 02:14:14 +0000 (+0000)
Subject: (mixi-event-owner-regexp): Fix regexp.
X-Git-Tag: mixi-el-1_0_0~10
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60cb0d1b1f0871851b9de423cf3bd91a2d8e09df;p=elisp%2Fmixi.git

(mixi-event-owner-regexp): Fix regexp.
(mixi-realize-event): Follow the change avobe.
---

diff --git a/ChangeLog b/ChangeLog
index f5fb603..6155bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-09  OHASHI Akira  <bg66@koka-in.org>
+
+	* mixi.el (mixi-event-owner-regexp): Fix regexp.
+	(mixi-realize-event): Follow the change avobe.
+
 2007-10-07  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* mixi-wl.el (mixi-wl-setup-draft-buffer): Avoid error when there is
diff --git a/mixi.el b/mixi.el
index 9385314..d9a04ee 100644
--- a/mixi.el
+++ b/mixi.el
@@ -135,7 +135,7 @@
   (autoload 'w3m-retrieve "w3m")
   (autoload 'url-retrieve-synchronously "url"))
 
-(defconst mixi-revision "$Revision: 1.169 $")
+(defconst mixi-revision "$Revision: 1.170 $")
 
 (defgroup mixi nil
   "API library for accessing to mixi."
@@ -1919,9 +1919,9 @@ Increase this value when unexpected error frequently occurs."
   "<dt>³«ºÅ¾ì½ê</dt>
 <dd>\\(.+\\)</dd>")
 (defconst mixi-event-owner-regexp
-  "<dt><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a></dt>")
+  "<dt>\\((mixi Âà²ñºÑ)\\|<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>\\)</dt>")
 (defconst mixi-event-owner-seceded-regexp
-  "<dt>\\((mixi Âà²ñºÑ)\\)</dt>")
+  "(mixi Âà²ñºÑ)")
 (defconst mixi-event-detail-regexp
   "<dd>\\(\\(.\\|\r?\n\\)*?\\)</dd>
 </dl>")
@@ -1960,12 +1960,12 @@ Increase this value when unexpected error frequently occurs."
 	    (mixi-event-set-place event (match-string 1))
 	  (mixi-realization-error 'cannot-find-place event))
 	(if (re-search-forward mixi-event-owner-regexp nil t)
-	    (mixi-event-set-owner event (mixi-make-friend (match-string 1)
-							  (match-string 2)))
-	  (if (re-search-forward mixi-event-owner-seceded-regexp nil t)
-	      (mixi-event-set-owner event
-				    (mixi-make-friend nil (match-string 1)))
-	    (mixi-realization-error 'cannot-find-owner event)))
+	    (let ((id (match-string 1))
+		  (nick (match-string 2)))
+	      (if (string-match mixi-event-owner-seceded-regexp id)
+		  (mixi-event-set-owner event (mixi-make-friend nil id))
+		(mixi-event-set-owner event (mixi-make-friend id nick))))
+	  (mixi-realization-error 'cannot-find-owner event))
 	(if (re-search-forward mixi-event-detail-regexp nil t)
 	    (mixi-event-set-detail event (match-string 1))
 	  (mixi-realization-error 'cannot-find-detail event))