From 721f948f5dc8dcff0ebf362416d4409bb5402881 Mon Sep 17 00:00:00 2001 From: bg66 Date: Mon, 25 Dec 2006 01:26:07 +0000 Subject: [PATCH] * 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. --- ChangeLog | 12 +++++++++++ mixi.el | 69 ++++++++++++++++++++++++++++++++----------------------------- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e0130b..9dc9cc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2006-12-25 OHASHI Akira + * 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 + * 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 "\\[\\(.+\\)\\] ¥¤¥Ù¥ó¥È") (defconst mixi-event-time-regexp - " -\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
-\\([0-9]+\\):\\([0-9]+\\)") + " +?\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
+?\\([0-9]+\\):\\([0-9]+\\)") (defconst mixi-event-title-regexp - " \\([^<]+\\)") + " \\([^<]+\\)") (defconst mixi-event-owner-regexp - " \\(.*\\)") + " \\(.*\\)") (defconst mixi-event-date-regexp - "³«ºÅÆü»þ - + "³«ºÅÆü»þ +  \\(.+\\) ") (defconst mixi-event-place-regexp - "³«ºÅ¾ì½ê - + "³«ºÅ¾ì½ê +  \\(.+\\) ") (defconst mixi-event-detail-regexp - "¾ÜºÙ -
\\(.+\\)
") + "¾ÜºÙ +
\\(.+\\)
") (defconst mixi-event-limit-regexp - "Ê罸´ü¸Â - \\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü") + "Ê罸´ü¸Â +? \\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü") (defconst mixi-event-members-regexp - "»²²Ã¼Ô - - + " +
»²²Ã¼Ô + +? +? -") + +?") (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))) -- 1.7.10.4
 \\(.+\\) \\(.+\\)