(www-display-object-desc): For genre `hng-card', add a link to card

[chise/est.git] / cwiki-view.el

diff --git a/cwiki-view.el b/cwiki-view.el
index 6d48331..d626714 100644 (file)
--- 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")
@@ -177,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 "
@@ -326,14 +329,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\"
+       (setq ret
+            (format
+             "<img alt=\"HNG-card:%s\"
 src=\"http://hng.chise.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
@@ -535,14 +545,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
@@ -680,7 +691,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
@@ -792,12 +804,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
@@ -835,21 +853,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
 
 ")
-           (princ "Content-Type: text/html; charset=UTF-8
+                )
+               (json
+                (princ "Content-Type: application/json; 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
@@ -909,7 +946,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))