X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-view.el;h=d6267146cd0e2666bcaf6219f5c512ca2b085b01;hp=570e6e3ee729a09f49926fa203d9a31d0de88eab;hb=c7eacb59b6c11c458ee5b0d5af024090c09134b6;hpb=b819bf797c21f7ec35b351265f8c76d28683ccf4
diff --git a/cwiki-view.el b/cwiki-view.el
index 570e6e3..d626714 100644
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -1,6 +1,7 @@
;; -*- coding: utf-8-mcs-er -*-
(require 'cwiki-format)
(require 'char-db-json)
+(require 'concord-turtle-dump)
(defvar chise-wiki-view-url "view.cgi")
(defvar chise-wiki-edit-url "edit.cgi")
@@ -69,6 +70,7 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
logical-feature chise-wiki-displayed-features
parents
GlyphWiki-id HNG-card HNG-card-id HNG-card-cobj ret object-spec
+ item-code page char-num glyph-image-id
width height image-cobj base-image x y w h)
(if (eq level 0)
(setq level 1
@@ -176,11 +178,13 @@ li { margin: 0 0 0 2em; }
(substring uri-object (match-end 0))))))))
(princ
(format "
+
-
+
%s
\n"
+ rdf-uri-object
genre rdf-uri-object
(if (eq genre 'character)
(format "
@@ -190,10 +194,14 @@ li { margin: 0 0 0 2em; }
genre rdf-uri-object)
"")))
(when (setq parents (www-get-feature-value object '<-denotational))
+ (if (characterp parents)
+ (setq parents (list parents)))
(princ (format "%s %s
\n
\n"
(www-format-value-as-char-list parents)
(www-format-feature-name '->denotational lang))))
(when (setq parents (www-get-feature-value object '<-subsumptive))
+ (if (characterp parents)
+ (setq parents (list parents)))
(princ (format "%s %s
\n
\n"
(www-format-value-as-char-list parents)
(www-format-feature-name '->subsumptive lang))))
@@ -273,9 +281,34 @@ li { margin: 0 0 0 2em; }
(format ""
ret ret)))
)
- ((and (eq genre 'glyph-image)
- (setq image-cobj
- (car (concord-object-get object '->image-resource))))
+ ((or (and (eq genre 'glyph-image)
+ (setq image-cobj
+ (car (concord-object-get object '->image-resource))))
+ (and (eq genre 'character)
+ (setq ret (www-format-encode-string
+ (est-format-object object 'readable)))
+ (string-match
+ "image-resource)))
+ ))
(if (and (setq ret (concord-object-get image-cobj '=location@iiif))
(setq base-image
(car (concord-object-get image-cobj '<-image-segment))))
@@ -296,14 +329,21 @@ li { margin: 0 0 0 2em; }
(setq ret (concord-object-get object '=hng-card))
(setq ret (symbol-name ret))
(string-match "\\([0-9]+\\)-\\([0-9]+\\)" ret))
- (princ
- (format
- ""
- ret
- (string-to-int (match-string 1 ret))
- (string-to-int (match-string 2 ret))))
+ ret
+ (string-to-int (match-string 1 ret))
+ (string-to-int (match-string 2 ret))))
+ (princ
+ (if (setq image-cobj
+ (car (concord-object-get object '->image-resource)))
+ (format "%s"
+ (www-uri-encode-object image-cobj)
+ ret)
+ ret))
)
(t
(setq ret (www-format-encode-string
@@ -457,56 +497,45 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)
"\n"
"
\n"))
(when (eq genre 'character)
- (princ
- "\n")
+ encoded-object-for-form))
+ (princ
+ (www-format-encode-string
+ "ã\u542Bã\u6F22\u5B57ã\u63A2ã"))
+ (princ " \n")
+ (princ "\n")
- (princ
- "\n")
- )
+ encoded-object-for-form))
+ (princ
+ (www-format-encode-string
+ "ã\u542Bã HNG ã®\u6F22\u5B57ã\u63A2ã"))
+ (princ " \n")
+ (princ "\n")
+ ))
(princ
(if (= level 1)
"\n"
@@ -516,14 +545,15 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(defun www-display-feature-desc (uri-feature-name genre uri-object
&optional lang simple)
(let ((rdf-uri-object (if est-hide-cgi-mode
- (if (string-match "=" uri-object)
- (concat
- (est-uri-decode-feature-name-body
- (substring uri-object 0 (match-beginning 0)))
- ":"
- (est-uri-decode-feature-name-body
- (substring uri-object (match-end 0))))
- uri-object)))
+ (if (and uri-object
+ (string-match "=" uri-object)
+ (concat
+ (est-uri-decode-feature-name-body
+ (substring uri-object 0 (match-beginning 0)))
+ ":"
+ (est-uri-decode-feature-name-body
+ (substring uri-object (match-end 0)))))
+ uri-object)))
(feature-name (www-uri-decode-feature-name uri-feature-name))
(name@lang (intern (format "name@%s" lang))))
(princ
@@ -661,7 +691,8 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(www-html-display-paragraph
(format "description : %s"
(or (decode-coding-string
- (char-feature-property feature-name 'description)
+ (or (char-feature-property feature-name 'description)
+ "")
'utf-8-mcs-er)
"")))
(when lang
@@ -773,12 +804,18 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(car (split-string accept-language ","))
";"))
"-"))))
- ret genre feature obj-url json obj)
+ ret genre feature obj-url json turtle obj)
(cond
((stringp target)
- (when (string-match "/data\\.json$" target)
+ (cond
+ ((string-match "/data\\.json$" target)
(setq json t
- target (substring target 0 (match-beginning 0))))
+ target (substring target 0 (match-beginning 0)))
+ )
+ ((string-match "/index\\.ttl$" target)
+ (setq turtle t
+ target (substring target 0 (match-beginning 0)))
+ ))
(when (string-match "^char/\\(&[^&;]+;\\)" target)
(setq ret (match-end 0))
(setq target
@@ -816,21 +853,40 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
)
(split-string target "&")))
(setq ret (car target))
- (if json
- (princ "Content-Type: application/json; charset=UTF-8
+ (cond (turtle
+ (princ "Content-Type: text/turtle; charset=UTF-8
+
+")
+ )
+ (json
+ (princ "Content-Type: application/json; charset=UTF-8
")
- (princ "Content-Type: text/html; charset=UTF-8
+ )
+ (t
+ (princ "Content-Type: text/html; charset=UTF-8
")
- )
+ ))
;; (princ (format "%S, %S, %S
"
;; (car ret)(nth 1 ret)(nth 2 ret)))
;; (princ (format "// %S %S\n" ret json))
- (cond ((or (eq (car ret) 'char)
+ (cond (turtle
+ (with-temp-buffer
+ (setq obj (www-uri-decode-object (car ret)(nth 1 ret)))
+ (concord-turtle-insert-char-data obj)
+ (goto-char (point-min))
+ (concord-turtle-insert-prefix)
+ (insert "\n")
+ (encode-coding-region
+ (point-min)(point-max)
+ char-db-file-coding-system)
+ (princ (buffer-string)))
+ )
+ ((or (eq (car ret) 'char)
(eq (car ret) 'character))
(if (and json
(setq obj (www-uri-decode-object
@@ -890,7 +946,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(eq mode 'simple))
))
))
- (unless json
+ (unless (or json turtle)
(princ "\n
\n")
(princ (format "mode=%S\n" mode))
(princ (format "user=%s\n" user))