X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cwiki-view.el;h=ae852ba6c6f8e3bc384a3b3bd7b3d950c8f43cf4;hb=849a01df21f7738ed459af83fa0d357d49742f42;hp=76ce3f34b7e5a19408e6f1650c8b4fad386d9c22;hpb=a4ea8dc921250abac392438dd83336c797b4cf8d;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index 76ce3f3..ae852ba 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -1,44 +1,192 @@ ;; -*- coding: utf-8-mcs-er -*- -(require 'cwiki-common) +(require 'cwiki-format) +(require 'char-db-json) (defvar chise-wiki-view-url "view.cgi") -(defvar chise-wiki-edit-url "edit/edit.cgi") -(defvar chise-wiki-add-url "edit/add.cgi") +(defvar chise-wiki-edit-url "edit.cgi") +(defvar chise-wiki-add-url "add.cgi") -(defun www-display-char-desc (uri-char &optional lang level) +(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)) - (let ((char (www-uri-decode-char uri-char)) - logical-feature displayed-features + (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) - (when (characterp char) - (when (= (length uri-char) 1) - (setq uri-char (www-uri-encode-char char))) + GlyphWiki-id HNG-card 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))) (when (= level 1) (princ (encode-coding-string (format " -%s %s
\n%s %s
\n\n" "
\n" "
name : %s " (or (www-format-feature-name feature-name) ""))) - (princ - (format " " - chise-wiki-edit-url - uri-feature-name - uri-char)) - ;; (www-html-display-text - ;; (format "[[[edit|%s?feature=%s&property=name&char=%s]]]" - ;; ;; (char-feature-property feature-name 'name) - ;; chise-wiki-edit-url - ;; uri-feature-name ; (www-uri-encode-feature-name feature-name) - ;; uri-char)) - (princ "
") + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "\n") (when lang (princ "") (princ @@ -158,20 +423,17 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (format "%s : %s" name@lang (or (char-feature-property feature-name name@lang) "")))) - (princ - (format " " - chise-wiki-edit-url - uri-feature-name - name@lang - uri-char)) - ;; (www-html-display-text - ;; (format " [[[edit|%s?feature=%s&property=%s&char=%s]]]" - ;; chise-wiki-edit-url - ;; uri-feature-name - ;; name@lang - ;; uri-char)) - (princ "
")) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + name@lang + genre + uri-object)) + (princ "\n")) + (princ "\n")) (www-html-display-paragraph (format "type : %s" (or (www-feature-type feature-name) @@ -183,28 +445,63 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (or (www-feature-value-format feature-name) 'default) 'default - 'without-tags))) - ;; (www-html-display-paragraph - ;; (format "value-format : %s" - ;; (www-xml-format-list - ;; (or (www-feature-value-format feature-name) - ;; 'default)))) - (princ - (format - " " - chise-wiki-edit-url - uri-feature-name - uri-char)) + 'without-tags) + )) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "\n") - (www-html-display-paragraph - (format "format : %s" - (www-xml-format-list - (or (char-feature-property feature-name 'format) - '((name) " : " (value)))))) + (princ (format "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 + (www-xml-format-list + (www-feature-format feature-name)) + 'utf-8-mcs-er)) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "
\n") + (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 @@ -222,6 +519,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (let* ((target (pop command-line-args-left)) (user (pop command-line-args-left)) (accept-language (pop command-line-args-left)) + (mode (intern (pop command-line-args-left))) (lang (intern (car (split-string @@ -229,7 +527,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (car (split-string accept-language ",")) ";")) "-")))) - ret) + ret genre) (princ "Content-Type: text/html; charset=UTF-8 ") ") (cond ((stringp target) + (when (string-match "^char=\\(&[^&;]+;\\)" target) + (setq ret (match-end 0)) + (setq target + (concat "char=" + (www-uri-encode-object + (www-uri-decode-object + 'character (match-string 1 target))) + (substring target ret)))) (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-char-desc - (cdr ret) ; (decode-uri-string (cdr ret) 'utf-8-mcs-er) - lang) + (www-display-object-desc + 'character (cdr ret) (cdr (assq 'feature target)) + lang nil + (eq mode 'simple)) ) ((eq (car ret) 'feature) (www-display-feature-desc (decode-uri-string (cdr ret) 'utf-8-mcs-er) - (cdr (assq 'char target)) - ;; (decode-uri-string (cdr (assq 'char target))) - lang) + (car (nth 1 target)) + (cdr (nth 1 target)) + lang + (eq mode 'simple)) + ) + (t + (www-display-object-desc + (car ret) (cdr ret) (cdr (assq 'feature target)) + lang nil + (eq mode 'simple)) )) )) (princ "\n%S, %S, %S
" + ;; (car ret)(nth 1 ret)(nth 2 ret))) + ;; (princ (format "// %S %S\n" ret json)) + (cond ((or (eq (car ret) 'char) + (eq (car ret) 'character)) + (if (and json + (setq obj (www-uri-decode-object + (car ret)(nth 1 ret))) + (characterp obj)) + (with-temp-buffer + ;; (princ (encode-coding-string + ;; (format "// %S\n" obj) + ;; char-db-file-coding-system)) + (char-db-json-char-data-with-variant obj 'printable) + (encode-coding-region + (point-min)(point-max) + char-db-file-coding-system) + (princ (buffer-string)) + ) + (www-display-object-desc + 'character (nth 1 ret) (nth 2 ret) + lang nil + (eq mode 'simple))) + ) + ((eq (car ret) 'feature) + (www-display-feature-desc + (decode-uri-string (nth 1 ret) 'utf-8-mcs-er) + (car (nth 1 target)) + (nth 1 (nth 1 target)) + lang + (eq mode 'simple)) + ) + (t + (www-display-object-desc + (car ret) (nth 1 ret) (nth 2 ret) + lang nil + (eq mode 'simple)) + )) + )) + (unless json + (princ "\n