X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=b0c1454550785e157dbefe2f113ccb92e8ce4da8;hb=7cf6374f08c1ced6f96a76e18b1ba51011d20caf;hp=075fce9273977421cc060e44819d6d776b719f33;hpb=40a45a1caa6e826bb9c46d342d34dec90b49551c;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index 075fce9..b0c1454 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -1,25 +1,140 @@ ;; -*- 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.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 ?<) "&lt;") + ;; ((eq c ?>) "&gt;") + ((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 + image-selection + 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 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-char object))) + (setq uri-object (www-uri-encode-object object))) (when (= level 1) (princ (encode-coding-string (format " + + + + EsT %s = %s \n" genre @@ -31,22 +146,46 @@ (mount-char-attribute-table (char-feature-name-at-domain feature '$rev=latest)))) (princ - (format - (if simple - "
- + (if simple + (format + (if est-hide-cgi-mode + "
+ - - -
-
\n" +\n" + "
+ + +\n") + genre rdf-uri-object) + (format "
- + - +\n" + genre + (if (string-match ":" uri-object) + (concat + (est-uri-encode-feature-name-body + (substring uri-object 0 (match-beginning 0))) + "=" + (est-uri-encode-feature-name-body + (substring uri-object (match-end 0)))))))) + (princ + (format " + + +%s
-
\n") - uri-object)) +
\n" + genre rdf-uri-object + (if (eq genre 'character) + (format " + + +\n" + genre rdf-uri-object) + ""))) (when (setq parents (www-get-feature-value object '<-denotational)) (princ (format "

%s %s

\n
\n" (www-format-value-as-char-list parents) @@ -57,21 +196,101 @@ (www-format-feature-name '->subsumptive lang)))) (when (eq genre 'character) (setq GlyphWiki-id (char-GlyphWiki-id object))) - (princ (format "%s%s\n" - level - (www-format-encode-string (char-to-string object)) - (if GlyphWiki-id - (format - " \"%s\"" - GlyphWiki-id - GlyphWiki-id GlyphWiki-id) - "") - level)) + (cond + ((eq genre 'image-resource) + (princ + (if (setq ret (concord-object-get object '=location@iiif)) + (if (concord-object-get object 'image-offset-x) + (format "\"%s\"" + ret ret) + (format "
+ + +" + ret)) + (setq ret (concord-object-get object '=location)) + (format "\"%s\"" + ret ret))) + ) + (t + (setq ret (www-format-encode-string + (est-format-object object 'readable))) + (setq HNG-card + (if (string-match + "\"HNG\\([0-9]+\\)-\\([0-9]+\\)\""%s%s\n" + level + (cond + (uri-feature-name + (format "%s" + ;; (if est-hide-cgi-mode + ;; "%s" + ;; "%s") + (www-uri-make-object-url object uri-object) + ret) + ) + (HNG-card + (format + "%s" + HNG-card ret) + ) + (t ret)) + (if GlyphWiki-id + (format + " \"%s\"" + GlyphWiki-id + GlyphWiki-id GlyphWiki-id) + "") + level)) + )) (if (> level 1) (princ "
\n" + "
  • \n")) + )) )) (princ (if (= level 1) "

    \n" "

  • \n")) + (when feature-name-to-edit + (princ "\n")) (unless simple (princ - (format " " chise-wiki-add-url + genre (www-format-encode-string uri-object)))) (princ (if (= level 1) "

    \n" "

  • \n")) - (princ - "
    \n") - (princ - (www-format-encode-string - (format "%c" object))) - (princ - (format - " \n") + (princ + (www-format-encode-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (format "%c" object) + ;; (format "%s" (concord-object-id object))) + )) + (princ + (format + " " - (encode-coding-string (char-to-string object) 'utf-8-jp-er))) - (princ - (www-format-encode-string - "を\u542Bむ\u6F22\u5B57を\u63A2す")) - (princ " \n") - (princ "
    \n") + (encode-coding-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (char-to-string object) + ;; (format "%s" (concord-object-id object))) + 'utf-8-jp-er))) + (princ + (www-format-encode-string + "を\u542Bむ\u6F22\u5B57を\u63A2す")) + (princ " \n") + (princ "\n") + + (princ + "
    \n") + (princ + (www-format-encode-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (format "%c" object) + ;; (format "%s" (concord-object-id object))) + )) + (princ + (format + " " + (encode-coding-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (char-to-string object) + ;; (format "%s" (concord-object-id object))) + 'utf-8-jp-er))) + (princ + (www-format-encode-string + "を\u542Bむ HNG の\u6F22\u5B57を\u63A2す")) + (princ " \n") + (princ "
    \n") + ) (princ (if (= level 1) "

    \n" "
  • \n")) ))) -(defun www-display-feature-desc (uri-feature-name uri-object +(defun www-display-feature-desc (uri-feature-name genre uri-object &optional lang simple) - (let ((feature-name (www-uri-decode-feature-name uri-feature-name)) + (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))) + (feature-name (www-uri-decode-feature-name uri-feature-name)) (name@lang (intern (format "name@%s" lang)))) (princ (encode-coding-string @@ -155,22 +439,32 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" 'utf-8-mcs-er)) (princ "\n") (princ - (format - (if simple - "
    - + (if simple + (format + (if est-hide-cgi-mode + "
    +
    \n" - "
    - - + "
    + + +
    \n") - uri-feature-name uri-object)) + uri-feature-name genre rdf-uri-object) + (format + "
    + + + +
    +
    \n" + uri-feature-name genre uri-object))) (princ (format "

    %s

    \n" (www-format-encode-string @@ -180,9 +474,10 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (unless simple (princ (format - " " + " " chise-wiki-edit-url uri-feature-name + genre uri-object)) (princ "\n")) (princ "

    \n") @@ -196,10 +491,11 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (unless simple (princ (format - " " + " " chise-wiki-edit-url uri-feature-name name@lang + genre uri-object)) (princ "\n")) (princ "

    \n")) @@ -214,14 +510,36 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (or (www-feature-value-format feature-name) 'default) 'default - 'without-tags))) + 'without-tags) + )) (unless simple (princ (format - " " chise-wiki-edit-url uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "

    \n") + + (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") @@ -235,17 +553,20 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (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 @@ -271,7 +592,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (car (split-string accept-language ",")) ";")) "-")))) - ret) + ret genre) (princ "Content-Type: text/html; charset=UTF-8 " (setq ret (match-end 0)) (setq target (concat "char=" - (www-uri-encode-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-object-desc - 'character - (cdr ret) + 'character (cdr ret) (cdr (assq 'feature target)) + nil 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)) + (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)) + nil + lang nil + (eq mode 'simple)) )) )) (princ "\n
    \n") @@ -320,7 +650,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (princ (format "user=%s\n" user)) ;; (princ (format "local user=%s\n" (user-login-name))) (princ (format "lang=%S\n" lang)) - (princ (emacs-version)) + (princ (encode-coding-string (emacs-version) 'utf-8-jp-er)) ;; (princ " CHISE ") ;; (princ xemacs-chise-version) (princ " @@ -331,4 +661,147 @@ size=\"30\" maxlength=\"30\" value=\"%s\" />" (princ (format "%S" err))) )) +(defun www-batch-view-smart () + (setq debug-on-error t) + (setq terminal-coding-system 'binary) + (condition-case err + (let* ((est-hide-cgi-mode t) + (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 + (car (split-string + (car (split-string accept-language ",")) + ";")) + "-")))) + ret genre feature obj-url json obj) + (cond + ((stringp target) + (when (string-match "/data\\.json$" target) + (setq json t + target (substring target 0 (match-beginning 0)))) + (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) + (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)) + (if (string-match "/feature=" ret) + (list (substring ret 0 (match-beginning 0)) + (substring ret (match-end 0))) + (list ret)))) + (list (decode-uri-string cell 'utf-8-mcs-er))) + ;; (setq ret (split-string cell "/")) + ;; (cons (intern + ;; (decode-uri-string (car ret) 'utf-8-mcs-er)) + ;; (cdr ret)) + ) + (split-string target "&"))) + (setq ret (car target)) + (if json + (princ "Content-Type: application/json; charset=UTF-8 + +") + (princ "Content-Type: text/html; charset=UTF-8 + + + +") + ) + ;; (princ (format "

    %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) + nil + 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)) + ) + ;; ((eq (car ret) 'image-resource) + ;; ;; (cond + ;; ;; ((string-match "^\\.iiif=" (nth 1 ret)) + ;; ;; (setq obj-url (decode-uri-string + ;; ;; (substring (nth 1 ret) (match-end 0)) + ;; ;; 'utf-8-mcs-er)) + ;; ;; (setq obj (concord-images-add-iiif obj-url)) + ;; ;; (www-display-object-desc + ;; ;; 'image-resource + ;; ;; (www-uri-encode-object obj) + ;; ;; (nth 2 ret) + ;; ;; lang nil + ;; ;; (eq mode 'simple)) + ;; ;; ) + ;; ;; (t + ;; (princ (nth 1 ret)) + ;; (www-display-object-desc + ;; 'image-resource (nth 1 ret) (nth 2 ret) + ;; lang nil + ;; (eq mode 'simple)) + ;; ;; )) + ;; ) + (t + (www-display-object-desc + (car ret) (nth 1 ret) (nth 2 ret) + nil + lang nil + (eq mode 'simple)) + )) + )) + (unless json + (princ "\n
    \n") + (princ (format "mode=%S\n" mode)) + (princ (format "user=%s\n" user)) + ;; (princ (format "local user=%s\n" (user-login-name))) + (princ (format "lang=%S\n" lang)) + (princ (encode-coding-string (emacs-version) 'utf-8-jp-er)) + ;; (princ " CHISE ") + ;; (princ xemacs-chise-version) + (princ " + +") + ) + ) + (error nil + (princ (format "%S" err))) + )) + (provide 'cwiki-view)