X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-view.el;h=ca965f2517ac12de0edc15c7c33fdbcdfaed47fc;hp=82fe7c6da897ba91e4129fe9892e4a973dbaa642;hb=HEAD;hpb=7b98e7a1ffdc9c8c33716415dbd7cd890bdba85e
diff --git a/cwiki-view.el b/cwiki-view.el
index 82fe7c6..bf0dd07 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")
@@ -44,6 +45,7 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
)
(defun www-display-object-desc (genre uri-object &optional uri-feature-name
+ image-selection
lang level simple
uri-feature-name-to-edit editing-format)
(unless level
@@ -67,7 +69,10 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
without-header
logical-feature chise-wiki-displayed-features
parents
- GlyphWiki-id HNG-card ret object-spec)
+ GlyphWiki-id HNG-card HNG-card-id HNG-card-cobj ret object-spec
+ ucs
+ 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
without-header nil)
@@ -94,6 +99,7 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
(format "
+
+
EsT %s = %s
\n"
genre
@@ -169,57 +180,267 @@ 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 "
+\n%s"
+ genre rdf-uri-object
+ (if (and (or (char-feature object '->HNG@CN/manuscript)
+ (char-feature object '->HNG@CN/printed)
+ (char-feature object '->HNG@JP/manuscript)
+ (char-feature object '->HNG@JP/printed)
+ (char-feature object '->HNG@KR)
+ (char-feature object '->HNG@MISC))
+ (setq ucs (char-ucs object))
+ (setq ret (decode-char '=ucs ucs))
+ (setq ret
+ (if (setq ucs (get-char-attribute
+ ret '=>ucs*))
+ (decode-char '=ucs ucs)
+ ret)))
+ (format "
+
+
\n"
- genre rdf-uri-object)
+ (www-uri-encode-object ret))
+ ""))
"")))
(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))))
(when (eq genre 'character)
(setq GlyphWiki-id (char-GlyphWiki-id object)))
- (setq ret (www-format-encode-string
- (est-format-object object 'readable)))
- (setq HNG-card
- (if (string-match "%s%s\n"
- level
- (if uri-feature-name
- (format "%s"
- ;; (if est-hide-cgi-mode
- ;; "%s"
- ;; "%s")
- (www-uri-make-object-url object uri-object)
- ret)
- (if HNG-card
- (format
- "%s"
- HNG-card ret)
- ret))
- (if GlyphWiki-id
- (format
- " "
- GlyphWiki-id
- GlyphWiki-id GlyphWiki-id)
- "")
- level))
+ (cond
+ ((eq genre 'image-resource)
+ (princ
+ (if (setq ret (concord-object-get object '=location@iiif))
+ (if (setq base-image
+ (car (concord-object-get object '<-image-segment)))
+ (format ""
+ (www-uri-encode-object base-image)
+ (concord-object-get object 'image-offset-x)
+ (concord-object-get object 'image-offset-y)
+ (concord-object-get object 'image-width)
+ (concord-object-get object 'image-height)
+ ret ret)
+ (if (and image-selection
+ (string-match "\\([0-9]+\\),\\([0-9]+\\),\\([0-9]+\\),\\([0-9]+\\)" image-selection))
+ (progn
+ (setq x (string-to-int (match-string 1 image-selection))
+ y (string-to-int (match-string 2 image-selection))
+ w (string-to-int (match-string 3 image-selection))
+ h (string-to-int (match-string 4 image-selection)))
+ (setq width (float
+ (concord-object-get object 'image-width)))
+ ;; (setq height (float
+ ;; (concord-object-get object 'image-height)))
+ (format "
+
+
+"
+ ret
+ (/ x width)
+ (/ y width)
+ (/ w width)
+ (/ h width)
+ ))
+ (format "
+
+
+"
+ ret)))
+ (setq ret (concord-object-get object '=location))
+ (format ""
+ ret ret)))
+ )
+ ((and (eq genre 'character)
+ (not GlyphWiki-id)
+ (setq ret (or (encode-char object '=chise-hdic-tsj)
+ (encode-char object '===chise-hdic-tsj)))
+ (setq ret (decode-char '===chise-hdic-tsj ret))
+ (setq ret (get-char-attribute ret 'hdic-tsj-word-id)))
+ (princ
+ (format "%s"
+ ret
+ (www-format-encode-string
+ (est-format-object object 'readable))))
+ )
+ ((and (eq genre 'character)
+ (not GlyphWiki-id)
+ (setq ret (or (encode-char object '=chise-hdic-syp)
+ (encode-char object '===chise-hdic-syp)))
+ (setq ret (decode-char '===chise-hdic-syp ret))
+ (setq ret (get-char-attribute ret '=hdic-syp-entry-id)))
+ (princ
+ (format "%s"
+ ret
+ (www-format-encode-string
+ (est-format-object object 'readable))))
+ )
+ ((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))))
+ (princ
+ (format ""
+ (www-uri-encode-object base-image)
+ (concord-object-get image-cobj 'image-offset-x)
+ (concord-object-get image-cobj 'image-offset-y)
+ (concord-object-get image-cobj 'image-width)
+ (concord-object-get image-cobj 'image-height)
+ ret ret))
+ (setq ret (concord-object-get image-cobj '=location))
+ (princ (format ""
+ ret ret)))
+ )
+ ((and (eq genre 'hng-card)
+ (setq ret (concord-object-get object '=hng-card))
+ (setq ret (symbol-name ret))
+ (string-match "\\([0-9]+\\)-\\([0-9]+\\)" ret))
+ (setq ret
+ (format
+ ""
+ 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
+ (est-format-object object 'readable)))
+ (when (string-match
+ "%s%s\n"
+ level
+ (cond
+ (uri-feature-name
+ (format "%s"
+ ;; (if est-hide-cgi-mode
+ ;; "%s"
+ ;; "%s")
+ (www-uri-make-object-url object uri-object)
+ ret)
+ )
+ (HNG-card
+ (format
+ "%s"
+ HNG-card ret)
+ )
+ (t ret))
+ (if GlyphWiki-id
+ (format
+ " "
+ GlyphWiki-id
+ GlyphWiki-id
+ chise-wiki-glyphwiki-glyph-image-url
+ GlyphWiki-id)
+ "")
+ level))
+ ))
(if (> level 1)
(princ ""))
(when feature-name-to-edit
@@ -232,6 +453,24 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)
genre genre
(decode-uri-string uri-object 'utf-8-mcs-er))
'utf-8-mcs-er)))
+ (when (and HNG-card-id
+ (eq genre 'character)
+ (setq HNG-card-cobj
+ (concord-decode-object
+ '=id HNG-card-id
+ 'hng-card)))
+ (put-char-attribute object 'sources@HNG/card (list HNG-card-cobj))
+ (cond ((setq ret (concord-object-get
+ HNG-card-cobj
+ '->glyph-image@zinbun/takuhon))
+ (put-char-attribute object 'sources@zinbun/takuhon ret)
+ )
+ ((setq ret (concord-object-get
+ HNG-card-cobj
+ '->glyph-image@gallica))
+ (put-char-attribute object 'sources@gallica ret)
+ ))
+ )
(setq object-spec
(cond
(uri-feature-name
@@ -322,56 +561,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"
@@ -381,14 +609,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
@@ -526,7 +755,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
@@ -586,6 +816,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(cond ((eq (car ret) 'char)
(www-display-object-desc
'character (cdr ret) (cdr (assq 'feature target))
+ nil
lang nil
(eq mode 'simple))
)
@@ -600,6 +831,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(t
(www-display-object-desc
(car ret) (cdr ret) (cdr (assq 'feature target))
+ nil
lang nil
(eq mode 'simple))
))
@@ -636,12 +868,22 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(car (split-string accept-language ","))
";"))
"-"))))
- ret genre feature 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)))
+ )
+ ((string-match "/index\\.\\(...*\\)\\.html$" target)
+ (setq lang (intern (match-string 1 target))
+ target (substring target 0 (match-beginning 0)))
+ ))
(when (string-match "^char/\\(&[^&;]+;\\)" target)
(setq ret (match-end 0))
(setq target
@@ -659,10 +901,18 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
ret (substring cell (match-end 0)))
(cons
(intern (decode-uri-string genre 'utf-8-mcs-er))
- (if (string-match "/feature=" ret)
- (list (substring ret 0 (match-beginning 0))
- (substring ret (match-end 0)))
- (list ret))))
+ (cond
+ ((string-match "/feature=" ret)
+ (list (substring ret 0 (match-beginning 0))
+ (substring ret (match-end 0)))
+ )
+ ((string-match "...$.zoom-xywh=" ret)
+ (list (substring ret 0 (match-beginning 0))
+ nil
+ (substring ret (match-end 0)))
+ )
+ (t
+ (list ret)))))
(list (decode-uri-string cell 'utf-8-mcs-er)))
;; (setq ret (split-string cell "/"))
;; (cons (intern
@@ -671,21 +921,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
@@ -703,6 +972,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
)
(www-display-object-desc
'character (nth 1 ret) (nth 2 ret)
+ nil
lang nil
(eq mode 'simple)))
)
@@ -714,14 +984,37 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
lang
(eq mode 'simple))
)
+ ;; ((eq (car ret) 'image-resource)
+ ;; ;; (cond
+ ;; ;; ((string-match "^\\.iiif=" (nth 1 ret))
+ ;; ;; (setq obj-url (decode-uri-string
+ ;; ;; (substring (nth 1 ret) (match-end 0))
+ ;; ;; 'utf-8-mcs-er))
+ ;; ;; (setq obj (concord-images-add-iiif obj-url))
+ ;; ;; (www-display-object-desc
+ ;; ;; 'image-resource
+ ;; ;; (www-uri-encode-object obj)
+ ;; ;; (nth 2 ret)
+ ;; ;; lang nil
+ ;; ;; (eq mode 'simple))
+ ;; ;; )
+ ;; ;; (t
+ ;; (princ (nth 1 ret))
+ ;; (www-display-object-desc
+ ;; 'image-resource (nth 1 ret) (nth 2 ret)
+ ;; lang nil
+ ;; (eq mode 'simple))
+ ;; ;; ))
+ ;; )
(t
(www-display-object-desc
(car ret) (nth 1 ret) (nth 2 ret)
+ (nth 3 ret)
lang nil
(eq mode 'simple))
))
))
- (unless json
+ (unless (or json turtle)
(princ "\n
\n")
(princ (format "mode=%S\n" mode))
(princ (format "user=%s\n" user))