X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=570e6e3ee729a09f49926fa203d9a31d0de88eab;hb=8ee7d0997336641c6277262e987ab4c923cd4459;hp=2164d607847efb5db1c2c733d9f9ef246b462321;hpb=6b42da066d33dc61167e0fbae36bc7248170c5e0;p=chise%2Fest.git
diff --git a/cwiki-view.el b/cwiki-view.el
index 2164d60..570e6e3 100644
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -1,5 +1,6 @@
;; -*- coding: utf-8-mcs-er -*-
(require 'cwiki-format)
+(require 'char-db-json)
(defvar chise-wiki-view-url "view.cgi")
(defvar chise-wiki-edit-url "edit.cgi")
@@ -43,6 +44,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
@@ -66,7 +68,8 @@ 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
+ width height image-cobj base-image x y w h)
(if (eq level 0)
(setq level 1
without-header nil)
@@ -101,9 +104,40 @@ ul { margin: 0 0; color: black; }
li { margin: 0 0 0 2em; }
.feature-name { font-family: sans-serif; font-weight: bold; }
.feature-name a { color: black; }
+
+.tooltip {
+ position: relative;
+ display: inline-block;
+ border-bottom: 1px dotted black;
+}
+
+.tooltip .tooltiptext {
+ visibility: hidden;
+ width: 120px;
+ top: 100%%;
+ left: 50%%;
+ margin-left: -60px;
+ background-color: black;
+ color: #fff;
+ text-align: center;
+ padding: 5px 0;
+ border-radius: 6px;
+
+ position: absolute;
+ z-index: 1;
+}
+
+.value .image-list img { height: 320px; vertical-align: top; }
+
+.list .tooltip:hover .tooltiptext {
+ visibility: visible;
+}
-->
+
+
EsT %s = %s
\n"
genre
@@ -144,10 +178,17 @@ li { margin: 0 0 0 2em; }
(format "
-
+%s
\n"
- genre rdf-uri-object))
+ genre rdf-uri-object
+ (if (eq genre 'character)
+ (format "
+
+
+\n"
+ genre rdf-uri-object)
+ "")))
(when (setq parents (www-get-feature-value object '<-denotational))
(princ (format "%s %s
\n
\n"
(www-format-value-as-char-list parents)
@@ -158,34 +199,150 @@ li { margin: 0 0 0 2em; }
(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 'glyph-image)
+ (setq image-cobj
+ (car (concord-object-get object '->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))
+ (princ
+ (format
+ ""
+ ret
+ (string-to-int (match-string 1 ret))
+ (string-to-int (match-string 2 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 GlyphWiki-id)
+ "")
+ level))
+ ))
(if (> level 1)
(princ ""))
(when feature-name-to-edit
@@ -198,6 +355,18 @@ 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))
+ (if (setq ret (concord-object-get
+ HNG-card-cobj
+ '->glyph-image@zinbun/takuhon))
+ (put-char-attribute object 'sources@zinbun/takuhon ret))
+ )
(setq object-spec
(cond
(uri-feature-name
@@ -552,6 +721,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))
)
@@ -566,6 +736,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))
))
@@ -602,15 +773,12 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
(car (split-string accept-language ","))
";"))
"-"))))
- ret genre feature)
- (princ "Content-Type: text/html; charset=UTF-8
-
-
-
-")
+ ret genre feature obj-url json obj)
(cond
((stringp target)
+ (when (string-match "/data\\.json$" target)
+ (setq json t
+ target (substring target 0 (match-beginning 0))))
(when (string-match "^char/\\(&[^&;]+;\\)" target)
(setq ret (match-end 0))
(setq target
@@ -628,10 +796,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
@@ -640,13 +816,41 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
)
(split-string target "&")))
(setq ret (car target))
+ (if json
+ (princ "Content-Type: application/json; charset=UTF-8
+
+")
+ (princ "Content-Type: text/html; charset=UTF-8
+
+
+
+")
+ )
;; (princ (format "%S, %S, %S
"
;; (car ret)(nth 1 ret)(nth 2 ret)))
- (cond ((eq (car ret) 'char)
- (www-display-object-desc
- 'character (nth 1 ret) (nth 2 ret)
- lang nil
- (eq mode 'simple))
+ ;; (princ (format "// %S %S\n" ret json))
+ (cond ((or (eq (car ret) 'char)
+ (eq (car ret) 'character))
+ (if (and json
+ (setq obj (www-uri-decode-object
+ (car ret)(nth 1 ret)))
+ (characterp obj))
+ (with-temp-buffer
+ ;; (princ (encode-coding-string
+ ;; (format "// %S\n" obj)
+ ;; char-db-file-coding-system))
+ (char-db-json-char-data-with-variant obj 'printable)
+ (encode-coding-region
+ (point-min)(point-max)
+ char-db-file-coding-system)
+ (princ (buffer-string))
+ )
+ (www-display-object-desc
+ 'character (nth 1 ret) (nth 2 ret)
+ nil
+ lang nil
+ (eq mode 'simple)))
)
((eq (car ret) 'feature)
(www-display-feature-desc
@@ -656,24 +860,49 @@ 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))
))
))
- (princ "\n
\n")
- (princ (format "mode=%S\n" mode))
- (princ (format "user=%s\n" user))
- ;; (princ (format "local user=%s\n" (user-login-name)))
- (princ (format "lang=%S\n" lang))
- (princ (encode-coding-string (emacs-version) 'utf-8-jp-er))
- ;; (princ " CHISE ")
- ;; (princ xemacs-chise-version)
- (princ "
+ (unless json
+ (princ "\n
\n")
+ (princ (format "mode=%S\n" mode))
+ (princ (format "user=%s\n" user))
+ ;; (princ (format "local user=%s\n" (user-login-name)))
+ (princ (format "lang=%S\n" lang))
+ (princ (encode-coding-string (emacs-version) 'utf-8-jp-er))
+ ;; (princ " CHISE ")
+ ;; (princ xemacs-chise-version)
+ (princ "
")
+ )
)
(error nil
(princ (format "%S" err)))