diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-16 22:01:59 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-16 23:37:03 +0300 |
commit | 79998f1e7772ba1040154c7ba79dc382e23c6302 (patch) | |
tree | b24997235eff88b248bf4156ac77bfda75251bb5 | |
parent | 393fc19572aee23f558f36beedec1a3ee2c89cc2 (diff) | |
download | ellinika-79998f1e7772ba1040154c7ba79dc382e23c6302.tar.gz ellinika-79998f1e7772ba1040154c7ba79dc382e23c6302.tar.bz2 |
Various improvements.
* src/cgi-bin/conj.scm4: Expect argument names in lower case.
* src/cgi-bin/dict.scm4: Likewise.
* src/cgi-bin/nea.scm4: Likewise.
* src/ellinika/cgi.scm4: Likewise.
* xml/lingua.conf.in: Pass lang argument to CGIs in lower case.
* xml/pl/ellinika.xml: Add PREREQ LINGUA attribute.
* xml/ru/ellinika.xml: Likewise.
* xml/uk/ellinika.xml: Likewise.
* .htaccess: Downcase CGI argument names.
-rw-r--r-- | src/cgi-bin/conj.scm4 | 2 | ||||
-rw-r--r-- | src/cgi-bin/dict.scm4 | 14 | ||||
-rw-r--r-- | src/cgi-bin/nea.scm4 | 2 | ||||
-rw-r--r-- | src/ellinika/cgi.scm4 | 6 | ||||
-rw-r--r-- | xml/lingua.conf.in | 4 | ||||
-rw-r--r-- | xml/pl/ellinika.xml | 4 | ||||
-rw-r--r-- | xml/ru/ellinika.xml | 4 | ||||
-rw-r--r-- | xml/uk/ellinika.xml | 4 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/cgi-bin/conj.scm4 b/src/cgi-bin/conj.scm4 index fcacaad..0c7b8f2 100644 --- a/src/cgi-bin/conj.scm4 +++ b/src/cgi-bin/conj.scm4 @@ -296,7 +296,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (for-each (lambda (name) (cond - ((string=? name "LANG")) + ((string=? name "lang")) (else (let ((v (cgi:value name))) (cond ((and v (not (string-null? v))) diff --git a/src/cgi-bin/dict.scm4 b/src/cgi-bin/dict.scm4 index c3429e9..de6b8c5 100644 --- a/src/cgi-bin/dict.scm4 +++ b/src/cgi-bin/dict.scm4 @@ -132,14 +132,14 @@ ifelse(IFACE,[CGI],(cgi:init)) (display (_"Επιλέξτε το μέρος του λόγου")) (display "</td><td>") - (let ((selected-choice (or (let ((s (cgi:value "POS"))) + (let ((selected-choice (or (let ((s (cgi:value "pos"))) (if s (string->number s) #f)) 0)) (index 0)) - (display "<select name=\"POS\" tabindex=\"2\">") + (display "<select name=\"pos\" tabindex=\"2\">") (for-each (lambda (x) @@ -275,7 +275,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (define (display-cross-reference word) (display "<a href=\"") - (display (make-cgi-name cgi-script-name "IDENT" (dict:encode-string word))) + (display (make-cgi-name cgi-script-name "ident" (dict:encode-string word))) (display "\">") (display word) (display "</a>")) @@ -409,8 +409,8 @@ ifelse(IFACE,[CGI],(cgi:init)) (define (dict-search) - (let ((keyval (if (cgi:value "IDENT") - (dict:decode-string (cgi:value "IDENT")) + (let ((keyval (if (cgi:value "ident") + (dict:decode-string (cgi:value "ident")) (cgi:value "key"))) (theme (do ((catlist (get-topic-list) (cdr catlist)) (ret '())) @@ -423,7 +423,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (list (= (string->number (cgi:value (string-append "join" name))) 0) v)))))))) - (pos (or (cgi:value "POS") "0"))) + (pos (or (cgi:value "pos") "0"))) (sql-catch-failure (cond @@ -510,7 +510,7 @@ dict.forms,articles.subindex,articles.meaning\ (for-each (lambda (name) (cond - ((string=? name "LANG")) + ((string=? name "lang")) (else (let ((v (cgi:value name))) (cond ((and v (not (string-null? v))) diff --git a/src/cgi-bin/nea.scm4 b/src/cgi-bin/nea.scm4 index 9c940f6..f64aca2 100644 --- a/src/cgi-bin/nea.scm4 +++ b/src/cgi-bin/nea.scm4 @@ -335,7 +335,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (for-each (lambda (name) (cond - ((string=? name "LANG")) + ((string=? name "lang")) (else (let ((v (cgi:value name))) (cond ((and v (not (string-null? v))) diff --git a/src/ellinika/cgi.scm4 b/src/ellinika/cgi.scm4 index 8cbfeca..d1b4a5c 100644 --- a/src/ellinika/cgi.scm4 +++ b/src/ellinika/cgi.scm4 @@ -92,9 +92,9 @@ ifelse(IFACE,[CGI],,dnl string-append (cons cgi-path - (let ((arglist (let ((lang (cgi:value "LANG"))) + (let ((arglist (let ((lang (cgi:value "lang"))) (do ((ilist (if lang - (cons "LANG" (cons lang rest)) + (cons "lang" (cons lang rest)) rest) (cdr ilist)) (i 1 (1+ i)) (olist '())) @@ -156,7 +156,7 @@ THUNK. ;;; Load the language-specific defaults (cond - ((cgi:value "LANG") => + ((cgi:value "lang") => (lambda (x) (if (file-exists? (template-file x template-file-name)) (set! target-language x))))) diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in index 3b86202..1e7ded3 100644 --- a/xml/lingua.conf.in +++ b/xml/lingua.conf.in @@ -39,7 +39,7 @@ (letrec ((nea (lambda (. args) (string-append (lingua:get-cgi-bin) - "/nea.=SCRIPT_SUFFIX=?LANG=" + "/nea.=SCRIPT_SUFFIX=?lang=" (lingua:LANG args))))) (xmltrans:set-attr "LINGUA" "NEA" nea))) @@ -49,7 +49,7 @@ (letrec ((conj (lambda (. args) (string-append (lingua:get-cgi-bin) - "/conj.=SCRIPT_SUFFIX=?LANG=" + "/conj.=SCRIPT_SUFFIX=?lang=" (lingua:LANG args))))) (xmltrans:set-attr "LINGUA" "CONJ" conj))) diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml index f2d7f15..1c18a62 100644 --- a/xml/pl/ellinika.xml +++ b/xml/pl/ellinika.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff +<!-- Copyright (C) 2004-2011 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -8,7 +8,7 @@ Texts. A copy of the license is included in the file COPYING.FDL --> <!-- $Id$ --> -<LINGUA LANG="pl" TER="PL" PREFIX="ellinika" LINK="rss=/pl/nea.rss"> +<LINGUA PREREQ="1.3 commit=147" LANG="pl" TER="PL" PREFIX="ellinika" LINK="rss=/pl/nea.rss"> <AUTHOR CONTACT="Sergiusza Poznyakowa">Sergey Poznyakoff</AUTHOR> <KEYWORDS>grecki,gramatyka,słownik</KEYWORDS> diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml index 65abe4d..b0ef595 100644 --- a/xml/ru/ellinika.xml +++ b/xml/ru/ellinika.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff +<!-- Copyright (C) 2004-2011 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -8,7 +8,7 @@ Texts. A copy of the license is included in the file COPYING.FDL --> <!-- $Id$ --> -<LINGUA LANG="ru" TER="RU" PREFIX="ellinika" LINK="rss=/ru/nea.rss"> +<LINGUA PREREQ="1.3 commit=147" LANG="ru" TER="RU" PREFIX="ellinika" LINK="rss=/ru/nea.rss"> <AUTHOR CONTACT="Сергею Познякову">Sergey Poznyakoff</AUTHOR> <KEYWORDS>греческий,грамматика,словарь</KEYWORDS> diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml index 5cf32f7..12d8550 100644 --- a/xml/uk/ellinika.xml +++ b/xml/uk/ellinika.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff +<!-- Copyright (C) 2004-2011 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 @@ -8,7 +8,7 @@ Texts. A copy of the license is included in the file COPYING.FDL --> <!-- $Id$ --> -<LINGUA LANG="uk" TER="UA" PREFIX="ellinika" LINK="rss=/uk/nea.rss"> +<LINGUA PREREQ="1.3 commit=147" LANG="uk" TER="UA" PREFIX="ellinika" LINK="rss=/uk/nea.rss"> <AUTHOR CONTACT="Сергія Познякова" >Sergey Poznyakoff</AUTHOR> <KEYWORDS>грецька,граматика,словник</KEYWORDS> |