(www-display-object-desc): Don't display CHISE IDS-Find for

[chise/est.git] / cwiki-view.el

diff --git a/cwiki-view.el b/cwiki-view.el
index 075fce9..ec3f256 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -15,7 +15,7 @@
     (when object
       (when (and (eq genre 'character)
                 (= (length uri-object) 1))
-       (setq uri-object (www-uri-encode-char object)))
+       (setq uri-object (www-uri-encode-object object)))
       (when (= level 1)
        (princ
         (encode-coding-string
@@ -59,7 +59,12 @@
        (setq GlyphWiki-id (char-GlyphWiki-id object)))
       (princ (format "<h%d>%s%s</h%d>\n"
                     level
-                    (www-format-encode-string (char-to-string object))
+                    (www-format-encode-string
+                     (est-format-object object)
+                      ;; (if (eq genre 'character)
+                      ;;     (char-to-string object)
+                      ;;   (format "%s" (concord-object-id object)))
+                     )
                     (if GlyphWiki-id
                         (format
                          " <a href=\"http://glyphwiki.org/wiki/%s\"><img alt=\"%s\" src=\"http://glyphwiki.org/glyph/%s.50px.png\" /></a>"
@@ -121,21 +126,31 @@
        (if (= level 1)
           "<p>\n"
         "<li>\n"))
-      (princ
-       "<form action=\"http://chise.zinbun.kyoto-u.ac.jp/ids-find\">\n")
-      (princ
-       (www-format-encode-string
-       (format "%c" object)))
-      (princ
-       (format
-       " <input type=\"text\" name=\"components\"
+      (when (eq genre 'character)
+       (princ
+        "<form action=\"http://www.chise.org/ids-find\">\n")
+       (princ
+        (www-format-encode-string
+         (est-format-object object)
+         ;; (if (eq genre 'character)
+         ;;     (format "%c" object)
+         ;;   (format "%s" (concord-object-id object)))
+         ))
+       (princ
+        (format
+         " <input type=\"text\" name=\"components\"
 size=\"30\" maxlength=\"30\" value=\"%s\" />"
-       (encode-coding-string (char-to-string object) 'utf-8-jp-er)))
-      (princ
-       (www-format-encode-string
-       "を\u542Bむ\u6F22\u5B57を\u63A2す"))
-      (princ " <input type=\"submit\" value=\"search\" />\n")
-      (princ "</form>\n")
+         (encode-coding-string
+          (est-format-object object)
+          ;; (if (eq genre 'character)
+          ;;     (char-to-string object)
+          ;;   (format "%s" (concord-object-id object)))
+          'utf-8-jp-er)))
+       (princ
+        (www-format-encode-string
+         "を\u542Bむ\u6F22\u5B57を\u63A2す"))
+       (princ " <input type=\"submit\" value=\"search\" />\n")
+       (princ "</form>\n"))
       (princ
        (if (= level 1)
           "</p>\n"
@@ -284,7 +299,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
            (setq ret (match-end 0))
            (setq target
                  (concat "char="
-                         (www-uri-encode-char
+                         (www-uri-encode-object
                           (www-uri-decode-object
                            'character (match-string 1 target)))
                          (substring target ret))))
@@ -310,9 +325,16 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
                ((eq (car ret) 'feature)
                 (www-display-feature-desc
                  (decode-uri-string (cdr ret) 'utf-8-mcs-er)
-                  (cdr (assq 'char target))
+                 (cdr (assq 'char target))
                  lang
                  (eq mode 'simple))
+                )
+               (t
+                (www-display-object-desc
+                 (car ret)
+                  (cdr ret)
+                 lang nil
+                 (eq mode 'simple))
                 ))
          ))
        (princ "\n<hr>\n")
@@ -320,7 +342,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
        (princ (format "user=%s\n" user))
         ;; (princ (format "local user=%s\n" (user-login-name)))
        (princ (format "lang=%S\n" lang))
-       (princ (emacs-version))
+       (princ (encode-coding-string (emacs-version) 'utf-8-jp-er))
         ;; (princ " CHISE ")
         ;; (princ xemacs-chise-version)
        (princ "