X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=d8b79f39364d6c072af98de43db94cd123aec049;hb=cab9e965a6f59e578df6456d55ea1e8ec54260f1;hp=e2ca2925fd02d677e9426a6e96e811e90a450148;hpb=ed7b7d98e765c5577dfc09cb6ba784269087232d;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index e2ca292..d8b79f3 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -5,14 +5,85 @@ (defvar chise-wiki-edit-url "edit.cgi") (defvar chise-wiki-add-url "add.cgi") -(defun www-display-object-desc (genre uri-object &optional lang level simple) +(defun www-edit-display-feature-input-box (char feature-name + &optional format value) + (if (symbolp char) + (setq char (or (concord-decode-object '=id char 'feature) + (concord-make-object 'feature char)))) + (unless format + (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 "
" + feature-name)) + (princ (encode-coding-string " \u2190 " 'utf-8-mcs-er)) + (princ + (format "%s +
+" + (if (or (eq format 'HEX)(eq format 'hex)) + "0x" + "") + format + (mapconcat (lambda (c) + (cond + ;; ((eq c ?<) "<") + ;; ((eq c ?>) ">") + ((eq c ?\u0022) """) + (t + (char-to-string c)))) + (est-format-list value format nil nil " ") + ""))) + ) + +(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 1)) + (setq level 0)) (let ((object (www-uri-decode-object genre uri-object)) + (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 parents - GlyphWiki-id) + GlyphWiki-id ret object-spec) + (if (eq level 0) + (setq level 1 + without-header nil) + (setq without-header t)) (when object + (when uri-feature-name-to-edit + (setq feature-name-to-edit + (www-uri-decode-feature-name uri-feature-name-to-edit)) + (setq ret (symbol-name feature-name-to-edit)) + (if (string-match "\\*" ret) + (setq base-name-to-edit (intern + (substring ret 0 (match-beginning 0))) + metadata-name-to-edit (intern + (substring ret (match-end 0)))) + (setq base-name-to-edit feature-name-to-edit)) + (when (stringp editing-format) + (setq editing-format (intern editing-format)))) (when (and (eq genre 'character) (= (length uri-object) 1)) (setq uri-object (www-uri-encode-object object))) @@ -20,6 +91,19 @@ (princ (encode-coding-string (format " + +%s %s
\n\n" "
value-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 @@ -267,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 @@ -293,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)) ) @@ -339,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