From: bg66 <bg66>
Date: Sat, 11 Nov 2006 02:53:20 +0000 (+0000)
Subject: * mixi.el (mixi-topic-content-regexp): Fix regexp.
X-Git-Tag: cache-file-branchpoint~9
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a1c4e96bb540a10e4c5849105f91b8ea9d46aa29;p=elisp%2Fmixi.git

* mixi.el (mixi-topic-content-regexp): Fix regexp.
(mixi-topic-realize): Follow the change above.
(mixi-topic-comment-list-regexp): Fix regexp.
(mixi-diary-comment-list-regexp): Follow the change above.
(mixi-get-comments): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index b480119..76bc278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-11-11  OHASHI Akira  <bg66@koka-in.org>
 
+	* mixi.el (mixi-topic-content-regexp): Fix regexp.
+	(mixi-topic-realize): Follow the change above.
+	(mixi-topic-comment-list-regexp): Fix regexp.
+	(mixi-diary-comment-list-regexp): Follow the change above.
+	(mixi-get-comments): Ditto.
+
+2006-11-11  OHASHI Akira  <bg66@koka-in.org>
+
 	* mixi.el (mixi-topic-comment-list-page): Use `all' instead of '%d'.
 
 2006-11-10  OHASHI Akira  <bg66@koka-in.org>
diff --git a/mixi.el b/mixi.el
index a5c27f4..a0a4e43 100644
--- a/mixi.el
+++ b/mixi.el
@@ -1313,7 +1313,7 @@ Increase this value when unexpected error frequently occurs."
 (defconst mixi-topic-owner-regexp
   "<td bgcolor=\"#fdf9f2\">&nbsp;<font color=\"#dfb479\"></font>&nbsp;<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)\\(¤µ¤ó\\)?</a>")
 (defconst mixi-topic-content-regexp
-  "<td class=\"h120\"><table><tr>\\(.+\\)?\n?</tr></table>\\(.+\\)</td>")
+  "<td class=\"h120\"><table><tr>\\(.+\\)?\n?\\(.+\\)?\n?\\(.+\\)?\n?</tr></table>\\(.+\\)</td>")
 
 (defun mixi-topic-realize (topic)
   "Realize a TOPIC."
@@ -1337,7 +1337,7 @@ Increase this value when unexpected error frequently occurs."
 						  (match-string 2 buffer)))
 	(signal 'error (list 'cannot-find-owner topic)))
       (if (string-match mixi-topic-content-regexp buffer)
-	  (mixi-topic-set-content topic (match-string 2 buffer))
+	  (mixi-topic-set-content topic (match-string 4 buffer))
 	(signal 'error (list 'cannot-find-content topic))))
     (mixi-object-touch topic)))
 
@@ -1488,7 +1488,7 @@ Increase this value when unexpected error frequently occurs."
 <td ALIGN=center BGCOLOR=#FDF9F2 WIDTH=430>
 <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"410\">
 <tr>
-<td>
+\\(<td>\\)
 <a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
 
 \\(<font color=\"#f2ddb7\">|</font> <a href=[^>]+>ºï½ü</a>
@@ -1518,13 +1518,14 @@ Increase this value when unexpected error frequently occurs."
 <td rowspan=\"2\" width=\"110\" bgcolor=\"#f2ddb7\" align=\"center\" nowrap>
 \\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>
 \\([0-9]+\\):\\([0-9]+\\)<br>
-</td>
+\\(<input type=\"checkbox\" name=\"comment_id\" value=\".+\">
+\\|\\)</td>
 <td bgcolor=\"#fdf9f2\">&nbsp;<font color=\"#f8a448\">
 <b>[^<]+</b>:</font>&nbsp;
 \\(
-\\|\\)<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
+\\|\\) *<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
 
-\\(
+?\\(
 
 \\|\\)</td>
 </tr>
@@ -1554,7 +1555,7 @@ Increase this value when unexpected error frequently occurs."
 		  (funcall list-page parent) max-numbers regexp)))
       (mapcar (lambda (item)
 		(mixi-make-comment parent (mixi-make-friend
-					   (nth 6 item) (nth 7 item))
+					   (nth 7 item) (nth 8 item))
 				   (encode-time
 				    0
 				    (string-to-number (nth 4 item))
@@ -1562,7 +1563,7 @@ Increase this value when unexpected error frequently occurs."
 				    (string-to-number (nth 2 item))
 				    (string-to-number (nth 1 item))
 				    (string-to-number (nth 0 item)))
-				   (nth 9 item)))
+				   (nth 10 item)))
 	      items))))
 
 (defmacro mixi-new-comment-list-page ()