From: MORIOKA Tomohiko Date: Wed, 8 Jun 2016 09:52:42 +0000 (+0900) Subject: (www-display-object-desc): X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1d2691ae9d72f50b38f9dcf340c6c31e23fba54e;p=chise%2Fest.git (www-display-object-desc): - Add new argument `image-selection'. - Add code to display image in head for genre `image-resource'. (www-batch-view): Modify for interface change of `www-display-object-desc'. --- diff --git a/cwiki-view.el b/cwiki-view.el index 82fe7c6..b0c1454 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -44,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 @@ -131,6 +132,9 @@ li { margin: 0 0 0 2em; } --> + + EsT %s = %s \n" genre @@ -192,34 +196,69 @@ 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 "\"HNG\\([0-9]+\\)-\\([0-9]+\\)\""%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 - " \"%s\"" - GlyphWiki-id - GlyphWiki-id GlyphWiki-id) - "") - level)) + (cond + ((eq genre 'image-resource) + (princ + (if (setq ret (concord-object-get object '=location@iiif)) + (if (concord-object-get object 'image-offset-x) + (format "\"%s\"" + ret ret) + (format "
+ + +" + ret)) + (setq ret (concord-object-get object '=location)) + (format "\"%s\"" + ret ret))) + ) + (t + (setq ret (www-format-encode-string + (est-format-object object 'readable))) + (setq HNG-card + (if (string-match + "\"HNG\\([0-9]+\\)-\\([0-9]+\\)\""%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 + " \"%s\"" + GlyphWiki-id + GlyphWiki-id GlyphWiki-id) + "") + level)) + )) (if (> level 1) (princ "