diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-01-10 09:27:21 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2015-01-10 09:27:21 +0200 |
commit | 2b99881a880d101ae32a94b3d1e0a792224cb74c (patch) | |
tree | bb5145ebea295ff16b9ebfdb8a4f7d8a5a0a592e /src/cgi-bin/dict.scm4 | |
parent | 5dfd8dd432785ca8d8b6d2c11bac9e110feda52b (diff) | |
download | ellinika-2b99881a880d101ae32a94b3d1e0a792224cb74c.tar.gz ellinika-2b99881a880d101ae32a94b3d1e0a792224cb74c.tar.bz2 |
Switch to guile-www-2.38
* am/guile.m4: Remove.
* Makefile.am (install-html): Fix generation of symlinks
* configure.ac: Fall back to info prefix, if guile-config info bindir
returns empty string.
* data/db.struct: Minor change
* data/pl/Makefile.am: Add missing silent rule markers
* data/ru/Makefile.am: Likewise.
* scm/dictrans.scm: Call setlocale.
* scm/neatrans.scm: Likewise.
* scm/verbop.scm: Likewise.
* src/cgi-bin/conj.scm4: Call setlocale.
Use cgi:value-u8 instead of cgi:value-u8.
* src/cgi-bin/dict.scm4: Likewise.
* src/cgi-bin/nea.scm4: Likewise.
* src/ellinika/cgi.scm4 (cgi-script-name)
(cgi-server-hostname,cgi-server-protocol-name)
(cgi-server-protocol-version): Define in CGI mode.
(cgi:value-u8): New public function.
* src/ellinika/i18n.scm: Conditionally use syncase.
Diffstat (limited to 'src/cgi-bin/dict.scm4')
-rw-r--r-- | src/cgi-bin/dict.scm4 | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/cgi-bin/dict.scm4 b/src/cgi-bin/dict.scm4 index 77c1b3a..3b24367 100644 --- a/src/cgi-bin/dict.scm4 +++ b/src/cgi-bin/dict.scm4 @@ -1,3 +1,3 @@ ;;;; Greek Dictionary Web Engine -;;;; Copyright (C) 2004, 2005, 2006, 2007, 2010, 2011 Sergey Poznyakoff +;;;; Copyright (C) 2004, 2005, 2006, 2007, 2010, 2011, 2015 Sergey Poznyakoff ;;;; @@ -20,2 +20,4 @@ +(setlocale LC_ALL "") + (use-modules ifelse(IFACE,[CGI],(www cgi),(guile-user)) @@ -24,2 +26,3 @@ (gamma sql) + (gamma syslog) (ellinika elmorph) @@ -81,3 +84,3 @@ ifelse(IFACE,[CGI],(cgi:init)) (let* ((name (string-append "join" widget-id)) - (selected-choice (or (let ((s (cgi:value name))) + (selected-choice (or (let ((s (cgi:value-u8 name))) (if s @@ -114,3 +117,3 @@ ifelse(IFACE,[CGI],(cgi:init)) <input size=\"36\" name=\"key\" tabindex=\"1\"") - (let ((value (cgi:value "key"))) + (let ((value (cgi:value-u8 "key"))) (if value @@ -134,3 +137,3 @@ ifelse(IFACE,[CGI],(cgi:init)) - (let ((selected-choice (or (let ((s (cgi:value "pos"))) + (let ((selected-choice (or (let ((s (cgi:value-u8 "pos"))) (if s @@ -168,3 +171,3 @@ ifelse(IFACE,[CGI],(cgi:init)) (display "</td><td>") - (let ((selected-choice (or (let ((s (cgi:value (list-ref category 0)))) + (let ((selected-choice (or (let ((s (cgi:value-u8 (list-ref category 0)))) (if s @@ -355,3 +358,3 @@ ifelse(IFACE,[CGI],(cgi:init)) (set! where-cond (cons - (if (string=? (cgi:value "joinpos") "0") + (if (string=? (cgi:value-u8 "joinpos") "0") " AND" @@ -420,5 +423,4 @@ ifelse(IFACE,[CGI],(cgi:init)) (define (dict-search) - (let ((keyval (if (cgi:value "ident") - (dict:decode-string (cgi:value "ident")) - (cgi:value "key"))) + (let ((keyval (or (cgi:value-u8 "ident") + (cgi:value-u8 "key"))) (theme (do ((catlist (get-topic-list) (cdr catlist)) @@ -427,3 +429,3 @@ ifelse(IFACE,[CGI],(cgi:init)) (let ((name (caar catlist))) - (let ((v (cgi:value name))) + (let ((v (cgi:value-u8 name))) (if (and v (> (string->number v) 0)) @@ -432,5 +434,5 @@ ifelse(IFACE,[CGI],(cgi:init)) (list (= (string->number - (cgi:value (string-append "join" name))) 0) + (cgi:value-u8 (string-append "join" name))) 0) v)))))))) - (pos (or (cgi:value "pos") "0"))) + (pos (or (cgi:value-u8 "pos") "0"))) @@ -523,3 +525,3 @@ dict.forms,articles.subindex,articles.meaning,(dict.pos & conv(\"100000\",16,10) (else - (let ((v (cgi:value name))) + (let ((v (cgi:value-u8 name))) (cond ((and v (not (string-null? v))) |