From d02ed267c7577a6f7b5428d3208a6aedc2598516 Mon Sep 17 00:00:00 2001 From: bg66 Date: Mon, 18 Dec 2006 10:38:30 +0000 Subject: [PATCH] * mixi.el (mixi-friend-nick-regexp): Follow the change of mixi. (mixi-friend-name-regexp): Ditto. (mixi-friend-sex-regexp): Ditto. (mixi-friend-hobby-regexp): Ditto. (mixi-friend-realize): Follow the change above. (mixi-community-birthday-regexp): Follow the change of mixi. (mixi-community-owner-regexp): Ditto. (mixi-community-category-regexp): Ditto. (mixi-community-members-regexp): Ditto. (mixi-community-open-level-regexp): Ditto. (mixi-community-authority-regexp): Ditto. --- ChangeLog | 14 ++++++++++++++ mixi.el | 50 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbb0e29..90d3110 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2006-12-18 OHASHI Akira + * mixi.el (mixi-friend-nick-regexp): Follow the change of mixi. + (mixi-friend-name-regexp): Ditto. + (mixi-friend-sex-regexp): Ditto. + (mixi-friend-hobby-regexp): Ditto. + (mixi-friend-realize): Follow the change above. + (mixi-community-birthday-regexp): Follow the change of mixi. + (mixi-community-owner-regexp): Ditto. + (mixi-community-category-regexp): Ditto. + (mixi-community-members-regexp): Ditto. + (mixi-community-open-level-regexp): Ditto. + (mixi-community-authority-regexp): Ditto. + +2006-12-18 OHASHI Akira + * sb-mixi.el (shimbun-mixi-make-subject): Add SHIMBUN argument. (shimbun-mixi-get-headers): Follow the change above. diff --git a/mixi.el b/mixi.el index c3c5aa1..ef5b274 100644 --- a/mixi.el +++ b/mixi.el @@ -672,9 +672,16 @@ Increase this value when unexpected error frequently occurs." `(concat "/show_friend.pl?id=" (mixi-friend-id ,friend))) (defconst mixi-friend-nick-regexp - "\"\\*\"
?\n\\(.*\\)¤µ¤ó([0-9]+)") -(defconst mixi-friend-name-sex-regexp - "̾\\( \\| \\)Á°\n+\\([^<]+\\) (\\([Ã˽÷]\\)À­)") + "\"\\*\"
? +\\(.*\\)¤µ¤ó([0-9]+)") +(defconst mixi-friend-name-regexp + "̾\\( \\| \\)Á° + +?\\(.+?\\)\\(\\|À­\\( \\| \\)ÊÌ + +?\\([Ã˽÷]\\)À­\\(\\|¸½½»½ê\n\\(.+\\)\\(\n.+\n\\)?") (defconst mixi-friend-age-regexp @@ -686,7 +693,7 @@ Increase this value when unexpected error frequently occurs." (defconst mixi-friend-birthplace-regexp "½Ð¿ÈÃÏ\n?\n\\(.+\\)\\(\n.+\n\\)?") (defconst mixi-friend-hobby-regexp - "¼ñ\\( \\| \\)Ì£\n\\(.+\\)") + "¼ñ\\( \\| \\)Ì£\n\\(.+?\\)\\(\\|¿¦\\( \\| \\)¶È\n\\(.+\\)\\(\n.+\n\\)?") (defconst mixi-friend-organization-regexp @@ -705,17 +712,18 @@ Increase this value when unexpected error frequently occurs." (mixi-friend-set-nick friend (match-string 1 buf)) (signal 'error (list 'cannot-find-nick friend))) ;; For getting my profile. - (unless (string-match mixi-friend-name-sex-regexp buf) + (unless (string-match mixi-friend-name-regexp buf) (with-mixi-retrieve (concat "/show_profile.pl?id=" (mixi-friend-id friend)) (setq buf buffer))) - (if (string-match mixi-friend-name-sex-regexp buf) - (progn + (if (string-match mixi-friend-name-regexp buf) (mixi-friend-set-name friend (match-string 2 buf)) - (mixi-friend-set-sex friend - (if (string= (match-string 3 buf) "ÃË") - 'male 'female))) - (signal 'error (list 'cannot-find-name-or-sex friend))) + (signal 'error (list 'cannot-find-name friend))) + (if (string-match mixi-friend-sex-regexp buf) + (mixi-friend-set-sex friend + (if (string= (match-string 3 buf) "ÃË") + 'male 'female)) + (signal 'error (list 'cannot-find-sex friend))) (when (string-match mixi-friend-address-regexp buf) (mixi-friend-set-address friend (match-string 1 buf))) (when (string-match mixi-friend-age-regexp buf) @@ -1207,19 +1215,27 @@ Increase this value when unexpected error frequently occurs." (defconst mixi-community-name-regexp "\\(.*\\)") (defconst mixi-community-birthday-regexp - "³«ÀßÆü\n\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü") + "³«ÀßÆü +\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü") ;; FIXME: Care when the owner has seceded. (defconst mixi-community-owner-regexp - "´ÉÍý¿Í\n\n\n\n\\(.*\\)") + "´ÉÍý¿Í + + + +\\(.*\\)") (defconst mixi-community-category-regexp - "¥«¥Æ¥´¥ê\n\\([^<]+\\)") + "¥«¥Æ¥´¥ê +\\([^<]+\\)") (defconst mixi-community-members-regexp - "¥á¥ó¥Ð¡¼¿ô\n\\([0-9]+\\)¿Í") + "¥á¥ó¥Ð¡¼¿ô +\\([0-9]+\\)¿Í") (defconst mixi-community-open-level-regexp - "»²²Ã¾ò·ï¤È
¸ø³«¥ì¥Ù¥ë + "»²²Ã¾ò·ï¤È
¸ø³«¥ì¥Ù¥ë \\(.+\\)") (defconst mixi-community-authority-regexp - "¥È¥Ô¥Ã¥¯ºîÀ®¤Î¸¢¸Â\n\\(.+\\)") + "¥È¥Ô¥Ã¥¯ºîÀ®¤Î¸¢¸Â +\\(.+\\)") (defconst mixi-community-description-regexp "\\(.+\\)") -- 1.7.10.4