projects / chise / est.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update.
[chise/est.git] / cwiki-view.el
diff --git a/cwiki-view.el b/cwiki-view.el
index a24b220..33c6957 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -70,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
+       ucs
        item-code page char-num glyph-image-id
        width height image-cobj base-image x y w h)
     (if (eq level 0)
@@ -98,6 +99,7 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
          (format "<head>
 <style type=\"text/css\">
 <!--
+h1 { font-size: 60px; vertical-align: super; }
 hr { color: green; }
 .ids { vertical-align: middle; font-size: 40px; line-height: 100%%; }
 a { text-decoration: none; }
@@ -138,7 +140,7 @@ li { margin: 0 0 0 2em; }
 </style>
 
 <script
- src=\"http://hng.chise.org/openseadragon/openseadragon.min.js\"></script>
+ src=\"https://image.chise.org/openseadragon/openseadragon.min.js\"></script>
 
 <title>EsT %s = %s</title>
 </head>\n"
@@ -178,20 +180,39 @@ li { margin: 0 0 0 2em; }
                (substring uri-object (match-end 0))))))))
       (princ
        (format "<input type=\"submit\" value=\"New Account\" />
+<a href=\"./%s/index.ttl\"><input type=\"submit\" value=\"RDF (Turtle)\" /></a>
 <a href=\"http://www.chise.org/est/rdf.cgi?%s=%s\">
-<input type=\"submit\" value=\"RDF\" />
-</a>
-<a href=\"./%s/index.ttl\"><input type=\"submit\" value=\"Turtle\" /></a>%s
+<input type=\"submit\" value=\"XML (old RDF)\" />
+</a>%s
 </div>
 <hr />\n"
-              genre rdf-uri-object
               rdf-uri-object
+              genre rdf-uri-object
               (if (eq genre 'character)
                   (format "
 <a href=\"/est/view/%s/%s/data.json\">
 <input type=\"submit\" value=\"JSON\" />
+</a>\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 "
+<a href=\"https://search.hng-data.org/search/%s\">
+<input type=\"submit\" value=\"HNG-data\" />
 </a>\n"
-                          genre rdf-uri-object)
+                                      (www-uri-encode-object ret))
+                            ""))
                 "")))
       (when (setq parents (www-get-feature-value object '<-denotational))
        (if (characterp parents)
@@ -239,7 +260,7 @@ li { margin: 0 0 0 2em; }
     var viewer;
     viewer = OpenSeadragon({
         id: \"openseadragon1\",
-        prefixUrl: \"http://hng.chise.org/openseadragon/images/\",
+        prefixUrl: \"https://image.chise.org/openseadragon/images/\",
         preserveViewport:   true,
         visibilityRatio:    1,
         minZoomLevel:       1,
@@ -266,7 +287,7 @@ li { margin: 0 0 0 2em; }
 <script type=\"text/javascript\">
     OpenSeadragon({
         id: \"openseadragon1\",
-        prefixUrl: \"http://hng.chise.org/openseadragon/images/\",
+        prefixUrl: \"https://image.chise.org/openseadragon/images/\",
         preserveViewport:   true,
         visibilityRatio:    1,
         minZoomLevel:       1,
@@ -329,14 +350,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
-         "<img alt=\"HNG-card:%s\"
-src=\"http://hng.chise.org/images/HNG/%03d/card/%04d.jpg\"
+       (setq ret
+             (format
+              "<img alt=\"HNG-card:%s\"
+src=\"https://image.hng-data.org/images/HNG/%03d/card/%04d.jpg\"
 style=\"height: 480px;\" />"
-         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 "<a href=\"../image-resource/%s\">%s</a>"
+                    (www-uri-encode-object image-cobj)
+                    ret)
+          ret))
        )
        (t
        (setq ret (www-format-encode-string
@@ -370,9 +398,11 @@ style=\"height: 480px;\" />"
                  (t ret))
                 (if GlyphWiki-id
                     (format
-                     " <a href=\"http://glyphwiki.org/wiki/%s\"><img alt=\"%s\" src=\"http://glyphwiki.org/glyph/%s.50px.png\" /></a>"
+                     " <a href=\"https://glyphwiki.org/wiki/%s\"><img alt=\"%s\" src=\"%s/%s.svg\" style=\"vertical-align:middle; width: 60px; height: 60px\"/></a>"
+                     GlyphWiki-id
                      GlyphWiki-id
-                     GlyphWiki-id GlyphWiki-id)
+                     chise-wiki-glyphwiki-glyph-image-url
+                     GlyphWiki-id)
                   "")
                 level))
        ))
@@ -395,10 +425,16 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)</p>
                        '=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))
+       (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
@@ -493,7 +529,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)</p>
        (let ((object-str (est-format-object object))
              encoded-object-for-form)
          (princ
-          "<form action=\"http://www.chise.org/ids-find\">\n")
+          "<form action=\"https://www.chise.org/ids-find\">\n")
          (princ (www-format-encode-string object-str))
          (setq encoded-object-for-form
                (with-temp-buffer
@@ -515,7 +551,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
          (princ "</form>\n")
 
          (princ
-          "<form action=\"http://www.chise.org/hng-ids-find\">\n")
+          "<form action=\"https://www.chise.org/hng-ids-find\">\n")
          (princ (www-format-encode-string object-str))
 
          (princ