projects / elisp / mixi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 096e7de)
* mixi.el (mixi-friend-nick-regexp): Follow the change of mixi.
authorbg66 <bg66>
Mon, 18 Dec 2006 10:38:30 +0000 (10:38 +0000)
committerbg66 <bg66>
Mon, 18 Dec 2006 10:38:30 +0000 (10:38 +0000)
(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 patch | blob | history
mixi.el patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index bbb0e29..90d3110 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2006-12-18  OHASHI Akira  <bg66@koka-in.org>
 
+       * 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  <bg66@koka-in.org>
+
        * 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 (file)
--- 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
-  "<img alt=\"\\*\" src=\"http://img\\.mixi\\.jp/img/dot0\\.gif\" width=\"1\" height=\"5\"><br>\r?\n\\(.*\\)¤µ¤ó([0-9]+)")
-(defconst mixi-friend-name-sex-regexp
-  "<td BGCOLOR=#F2DDB7 WIDTH=80 NOWRAP><font COLOR=#996600>̾\\(&nbsp;\\| \\)Á°</font></td>\n+<td WIDTH=345>\\([^<]+\\) (\\([Ã˽÷]\\)À­)</td>")
+  "<img alt=\"\\*\" src=\"http://img\\.mixi\\.jp/img/dot0\\.gif\" width=\"1\" height=\"5\"><br>\r?
+\\(.*\\)¤µ¤ó([0-9]+)")
+(defconst mixi-friend-name-regexp
+  "<td BGCOLOR=#F2DDB7 WIDTH=80 NOWRAP><font COLOR=#996600>̾\\(&nbsp;\\| \\)Á°</font></td>
+
+?<td WIDTH=345>\\(.+?\\)\\(</td>\\|<img\\)")
+(defconst mixi-friend-sex-regexp
+  "<td BGCOLOR=#F2DDB7\\( WIDTH=80 NOWRAP\\)?><font COLOR=#996600>À­\\(&nbsp;\\| \\)ÊÌ</font></td>
+
+?<td WIDTH=345>\\([Ã˽÷]\\)À­\\(</td>\\|<img\\)")
 (defconst mixi-friend-address-regexp
   "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¸½½»½ê</font></td>\n<td>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
 (defconst mixi-friend-age-regexp
@@ -686,7 +693,7 @@ Increase this value when unexpected error frequently occurs."
 (defconst mixi-friend-birthplace-regexp
   "<td BGCOLOR=#F2DDB7><font COLOR=#996600>½Ð¿ÈÃÏ</font>\n?</td>\n<td>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
 (defconst mixi-friend-hobby-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¼ñ\\(&nbsp;\\| \\)Ì£</font></td>\n<td>\\(.+\\)</td></tr>")
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¼ñ\\(&nbsp;\\| \\)Ì£</font></td>\n<td>\\(.+?\\)\\(</td>\\|<img\\)")
 (defconst mixi-friend-job-regexp
   "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¿¦\\(&nbsp;\\| \\)¶È</font></td>\n<td>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
 (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
   "<td WIDTH=345>\\(.*\\)</td></tr>")
 (defconst mixi-community-birthday-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>³«ÀßÆü</font></td>\n<td>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü</td>")
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>³«ÀßÆü</font></td>\r
+<td>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü</td>")
 ;; FIXME: Care when the owner has seceded.
 (defconst mixi-community-owner-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>´ÉÍý¿Í</font></td>\n<td>\n\n<a href=\"\\(home\\.pl\\|show_friend\\.pl\\?id=\\([0-9]+\\)\\)\">\n\\(.*\\)</a>")
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>´ÉÍý¿Í</font></td>\r
+<td>\r
+\r
+<a href=\"\\(home\\.pl\\|show_friend\\.pl\\?id=\\([0-9]+\\)\\)\">\r
+\\(.*\\)</a>")
 (defconst mixi-community-category-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¥«¥Æ¥´¥ê</font></td>\n<td>\\([^<]+\\)</td>")
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¥«¥Æ¥´¥ê</font></td>\r
+<td>\\([^<]+\\)</td>")
 (defconst mixi-community-members-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¥á¥ó¥Ð¡¼¿ô</font></td>\n<td>\\([0-9]+\\)¿Í</td></tr>")
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¥á¥ó¥Ð¡¼¿ô</font></td>\r
+<td>\\([0-9]+\\)¿Í</td></tr>")
 (defconst mixi-community-open-level-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>»²²Ã¾ò·ï¤È<br>¸ø³«¥ì¥Ù¥ë</font></td>
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>»²²Ã¾ò·ï¤È<br>¸ø³«¥ì¥Ù¥ë</font></td>\r
 <td>\\(.+\\)</td></tr>")
 (defconst mixi-community-authority-regexp
-  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¥È¥Ô¥Ã¥¯ºîÀ®¤Î¸¢¸Â</font></td>\n<td>\\(.+\\)</td></tr>")
+  "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¥È¥Ô¥Ã¥¯ºîÀ®¤Î¸¢¸Â</font></td>\r
+<td>\\(.+\\)</td></tr>")
 (defconst mixi-community-description-regexp
   "<td CLASS=h120>\\(.+\\)</td>")