X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=ca965f2517ac12de0edc15c7c33fdbcdfaed47fc;hb=c9150730ec9b4f193764948d210f4b40bdf50979;hp=04f7f360f90b6038a965fdc12d80eb474435da47;hpb=5945f8760445ad1f8639db5f037729512c390ffe;p=chise%2Fest.git

diff --git a/cwiki-view.el b/cwiki-view.el
index 04f7f36..ca965f2 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")
@@ -68,8 +69,9 @@ size=\"64\" maxlength=\"256\" value=\"%s\">
 	without-header
 	logical-feature chise-wiki-displayed-features
 	parents
-	GlyphWiki-id HNG-card ret object-spec
-	width height base-image x y w h)
+	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
 	      without-header nil)
@@ -127,6 +129,8 @@ li { margin: 0 0 0 2em; }
     z-index: 1;
 }
 
+.value .image-list img { height: 320px; vertical-align: top; }
+
 .list .tooltip:hover .tooltiptext {
     visibility: visible;
 }
@@ -174,11 +178,13 @@ 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\" />
+<input type=\"submit\" value=\"XML (old RDF)\" />
 </a>%s
 </div>
 <hr />\n"
+	       rdf-uri-object
 	       genre rdf-uri-object
 	       (if (eq genre 'character)
 		   (format "
@@ -188,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 "<p>%s %s</p>\n<hr>\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 "<p>%s %s</p>\n<hr>\n"
 		       (www-format-value-as-char-list parents)
 		       (www-format-feature-name '->subsumptive lang))))
@@ -271,6 +281,50 @@ li { margin: 0 0 0 2em; }
 	   (format "<img alt=\"%s\" src=\"%s\" />"
 		   ret ret)))
 	)
+       ((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
+		  "<img alt=\"SW-JIGUGE\\([45]\\)-\\([0-9][0-9][0-9]\\)\\([0-9][0-9]\\)"
+		  ret)
+		 (setq item-code (string-to-int (match-string 1 ret))
+		       page (string-to-int (match-string 2 ret))
+		       char-num (string-to-int (match-string 3 ret)))
+		 (setq glyph-image-id
+		       (cond ((eq item-code 4)
+			      (intern
+			       (format "zinbun/toho/A024/A024%04d/char=%d"
+				       (+ page 18) char-num))
+			      )
+			     ((eq item-code 5)
+			      (intern
+			       (format "zinbun/toho/A020/A020%04d/char=%d"
+				       (+ page 16) char-num))
+			      )))
+		 (setq image-cobj
+		       (concord-decode-object '=id glyph-image-id 'glyph-image))
+		 (setq image-cobj
+		       (car (concord-object-get image-cobj '->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 "<a href=\"../image-resource/%s...$.zoom-xywh=%d,%d,%d,%d\"
+><img alt=\"%s\" src=\"%s\" /></a>"
+		     (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 "<img alt=\"%s\" src=\"%s\" />"
+			 ret ret)))
+	)
        ((and (eq genre 'hng-card)
 	     (setq ret (concord-object-get object '=hng-card))
 	     (setq ret (symbol-name ret))
@@ -278,7 +332,7 @@ li { margin: 0 0 0 2em; }
 	(princ
 	 (format
 	  "<img alt=\"HNG-card:%s\"
-src=\"http://hng.chise.org/images/HNG/%03d/cards/%04d.jpg\"
+src=\"http://hng.chise.org/images/HNG/%03d/card/%04d.jpg\"
 style=\"height: 480px;\" />"
 	  ret
 	  (string-to-int (match-string 1 ret))
@@ -287,12 +341,15 @@ style=\"height: 480px;\" />"
        (t
 	(setq ret (www-format-encode-string
 		   (est-format-object object 'readable)))
-	(setq HNG-card
-	      (if (string-match
-		   "<img alt=\"HNG\\([0-9]+\\)-\\([0-9]+\\)[a-z]?\"" ret)
-		  (format "hng-card/rep.id=%d-%d"
-			  (string-to-int (match-string 1 ret))
-			  (string-to-int (match-string 2 ret)))))
+	(when (string-match
+	       "<img alt=\"HNG\\([0-9]+\\)-\\([0-9]+\\)[a-z]?\"" ret)
+	  (setq HNG-card-id
+		(intern
+		 (format "%d-%d"
+			 (string-to-int (match-string 1 ret))
+			 (string-to-int (match-string 2 ret)))))
+	  (setq HNG-card
+		(format "hng-card/rep.id=%s" HNG-card-id)))
 	(princ
 	 (format "<h%d>%s%s</h%d>\n"
 		 level
@@ -331,6 +388,18 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)</p>
 		  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
@@ -421,56 +490,45 @@ size=\"30\" maxlength=\"30\" value=\"%s\">)</p>
 	   "<p>\n"
 	 "<li>\n"))
       (when (eq genre 'character)
-	(princ
-	 "<form action=\"http://www.chise.org/ids-find\">\n")
-	(princ
-	 (www-format-encode-string
-	  (est-format-object object)
-	  ;; (if (eq genre 'character)
-	  ;;     (format "%c" object)
-	  ;;   (format "%s" (concord-object-id object)))
-	  ))
-	(princ
-	 (format
-	  " <input type=\"text\" name=\"components\"
+	(let ((object-str (est-format-object object))
+	      encoded-object-for-form)
+	  (princ
+	   "<form action=\"http://www.chise.org/ids-find\">\n")
+	  (princ (www-format-encode-string object-str))
+	  (setq encoded-object-for-form
+		(with-temp-buffer
+		  (insert (encode-coding-string object-str 'utf-8-jp-er))
+		  (goto-char (point-min))
+		  (while (search-forward "&GT-" nil t)
+		    (replace-match "&amp;GT-" t t)
+		    )
+		  (buffer-string)))
+	  (princ
+	   (format
+	    " <input type=\"text\" name=\"components\"
 size=\"30\" maxlength=\"30\" value=\"%s\" />"
-	  (encode-coding-string
-	   (est-format-object object)
-	   ;; (if (eq genre 'character)
-	   ;;     (char-to-string object)
-	   ;;   (format "%s" (concord-object-id object)))
-	   'utf-8-jp-er)))
-	(princ
-	 (www-format-encode-string
-	  "を\u542Bむ\u6F22\u5B57を\u63A2す"))
-	(princ " <input type=\"submit\" value=\"search\" />\n")
-	(princ "</form>\n")
+	    encoded-object-for-form))
+	  (princ
+	   (www-format-encode-string
+	    "を\u542Bむ\u6F22\u5B57を\u63A2す"))
+	  (princ " <input type=\"submit\" value=\"search\" />\n")
+	  (princ "</form>\n")
 
-	(princ
-	 "<form action=\"http://www.chise.org/hng-ids-find\">\n")
-	(princ
-	 (www-format-encode-string
-	  (est-format-object object)
-	  ;; (if (eq genre 'character)
-	  ;;     (format "%c" object)
-	  ;;   (format "%s" (concord-object-id object)))
-	  ))
-	(princ
-	 (format
-	  " <input type=\"text\" name=\"components\"
+	  (princ
+	   "<form action=\"http://www.chise.org/hng-ids-find\">\n")
+	  (princ (www-format-encode-string object-str))
+
+	  (princ
+	   (format
+	    " <input type=\"text\" name=\"components\"
 size=\"30\" maxlength=\"30\" value=\"%s\" />"
-	  (encode-coding-string
-	   (est-format-object object)
-	   ;; (if (eq genre 'character)
-	   ;;     (char-to-string object)
-	   ;;   (format "%s" (concord-object-id object)))
-	   'utf-8-jp-er)))
-	(princ
-	 (www-format-encode-string
-	  "を\u542Bむ HNG の\u6F22\u5B57を\u63A2す"))
-	(princ " <input type=\"submit\" value=\"search\" />\n")
-	(princ "</form>\n")
-	)
+	    encoded-object-for-form))
+	  (princ
+	   (www-format-encode-string
+	    "を\u542Bむ HNG の\u6F22\u5B57を\u63A2す"))
+	  (princ " <input type=\"submit\" value=\"search\" />\n")
+	  (princ "</form>\n")
+	))
       (princ
        (if (= level 1)
 	   "</p>\n"
@@ -480,14 +538,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
@@ -625,7 +684,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
@@ -737,12 +797,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
@@ -780,21 +846,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
 
 <!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
             \"http://www.w3.org/TR/html4/loose.dtd\">
 <html lang=\"ja\">
 ")
-	    )
+		 ))
           ;; (princ (format "<p>%S, %S, %S</p>"
           ;;                (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
@@ -854,7 +939,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />"
 		  (eq mode 'simple))
 		 ))
 	  ))
-	(unless json
+	(unless (or json turtle)
 	  (princ "\n<hr>\n")
 	  (princ (format "mode=%S\n" mode))
 	  (princ (format "user=%s\n" user))