diff options
Diffstat (limited to 'src/ellinika')
-rw-r--r-- | src/ellinika/cgi.scm4 | 25 | ||||
-rw-r--r-- | src/ellinika/i18n.scm | 6 |
2 files changed, 24 insertions, 7 deletions
diff --git a/src/ellinika/cgi.scm4 b/src/ellinika/cgi.scm4 index 8c9b54d..51f9570 100644 --- a/src/ellinika/cgi.scm4 +++ b/src/ellinika/cgi.scm4 | |||
@@ -1,5 +1,4 @@ | |||
1 | ;;;; -*- scheme -*- | 1 | ;;;; Greek Dictionary Web Engine -*- scheme -*- |
2 | ;;;; Greek Dictionary Web Engine | 2 | ;;;; Copyright (C) 2005, 2007, 2010, 2015 Sergey Poznyakoff |
3 | ;;;; Copyright (C) 2005, 2007, 2010 Sergey Poznyakoff | ||
4 | ;;;; | 3 | ;;;; |
5 | ;;;; This program is free software; you can redistribute it and/or modify | 4 | ;;;; This program is free software; you can redistribute it and/or modify |
@@ -20,4 +19,6 @@ | |||
20 | #:use-module (ellinika i18n) | 19 | #:use-module (ellinika i18n) |
21 | #:use-module ifelse(IFACE,[CGI],(www cgi),(guile-user)) | 20 | #:use-module ifelse(IFACE,[CGI],(www cgi),(guile-user)) |
21 | #:use-module (ice-9 iconv) | ||
22 | #:use-module (rnrs bytevectors) | ||
22 | #:re-export (base-dir html-dir sysconf-dir locale-path | 23 | #:re-export (base-dir html-dir sysconf-dir locale-path |
23 | ellinika-sql-connection | 24 | ellinika-sql-connection |
@@ -25,5 +26,19 @@ | |||
25 | 26 | ||
26 | 27 | ||
27 | ifelse(IFACE,[CGI],,dnl | 28 | ifelse(IFACE,[CGI],[ |
29 | (define-public cgi-script-name | ||
30 | (cgi:getenv 'script-name)) | ||
31 | (define-public cgi-server-hostname | ||
32 | (cgi:getenv 'server-hostname)) | ||
33 | (define-public cgi-server-protocol-name | ||
34 | (cgi:getenv 'server-protocol-name)) | ||
35 | (define-public cgi-server-protocol-version | ||
36 | (cgi:getenv 'server-protocol-version)) | ||
37 | (define-public (cgi:value-u8 key) | ||
38 | (let ((x (cgi:value key))) | ||
39 | (if x | ||
40 | (utf8->string (string->bytevector x "ISO-8859-1")) | ||
41 | x))) | ||
42 | ],[ | ||
28 | (define form-data | 43 | (define form-data |
29 | (append | 44 | (append |
@@ -60,5 +75,5 @@ ifelse(IFACE,[CGI],,dnl | |||
60 | (1+ slash)))))) | 75 | (1+ slash)))))) |
61 | 76 | ||
62 | ) | 77 | ]) |
63 | 78 | ||
64 | 79 | ||
diff --git a/src/ellinika/i18n.scm b/src/ellinika/i18n.scm index c05d727..40cb47d 100644 --- a/src/ellinika/i18n.scm +++ b/src/ellinika/i18n.scm | |||
@@ -1,4 +1,4 @@ | |||
1 | ;;;; This file is part of Greek Dictionary Web Engine | 1 | ;;;; This file is part of Greek Dictionary Web Engine |
2 | ;;;; Copyright (C) 2006, 2007 Sergey Poznyakoff | 2 | ;;;; Copyright (C) 2006, 2007, 2015 Sergey Poznyakoff |
3 | ;;;; | 3 | ;;;; |
4 | ;;;; This program is free software; you can redistribute it and/or modify | 4 | ;;;; This program is free software; you can redistribute it and/or modify |
@@ -16,8 +16,10 @@ | |||
16 | 16 | ||
17 | (define-module (ellinika i18n) | 17 | (define-module (ellinika i18n) |
18 | #:use-syntax (ice-9 syncase) | ||
19 | #:export-syntax (_) | 18 | #:export-syntax (_) |
20 | #:export (locale-setup)) | 19 | #:export (locale-setup)) |
21 | 20 | ||
21 | (if (= (string->number (major-version)) 1) | ||
22 | (use-modules (ice-9 syncase))) | ||
23 | |||
22 | (define-syntax _ | 24 | (define-syntax _ |
23 | (syntax-rules () | 25 | (syntax-rules () |