(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 fe4586f..d626714 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -178,14 +178,14 @@ 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\">
@@ -329,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
@@ -538,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
@@ -683,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