(www-get-feature-value): Add error-handler for `concord-object-get'.

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

diff --git a/cwiki-common.el b/cwiki-common.el
index fc4a2f6..939571b 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -11,6 +11,7 @@
 (concord-assign-genre 'book@ruimoku "/usr/local/var/ruimoku/db")
 
 (concord-assign-genre 'classification@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'region@ruimoku "/usr/local/var/ruimoku/db")
 (concord-assign-genre 'era@ruimoku "/usr/local/var/ruimoku/db")
 (concord-assign-genre 'period@ruimoku "/usr/local/var/ruimoku/db")
 (concord-assign-genre 'journal@ruimoku "/usr/local/var/ruimoku/db")
@@ -138,8 +139,12 @@
          (char-feature object feature))
       )
      (t
-      (or (concord-object-get object latest-feature)
-         (concord-object-get object feature))
+      (or (condition-case nil
+             (concord-object-get object latest-feature)
+           (error nil))
+         (condition-case nil
+             (concord-object-get object feature)
+           (error nil)))
       ))))
 
 (defun get-previous-code-point (ccs code)
@@ -587,7 +592,9 @@
                                                 '=id
                                                 (concord-object-genre unit)
                                                 'genre))
-                                         (www-get-feature-value genre-o 'name)
+                                         (www-get-feature-value
+                                          genre-o
+                                          'object-representation-format)
                                        'name))))
                         (www-format-eval-feature-value
                          unit name-f nil nil nil ret
@@ -999,10 +1006,11 @@
            without-edit
            (eq (plist-get props :mode) 'peek))
        ret
-      (format "%s <a href=\"%s?char=%s&feature=%s&format=%s\"
+      (format "%s <a href=\"%s?%s=%s&feature=%s&format=%s\"
 ><input type=\"submit\" value=\"edit\" /></a>"
              ret
              chise-wiki-edit-url
+             (concord-object-genre object)
              uri-object uri-feature format))))
 
 (defun www-format-eval-feature-value (object