From: bg66 <bg66>
Date: Mon, 25 Dec 2006 01:26:07 +0000 (+0000)
Subject: * mixi.el (mixi-event-time-regexp): Fix regexp.
X-Git-Tag: mixi-el-1_0_0~146
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=721f948f5dc8dcff0ebf362416d4409bb5402881;p=elisp%2Fmixi.git

* mixi.el (mixi-event-time-regexp): Fix regexp.
(mixi-event-title-regexp): Ditto.
(mixi-event-owner-regexp): Ditto.
(mixi-event-date-regexp): Ditto.
(mixi-event-place-regexp): Ditto.
(mixi-event-detail-regexp): Ditto.
(mixi-event-limit-regexp): Ditto.
(mixi-event-members-regexp): Ditto.
(mixi-realize-event): Follow the change above.
---

diff --git a/ChangeLog b/ChangeLog
index 4e0130b..9dc9cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2006-12-25  OHASHI Akira  <bg66@koka-in.org>
 
+	* mixi.el (mixi-event-time-regexp): Fix regexp.
+	(mixi-event-title-regexp): Ditto.
+	(mixi-event-owner-regexp): Ditto.
+	(mixi-event-date-regexp): Ditto.
+	(mixi-event-place-regexp): Ditto.
+	(mixi-event-detail-regexp): Ditto.
+	(mixi-event-limit-regexp): Ditto.
+	(mixi-event-members-regexp): Ditto.
+	(mixi-realize-event): Follow the change above.
+
+2006-12-25  OHASHI Akira  <bg66@koka-in.org>
+
 	* mixi.el (with-mixi-retrieve): Check whether on the login page
 	strictly.
 
diff --git a/mixi.el b/mixi.el
index 297ee96..fa11c4d 100644
--- a/mixi.el
+++ b/mixi.el
@@ -1626,35 +1626,38 @@ Increase this value when unexpected error frequently occurs."
 (defconst mixi-event-community-regexp
   "<td WIDTH=595 background=http://img\\.mixi\\.jp/img/bg_w\\.gif><b>\\[\\(.+\\)\\] ¥¤¥Ù¥ó¥È</b></td>")
 (defconst mixi-event-time-regexp
-  "<td ROWSPAN=11 BGCOLOR=#FFD8B0 ALIGN=center VALIGN=top WIDTH=110>
-\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>
-\\([0-9]+\\):\\([0-9]+\\)</td>")
+  "<td ROWSPAN=11 \\(BGCOLOR\\|bgcolor\\)=#FFD8B0 \\(ALIGN\\|align\\)=center \\(VALIGN\\|Valign\\)=top WIDTH=110>
+?\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>
+?\\([0-9]+\\):\\([0-9]+\\)</td>")
 (defconst mixi-event-title-regexp
-  "<td bgcolor=#FFF4E0 width=410>&nbsp;\\([^<]+\\)</td>")
+  "<td bgcolor=#FFF4E0\\( width=410\\)?>&nbsp;\\([^<]+\\)</td>")
 (defconst mixi-event-owner-regexp
-  "<td BGCOLOR=#FDF9F2>&nbsp;<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>")
+  "<td \\(BGCOLOR\\|bgcolor\\)=#FDF9F2>&nbsp;<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>")
 (defconst mixi-event-date-regexp
-  "<td BGCOLOR=#FFFFFF ALIGN=center NOWRAP>³«ºÅÆü»þ</td>
-<td BGCOLOR=#FFFFFF>
+  "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>³«ºÅÆü»þ</td>
+<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>
 &nbsp;\\(.+\\)
 </td>")
 (defconst mixi-event-place-regexp
-  "<td BGCOLOR=#FFFFFF ALIGN=center NOWRAP>³«ºÅ¾ì½ê</td>
-<td BGCOLOR=#FFFFFF>
+  "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>³«ºÅ¾ì½ê</td>
+<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>
 &nbsp;\\(.+\\)
 </td>")
 (defconst mixi-event-detail-regexp
-  "<td BGCOLOR=#FFFFFF ALIGN=center NOWRAP>¾ÜºÙ</td>
-<td BGCOLOR=#FFFFFF><table BORDER=0 CELLSPACING=0 CELLPADDING=5><tr><td CLASS=h120>\\(.+\\)</td></tr></table></td>")
+  "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>¾ÜºÙ</td>
+<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)><table BORDER=0 CELLSPACING=0 CELLPADDING=5><tr><td CLASS=h120>\\(.+\\)</td></tr></table></td>")
 (defconst mixi-event-limit-regexp
-  "<td BGCOLOR=#FFFFFF ALIGN=center NOWRAP>Ê罸´ü¸Â</td>
-<td BGCOLOR=#FFFFFF>&nbsp;\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü</td>")
+  "<td \\(BGCOLOR\\|bgcolor\\)=\"?#\\(FFFFFF\\|ffffff\\)\"? \\(ALIGN\\|align\\)=\"?center\"? NOWRAP>Ê罸´ü¸Â</td>
+?<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>&nbsp;\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü</td>")
 (defconst mixi-event-members-regexp
-  "<td BGCOLOR=#FFFFFF ALIGN=center NOWRAP>»²²Ã¼Ô</td>
-<td BGCOLOR=#FFFFFF>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH=100%>
+  "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>»²²Ã¼Ô</td>
+<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>
+
+?
+?<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH=100%>
 <tr>
-<td>&nbsp;\\(.+\\)</td>")
+
+?<td>&nbsp;\\(.+\\)</td>")
 
 (defun mixi-realize-event (event)
   "Realize a EVENT."
@@ -1664,39 +1667,39 @@ Increase this value when unexpected error frequently occurs."
       (if (string-match mixi-event-community-regexp buffer)
 	  (mixi-community-set-name (mixi-event-community event)
 				   (match-string 1 buffer))
-	(mixi-realization-error 'cannot-find-title event))
+	(mixi-realization-error 'cannot-find-community event))
       (if (string-match mixi-event-time-regexp buffer)
 	  (mixi-event-set-time
-	   event (encode-time 0 (string-to-number (match-string 5 buffer))
-			      (string-to-number (match-string 4 buffer))
-			      (string-to-number (match-string 3 buffer))
-			      (string-to-number (match-string 2 buffer))
-			      (string-to-number (match-string 1 buffer))))
+	   event (encode-time 0 (string-to-number (match-string 8 buffer))
+			      (string-to-number (match-string 7 buffer))
+			      (string-to-number (match-string 6 buffer))
+			      (string-to-number (match-string 5 buffer))
+			      (string-to-number (match-string 4 buffer))))
 	(mixi-realization-error 'cannot-find-time event))
       (if (string-match mixi-event-title-regexp buffer)
-	  (mixi-event-set-title event (match-string 1 buffer))
+	  (mixi-event-set-title event (match-string 2 buffer))
 	(mixi-realization-error 'cannot-find-title event))
       (if (string-match mixi-event-owner-regexp buffer)
 	  (mixi-event-set-owner event
-				(mixi-make-friend (match-string 1 buffer)
-						  (match-string 2 buffer)))
+				(mixi-make-friend (match-string 2 buffer)
+						  (match-string 3 buffer)))
 	(mixi-realization-error 'cannot-find-owner event))
       (if (string-match mixi-event-date-regexp buffer)
-	  (mixi-event-set-date event (match-string 1 buffer))
+	  (mixi-event-set-date event (match-string 6 buffer))
 	(mixi-realization-error 'cannot-find-date event))
       (if (string-match mixi-event-place-regexp buffer)
-	  (mixi-event-set-place event (match-string 1 buffer))
+	  (mixi-event-set-place event (match-string 6 buffer))
 	(mixi-realization-error 'cannot-find-place event))
       (if (string-match mixi-event-detail-regexp buffer)
-	  (mixi-event-set-detail event (match-string 1 buffer))
+	  (mixi-event-set-detail event (match-string 6 buffer))
 	(mixi-realization-error 'cannot-find-detail event))
       (when (string-match mixi-event-limit-regexp buffer)
 	(mixi-event-set-limit
-	 event (encode-time 0 0 0 (string-to-number (match-string 3 buffer))
-			    (string-to-number (match-string 2 buffer))
-			    (string-to-number (match-string 1 buffer)))))
+	 event (encode-time 0 0 0 (string-to-number (match-string 8 buffer))
+			    (string-to-number (match-string 7 buffer))
+			    (string-to-number (match-string 6 buffer)))))
       (if (string-match mixi-event-members-regexp buffer)
-	  (mixi-event-set-members event (match-string 1 buffer))
+	  (mixi-event-set-members event (match-string 6 buffer))
 	(mixi-realization-error 'cannot-find-members event)))
     (mixi-object-touch event)))