diff options
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,6 +1,6 @@ ;;;; 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 ;;;; ;;;; This program is free software; you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by ;;;; the Free Software Foundation; either version 3 of the License, or @@ -17,12 +17,15 @@ ;;; Tailor this statement to your needs if necessary. (set! %load-path (cons "GUILE_SITE" %load-path)) +(setlocale LC_ALL "") + (use-modules ifelse(IFACE,[CGI],(www cgi),(guile-user)) (ice-9 rdelim) (xmltools dict) (gamma sql) + (gamma syslog) (ellinika elmorph) (ellinika sql) (ellinika i18n) (ellinika xlat) @@ -78,9 +81,9 @@ ifelse(IFACE,[CGI],(cgi:init)) categories))) (define (join-widget widget-id tabindex) (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 (string->number s) #f)) 0))) @@ -111,9 +114,9 @@ ifelse(IFACE,[CGI],(cgi:init)) (display " </td> <td> <input size=\"36\" name=\"key\" tabindex=\"1\"") - (let ((value (cgi:value "key"))) + (let ((value (cgi:value-u8 "key"))) (if value (begin (display " value=\"") (display (cgi-protect-quotes value)) @@ -131,9 +134,9 @@ ifelse(IFACE,[CGI],(cgi:init)) <td>") (display (_"Επιλέξτε το μέρος του λόγου")) (display "</td><td>") - (let ((selected-choice (or (let ((s (cgi:value "pos"))) + (let ((selected-choice (or (let ((s (cgi:value-u8 "pos"))) (if s (string->number s) #f)) 0)) @@ -165,9 +168,9 @@ ifelse(IFACE,[CGI],(cgi:init)) (lambda (category) (display "<tr><td>") (display (list-ref category 1)) (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 (string->number s) #f)) 0))) @@ -352,9 +355,9 @@ ifelse(IFACE,[CGI],(cgi:init)) (let ((pos-entry (list-ref part-of-speech (string->number pos)))) (if (or (not (string-null? key)) (not (null? theme))) (set! where-cond (cons - (if (string=? (cgi:value "joinpos") "0") + (if (string=? (cgi:value-u8 "joinpos") "0") " AND" " OR") where-cond))) @@ -417,23 +420,22 @@ ifelse(IFACE,[CGI],(cgi:init)) (display "</table>")))))) (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)) (ret '())) ((null? catlist) ret) (let ((name (caar catlist))) - (let ((v (cgi:value name))) + (let ((v (cgi:value-u8 name))) (if (and v (> (string->number v) 0)) (set! ret (append ret (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"))) (sql-catch-failure (cond ((and keyval @@ -520,9 +522,9 @@ dict.forms,articles.subindex,articles.meaning,(dict.pos & conv(\"100000\",16,10) (lambda (name) (cond ((string=? name "lang")) (else - (let ((v (cgi:value name))) + (let ((v (cgi:value-u8 name))) (cond ((and v (not (string-null? v))) (display "&") (display name) (display "=") |