(www-batch-view): Encode return value of (emacs-version).

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

diff --git a/cwiki-view.el b/cwiki-view.el
index 075fce9..948b309 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -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>"
@@ -125,12 +130,21 @@
        "<form action=\"http://chise.zinbun.kyoto-u.ac.jp/ids-find\">\n")
       (princ
        (www-format-encode-string
-       (format "%c" object)))
+       (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)))
+       (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す"))
@@ -310,9 +324,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 +341,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 "