From 70d0224f944ac380e6a0b49a31d94a5e6fcf2d42 Mon Sep 17 00:00:00 2001
From: bg66 <bg66>
Date: Fri, 12 Jan 2007 07:02:53 +0000
Subject: [PATCH] Revert the last change.

---
 ChangeLog |   10 +---------
 mixi.el   |   59 ++++++++++++-----------------------------------------------
 2 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76c0919..1fb6166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,6 @@
 2007-01-12  OHASHI Akira  <bg66@koka-in.org>
 
-	* mixi.el (mixi-bbs-list-regexp): Fix regexp.
-	(mixi-get-bbses): Follow the change above.
-	(mixi-topic-time): Ditto.
-	(mixi-topic-title): Ditto.
-	(mixi-event-time): Ditto.
-	(mixi-event-title): Ditto.
-	(mixi-new-bbs-list-regexp): Fix regexp.
-	(mixi-get-new-bbses): Follow the change above.
-	(mixi-search-diary-list-page): Fix typo.
+	* mixi.el (mixi-search-diary-list-page): Fix typo.
 	(mixi-search-community-list-page): Ditto.
 	(mixi-search-bbs-list-page): Ditto.
 
diff --git a/mixi.el b/mixi.el
index 0d8d0c1..fdd5a1b 100644
--- a/mixi.el
+++ b/mixi.el
@@ -1711,16 +1711,14 @@ Increase this value when unexpected error frequently occurs."
   "Return the time of TOPIC."
   (unless (mixi-topic-p topic)
     (signal 'wrong-type-argument (list 'mixi-topic-p topic)))
-  (unless (aref (cdr topic) 3)
-    (mixi-realize-topic topic))
+  (mixi-realize-topic topic)
   (aref (cdr topic) 3))
 
 (defun mixi-topic-title (topic)
   "Return the title of TOPIC."
   (unless (mixi-topic-p topic)
     (signal 'wrong-type-argument (list 'mixi-topic-p topic)))
-  (unless (aref (cdr topic) 4)
-    (mixi-realize-topic topic))
+  (mixi-realize-topic topic)
   (aref (cdr topic) 4))
 
 (defun mixi-topic-owner (topic)
@@ -1920,16 +1918,14 @@ Increase this value when unexpected error frequently occurs."
   "Return the time of EVENT."
   (unless (mixi-event-p event)
     (signal 'wrong-type-argument (list 'mixi-event-p event)))
-  (unless (aref (cdr event) 3)
-    (mixi-realize-event event))
+  (mixi-realize-event event)
   (aref (cdr event) 3))
 
 (defun mixi-event-title (event)
   "Return the title of EVENT."
   (unless (mixi-event-p event)
     (signal 'wrong-type-argument (list 'mixi-event-p event)))
-  (unless (aref (cdr event) 4)
-    (mixi-realize-event event))
+  (mixi-realize-event event)
   (aref (cdr event) 4))
 
 (defun mixi-event-owner (event)
@@ -2050,9 +2046,7 @@ Increase this value when unexpected error frequently occurs."
 	   "&id=" (mixi-community-id ,community)))
 
 (defconst mixi-bbs-list-regexp
-  "<tr VALIGN=top>
-<td ALIGN=center ROWSPAN=3 NOWRAP bgcolor=#FFD8B0>\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>\\([0-9]+\\):\\([0-9]+\\)</td>
-<td bgcolor=#FFF4E0>&nbsp;<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comm_id=[0-9]+\">\\(.+\\)</a></td></tr>")
+  "<a href=view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)")
 
 (defun mixi-get-bbses (community &optional range)
   "Get bbese of COMMUNITY."
@@ -2060,38 +2054,20 @@ Increase this value when unexpected error frequently occurs."
     (signal 'wrong-type-argument (list 'mixi-community-p community)))
   (let ((items (mixi-get-matched-items (mixi-bbs-list-page community)
 				       mixi-bbs-list-regexp
-				       range))
-	(year (nth 5 (decode-time (current-time))))
-	(month (nth 4 (decode-time (current-time)))))
+				       range)))
     (mapcar (lambda (item)
-	      (let ((name (nth 4 item))
-		    (month-of-item (string-to-number (nth 0 item)))
-		    (title (nth 6 item)))
+	      (let ((name (nth 0 item)))
 		(when (string= name "bbs")
 		  (setq name "topic"))
-		(when (> month-of-item month)
-		  (decf year))
-		(setq month month-of-item)
-		(when (string-match "^\\[¥¤¥Ù¥ó¥È\\]\\(.+\\)" title)
-		  (setq title (match-string 1 title)))
 		(let ((func (intern (concat "mixi-make-" name))))
-		  (funcall func community (nth 5 item)
-			   (encode-time
-			    0 (string-to-number (nth 3 item))
-			    (string-to-number (nth 2 item))
-			    (string-to-number (nth 1 item))
-			    month year)
-			   title))))
+		  (funcall func community (nth 1 item)))))
 	    items)))
 
 (defmacro mixi-new-bbs-list-page ()
   `(concat "/new_bbs.pl?page=%d"))
 
 (defconst mixi-new-bbs-list-regexp
-  "<td WIDTH=180><img src=http://img\\.mixi\\.jp/img/pen_r\\.gif ALIGN=left WIDTH=14 HEIGHT=16>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</td>
-<td WIDTH=450>
-<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=[0-9]+&comm_id=\\([0-9]+\\)\" class=\"new_link\">\\(.+\\) ([0-9]+)</a> (\\(.+\\))
-</td>")
+  "<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=[0-9]+&comm_id=\\([0-9]+\\)\" class=\"new_link\">")
 
 (defun mixi-get-new-bbses (&optional range)
   "Get new topics."
@@ -2099,23 +2075,12 @@ Increase this value when unexpected error frequently occurs."
 				       mixi-new-bbs-list-regexp
 				       range)))
     (mapcar (lambda (item)
-	      (let ((name (nth 5 item))
-		    (title (nth 8 item)))
+	      (let ((name (nth 0 item)))
 		(when (string= name "bbs")
 		  (setq name "topic"))
-		(when (string-match "^\\[¥¤¥Ù¥ó¥È\\]\\(.+\\)" title)
-		  (setq title (match-string 1 title)))
 		(let ((func (intern (concat "mixi-make-" name))))
-		  (funcall func (mixi-make-community
-				 (nth 7 item) (nth 9 item))
-			   (nth 6 item)
-			   (encode-time
-			    0 (string-to-number (nth 4 item))
-			    (string-to-number (nth 3 item))
-			    (string-to-number (nth 2 item))
-			    (string-to-number (nth 1 item))
-			    (string-to-number (nth 0 item)))
-			   title))))
+		  (funcall func (mixi-make-community (nth 2 item))
+			   (nth 1 item)))))
 	    items)))
 
 (defmacro mixi-search-bbs-list-page (keyword)
-- 
1.7.10.4