X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=d8b79f39364d6c072af98de43db94cd123aec049;hb=8d1f45bec95682f85a982025a9cb384c4f07d307;hp=1605d6811cce7c374cc1dca5d7cc7b59bf4b776a;hpb=19098062c72923a2b738639148e909989ac9e587;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index 1605d68..d8b79f3 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -14,6 +14,9 @@ (setq format 'default)) (unless value (setq value (www-get-feature-value char feature-name))) + (if (and (symbolp value) + (eq format 'wiki-text)) + (setq value (list (list value)))) (princ (format "
" @@ -35,17 +38,30 @@ size=\"64\" maxlength=\"256\" value=\"%s\"> ((eq c ?\u0022) """) (t (char-to-string c)))) - (www-format-value char feature-name - value format 'without-tags) + (est-format-list value format nil nil " ") ""))) ) -(defun www-display-object-desc (genre uri-object &optional lang level simple +(defun www-display-object-desc (genre uri-object &optional uri-feature-name + lang level simple uri-feature-name-to-edit editing-format) (unless level (setq level 0)) (let ((object (www-uri-decode-object genre uri-object)) - feature-name-to-edit + (est-eval-list-feature-items-limit est-eval-list-feature-items-limit) + (est-view-url-prefix (if uri-feature-name + "../.." + "..")) + (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))) + feature-name-to-display feature-name-to-edit base-name-to-edit metadata-name-to-edit without-header logical-feature chise-wiki-displayed-features @@ -75,6 +91,19 @@ size=\"64\" maxlength=\"256\" value=\"%s\"> (princ (encode-coding-string (format "
+ +%s %s
\nvalue-presentation-format : %s " + (www-format-value + nil 'value-presentation-format + (or (www-feature-value-format feature-name) + 'default) + 'default + 'without-tags) + )) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "
\n") + (princ "format : ") (www-html-display-text (decode-coding-string @@ -356,7 +482,9 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (www-html-display-paragraph (format "description : %s" - (or (char-feature-property feature-name 'description) + (or (decode-coding-string + (char-feature-property feature-name 'description) + 'utf-8-mcs-er) ""))) (when lang (www-html-display-paragraph @@ -382,7 +510,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (car (split-string accept-language ",")) ";")) "-")))) - ret) + ret genre) (princ "Content-Type: text/html; charset=UTF-8 " (setq target (mapcar (lambda (cell) (if (string-match "=" cell) - (cons - (intern - (decode-uri-string - (substring cell 0 (match-beginning 0)) - 'utf-8-mcs-er)) - (substring cell (match-end 0))) + (progn + (setq genre (substring cell 0 (match-beginning 0)) + ret (substring cell (match-end 0))) + (cons + (intern + (decode-uri-string genre 'utf-8-mcs-er)) + ret)) (list (decode-uri-string cell 'utf-8-mcs-er)))) (split-string target "&"))) (setq ret (car target)) (cond ((eq (car ret) 'char) (www-display-object-desc - 'character - (cdr ret) + 'character (cdr ret) (cdr (assq 'feature target)) lang nil (eq mode 'simple)) ) @@ -428,8 +556,100 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" ) (t (www-display-object-desc - (car ret) - (cdr ret) + (car ret) (cdr ret) (cdr (assq 'feature target)) + lang nil + (eq mode 'simple)) + )) + )) + (princ "\n