From: bg66 Date: Fri, 12 Jan 2007 07:02:53 +0000 (+0000) Subject: Revert the last change. X-Git-Tag: mixi-el-1_0_0~112 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=70d0224f944ac380e6a0b49a31d94a5e6fcf2d42;p=elisp%2Fmixi.git Revert the last change. --- diff --git a/ChangeLog b/ChangeLog index 76c0919..1fb6166 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,6 @@ 2007-01-12 OHASHI Akira - * 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 - " -\\([0-9]+\\)·î\\([0-9]+\\)Æü
\\([0-9]+\\):\\([0-9]+\\) - \\(.+\\)") + " 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 - "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) - -\\(.+\\) ([0-9]+) (\\(.+\\)) -") + "") (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)