summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am3
-rw-r--r--am/guile.m4110
-rw-r--r--configure.ac11
-rw-r--r--data/db.struct6
-rw-r--r--data/pl/Makefile.am4
-rw-r--r--data/ru/Makefile.am4
-rw-r--r--scm/dictrans.scm4
-rw-r--r--scm/neatrans.scm2
-rw-r--r--scm/verbop.scm4
-rw-r--r--src/cgi-bin/conj.scm49
-rw-r--r--src/cgi-bin/dict.scm428
-rw-r--r--src/cgi-bin/nea.scm422
-rw-r--r--src/ellinika/cgi.scm425
-rw-r--r--src/ellinika/i18n.scm6
-rw-r--r--xml/ru/ellinika.xml3
-rw-r--r--xml/ru/rhmata.xml8
16 files changed, 91 insertions, 158 deletions
diff --git a/Makefile.am b/Makefile.am
index 521b3e0..7fac923 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,13 +38,14 @@ install-html:
for file in *.html; do \
${INSTALL} -m 644 $$file $(DESTDIR)$(HTMLDIR)/$$dir/$$file; \
done; \
if test -r $$top_srcdir/xml/$$dir/symlinks; then \
grep -v '^[ \t]*[;#]' $$top_srcdir/xml/$$dir/symlinks | \
sed 's,^/,_,;s,\\.\\./,__/,g' | \
- while read S T; do ln -sf $$S $$T; done; \
+ (cd $(DESTDIR)$(HTMLDIR)/$$dir; \
+ while read S T; do ln -sf $$S $$T; done); \
fi; \
cd $$here; \
fi; \
done
install-data-local: install-html
diff --git a/am/guile.m4 b/am/guile.m4
deleted file mode 100644
index c793a70..0000000
--- a/am/guile.m4
+++ b/dev/null
@@ -1,110 +0,0 @@
-dnl This file is part of GNU mailutils.
-dnl Copyright (C) 2001,2004 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-dnl
-
-dnl MU_RESULT_ACTIONS -- generate shell code for the result of a test
-dnl $1 -- CVAR -- cache variable to check
-dnl $2 -- NAME -- if not empty, used to generate a default value TRUE:
-dnl `AC_DEFINE(HAVE_NAME)'
-dnl $2 -- TRUE -- what to do if the CVAR is not `no'
-dnl $3 -- FALSE -- what to do otherwise; defaults to `:'
-dnl
-AC_DEFUN([MU_RESULT_ACTIONS], [
-[if test "$$1" != "" -a "$$1" != no; then
- ]ifelse([$3], ,
- [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[,1,[FIXME])],
- [$3])[
-else
- ]ifelse([$4], , [:], [$4])[
-fi]])dnl
-
-AC_DEFUN([MU_CHECK_GUILE],
-[
- if test "x$mu_cv_lib_guile" = x; then
- cached=""
- AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH)
- if test $GUILE_CONFIG = no; then
- mu_cv_lib_guile=no
- else
- GUILE_INCLUDES=`guile-config compile`
- GUILE_LIBS=`guile-config link`
- fi
-
- if test $GUILE_CONFIG != no; then
- AC_MSG_CHECKING(for guile version 1.6 or higher)
- GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'`
- case "x$GUILE_VERSION" in
- x[[0-9]]*)
- if test $GUILE_VERSION -lt 16; then
- AC_MSG_RESULT(Nope. Version number too low.)
- mu_cv_lib_guile=no
- else
- AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION,
- [Guile version number: MAX*10 + MIN])
- AC_MSG_RESULT(OK)
- save_LIBS=$LIBS
- save_CFLAGS=$CFLAGS
- LIBS="$LIBS $GUILE_LIBS"
- CFLAGS="$CFLAGS $GUILE_INCLUDES"
- AC_TRY_LINK([#include <libguile.h>],
- ifelse([$1], , scm_shell(0, NULL);, [$1]),
- [mu_cv_lib_guile=yes],
- [mu_cv_lib_guile=no])
- LIBS=$save_LIBS
- CFLAGS=$save_CFLAGS
- fi ;;
- *) AC_MSG_RESULT(Nope. Unknown version number)
- mu_cv_lib_guile=no;;
- esac
- fi
- else
- cached=" (cached) "
- GUILE_INCLUDES=`$GUILE_CONFIG compile`
- GUILE_LIBS=`$GUILE_CONFIG link`
- fi
- AC_MSG_CHECKING(whether to build guile support)
- MU_RESULT_ACTIONS([mu_cv_lib_guile],[LIBGUILE],[$2],[$3])
- AC_MSG_RESULT(${cached}$mu_cv_lib_guile)
-
- if test $mu_cv_lib_guile = yes; then
- AC_ARG_WITH([guiledir],
- AC_HELP_STRING([--with-guiledir=DIR],
- [Specify the directory to install guile modules to]),
- [case $withval in
- /*) GUILE_SITE=$withval;;
- yes) GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site;;
- *) AC_MSG_ERROR([Argument to --with-guiledir must be an absolute directory name]);;
- esac],
- [GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site
- pfx=$prefix
- test "x$pfx" = xNONE && pfx=$ac_default_prefix
- case $GUILE_SITE in
- $pfx/*) ;; # OK
- *) AC_MSG_WARN([guile site directory "$GUILE_SITE" lies outside your current prefix ($pfx).])
- GUILE_SITE='$(datadir)/guile/site'
- AC_MSG_WARN([Falling back to ${GUILE_SITE} instead. Use --with-guiledir to force using site directory.])
- ;;
- esac])
- fi
-
- AC_SUBST(GUILE_SITE)
- AC_SUBST(GUILE_INCLUDES)
- AC_SUBST(GUILE_LIBS)
-])
-
-
-
diff --git a/configure.ac b/configure.ac
index e545dfa..302f2df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,13 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
AC_PREREQ(2.61)
-AC_REVISION(2015-01-06 14:33:57 gray)
+AC_REVISION(2015-01-07 14:56:15 gray)
AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua])
AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4)
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([1.11 silent-rules no-exeext])
AM_CONFIG_HEADER([config.h])
@@ -55,13 +55,22 @@ LIBS="$LIBS $ra_cv_lib_mysqlclient"
## **************
## Directories
## **************
AC_SUBST(GUILE_BINDIR)
+
GUILE_BINDIR=`guile-config info bindir`
+if test -z "$GUILE_BINDIR"; then
+ GUILE_BINDIR=`guile-config info prefix`
+ if test -n "$GUILE_BINDIR"; then
+ GUILE_BINDIR="$GUILE_BINDIR/bin"
+ else
+ AC_MSG_ERROR([Cannot determine guile bin directory])
+ fi
+fi
case `guile -c "(display (member \"$GUILE_SITE\" %load-path))(newline)"` in
\#f) GUILE_COMMENT=;;
*) GUILE_COMMENT=";;" ;;
esac
diff --git a/data/db.struct b/data/db.struct
index 1b2f160..61e3d25 100644
--- a/data/db.struct
+++ b/data/db.struct
@@ -1,8 +1,8 @@
-- This file is part of Ellinika
--- Copyright (C) 2004, 2005, 2007 Sergey Poznyakoff
+-- Copyright (C) 2004, 2005, 2007, 2015 Sergey Poznyakoff
--
-- Ellinika 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
-- (at your option) any later version.
--
@@ -157,8 +157,8 @@ CREATE TABLE newsart(
UNIQUE(ident),
INDEX(lang)
);
----
-source dbverb.struct;
- \ No newline at end of file
+source ./dbverb.struct;
+
diff --git a/data/pl/Makefile.am b/data/pl/Makefile.am
index 8707cf2..0965f9b 100644
--- a/data/pl/Makefile.am
+++ b/data/pl/Makefile.am
@@ -1,8 +1,8 @@
# This file is part of Ellinika project.
-# Copyright (C) 2004, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2007, 2015 Sergey Poznyakoff
#
# Ellinika 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
# (at your option) any later version.
#
@@ -16,9 +16,9 @@
BASEXML=\
setup.xml\
0.xml
dict:
- $(top_builddir)/scm/dictrans $(BASEXML)
+ $(AM_V_GEN)LC_ALL=en_US.UTF-8 $(top_builddir)/scm/dictrans $(BASEXML)
diff --git a/data/ru/Makefile.am b/data/ru/Makefile.am
index 18d1441..b8eb7c7 100644
--- a/data/ru/Makefile.am
+++ b/data/ru/Makefile.am
@@ -1,8 +1,8 @@
# This file is part of Ellinika project.
-# Copyright (C) 2004, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2007, 2015 Sergey Poznyakoff
#
# Ellinika 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
# (at your option) any later version.
#
@@ -45,9 +45,9 @@ EXTRA_DIST=\
7.xml\
iliada.xml\
iliada/2.3.xml\
iliada/2.4.xml
dict:
- $(top_builddir)/scm/dictrans $(BASEXML)
+ $(AM_V_GEN)LC_ALL=en_US.UTF-8 $(top_builddir)/scm/dictrans $(BASEXML)
diff --git a/scm/dictrans.scm b/scm/dictrans.scm
index 2148929..9f1cfd5 100644
--- a/scm/dictrans.scm
+++ b/scm/dictrans.scm
@@ -1,11 +1,11 @@
#! =GUILE_BINDIR=/guile -s
=AUTOGENERATED=
!#
;;;; This file is part of Ellinika
-;;;; Copyright (C) 2004, 2005, 2007, 2010 Sergey Poznyakoff
+;;;; Copyright (C) 2004, 2005, 2007, 2010, 2015 Sergey Poznyakoff
;;;;
;;;; Ellinika 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
;;;; (at your option) any later version.
;;;;
@@ -90,12 +90,14 @@
(ellinika xlat)
(ice-9 getopt-long))
(if (= (string->number (major-version)) 1)
(use-modules (ice-9 syncase)))
+(setlocale LC_ALL "")
+
(define compile-only #f)
(define cleanup-option #f)
(define preserve-option #f)
(define ellinika-sql-connection '())
(define verbose-option #f)
diff --git a/scm/neatrans.scm b/scm/neatrans.scm
index 333453f..4f0fea3 100644
--- a/scm/neatrans.scm
+++ b/scm/neatrans.scm
@@ -37,12 +37,14 @@
(ellinika xlat)
(ice-9 getopt-long))
(if (= (string->number (major-version)) 1)
(use-modules (ice-9 syncase)))
+(setlocale LC_ALL "")
+
(define compile-only #f)
(define cleanup-option #f)
(define force-option #f)
(define verbose-option #f)
(define debug-level 0)
(define input-files '())
diff --git a/scm/verbop.scm b/scm/verbop.scm
index 0ad0f90..b500213 100644
--- a/scm/verbop.scm
+++ b/scm/verbop.scm
@@ -1,13 +1,13 @@
#! /bin/sh
# aside from this initial boilerplate, this is actually -*- scheme -*- code
main='(module-ref (resolve-module '\''(src verbop)) '\'main')'
exec ${GUILE-guile} -l $0 -c "(apply $main (command-line))" "$@"
!#
;;;; This file is part of Ellinika
-;;;; Copyright (C) 2011 Sergey Poznyakoff
+;;;; Copyright (C) 2011, 2015 Sergey Poznyakoff
;;;;
;;;; Ellinika 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
;;;; (at your option) any later version.
;;;;
@@ -28,12 +28,14 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (command-line))" "$@"
(xmltools xmltrans)
(ellinika elmorph)
(ellinika sql)
(ellinika tenses)
(ice-9 getopt-long))
+(setlocale LC_ALL "")
+
(define cleanup-option #f)
(define force-option #f)
(define debug-level 0)
(define input-files '())
(define flect-ident 0)
diff --git a/src/cgi-bin/conj.scm4 b/src/cgi-bin/conj.scm4
index 83fb846..6a49c62 100644
--- a/src/cgi-bin/conj.scm4
+++ b/src/cgi-bin/conj.scm4
@@ -1,8 +1,8 @@
;;;; 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
;;;; (at your option) any later version.
;;;;
@@ -15,12 +15,13 @@
;;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;;;
;;; 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))
(srfi srfi-1)
(ice-9 rdelim)
(ice-9 optargs)
(xmltools dict)
(ellinika config)
@@ -58,13 +59,13 @@ ifelse(IFACE,[CGI],(cgi:init))
<td>")
(display (_"Εισάγετε το ρήμα"))
(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))
(display "\""))))
(display " />
@@ -347,13 +348,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(display "</td>"))
(display "</tr>")))
(display "</table>")))))
(define (do-conj)
- (let ((keyval (cgi:value "key")))
+ (let ((keyval (cgi:value-u8 "key")))
(if (and keyval (not (string-null? keyval)))
(let ((input (ellinika:translate-input
(let ((keyval keyval))
(cond
((string-suffix? "o'" keyval)
(string-set! keyval
@@ -397,13 +398,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(lambda ()
(for-each
(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 "&amp;")
(display name)
(display "=")
(display v)))))))
(cgi:names))))
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,8 +1,8 @@
;;;; 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
;;;; (at your option) any later version.
;;;;
@@ -15,16 +15,19 @@
;;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;;;
;;; 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)
(ellinika cgi))
@@ -76,13 +79,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(if (not categories)
(set! categories (or (getcat) '())))
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)))
(display (string-append "<select name=\""
name
@@ -109,13 +112,13 @@ ifelse(IFACE,[CGI],(cgi:init))
<td>")
(display (_"Εισάγετε τη λέξη"))
(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))
(display "\""))))
(display " />
@@ -129,13 +132,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(display "
<tr>
<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))
(index 0))
@@ -163,13 +166,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(let ((tabindex 4))
(for-each
(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)))
(display (string-append
@@ -350,13 +353,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(cond
((> (string->number pos) 0)
(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)))
(set! where-cond (cons
(string-append " (dict.pos & "
@@ -415,27 +418,26 @@ ifelse(IFACE,[CGI],(cgi:init))
(display "</td>"))
(display "</tr>")))
(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
(not (string-null? keyval))
(null? theme)
@@ -518,13 +520,13 @@ dict.forms,articles.subindex,articles.meaning,(dict.pos & conv(\"100000\",16,10)
(lambda ()
(for-each
(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 "&amp;")
(display name)
(display "=")
(display v)))))))
(cgi:names))))
diff --git a/src/cgi-bin/nea.scm4 b/src/cgi-bin/nea.scm4
index f64aca2..e366a7c 100644
--- a/src/cgi-bin/nea.scm4
+++ b/src/cgi-bin/nea.scm4
@@ -1,8 +1,8 @@
;;;; News page for Ellinika
-;;;; 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
;;;; (at your option) any later version.
;;;;
@@ -27,13 +27,13 @@
(ellinika cgi)
(ellinika i18n))
ifelse(IFACE,[CGI],(cgi:init))
(define tmpl (if (and monima-nea-template-file-name
- (cgi:value "timestamp"))
+ (cgi:value-u8 "timestamp"))
monima-nea-template-file-name
nea-template-file-name))
(ellinika-cgi-init tmpl)
(define article #f)
@@ -174,19 +174,19 @@ ifelse(IFACE,[CGI],(cgi:init))
(caar (ellinika:sql-query
"SELECT count(*) FROM news"))))
(lambda args
0)))
(from (catch #t
(lambda ()
- (let ((x (string->number (cgi:value "from"))))
+ (let ((x (string->number (cgi:value-u8 "from"))))
(if (< x count)
x
0)))
(lambda args
0)))
- (fwd (let ((dir (cgi:value "dir")))
+ (fwd (let ((dir (cgi:value-u8 "dir")))
(or (not dir)
(string=? dir "1"))))
(entries (collect-entries from fwd)))
(let ((start (car entries))
(result (cdr entries)))
@@ -196,13 +196,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(display (_ "Κανένα νέα"))
(display "</div>"))
(else
(let ((num-entries (length result))
(begin (if fwd from start))
(end (if fwd start from))
- (id (cgi:value "id")))
+ (id (cgi:value-u8 "id")))
(cond
((not (and (= from 0) (< num-entries nea-max-rows)))
(display "<p>")
(format #t (_ "Εγγραφείς ~A - ~A") begin end)
(display "</p>")))
@@ -270,13 +270,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(define (display-article-header item)
(display "<div id=\"news-header\">")
(format #t "<span class=\"itemdate\">~A</span>\n" (car item))
(display "<span class=\"itemsubject\">\n")
(display (list-ref item 2))
(display "</span>")
- (if (not (cgi:value "timestamp"))
+ (if (not (cgi:value-u8 "timestamp"))
(permalink "span" (list-ref item 1)))
(display "</div><!-- news-header -->"))
(define (display-article-text item . rest)
(let ((class (and (not (null? rest)) (car rest))))
(cond
@@ -334,13 +334,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(lambda ()
(for-each
(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 "&amp;")
(display name)
(display "=")
(display v)))))))
(cgi:names)))))))
@@ -432,33 +432,33 @@ ifelse(IFACE,[CGI],(cgi:init))
(car art)))))))
;;; Main
(cond
- ((cgi:value "rss")
+ ((cgi:value-u8 "rss")
ifelse(IFACE,[CGI],
(display ["Content-type: text/xml; charset=utf-8\r\n\r\n"]),
(request-rec:set-content-type! Request ["text/xml; charset=UTF-8"]))
(nea-rss))
(else
(catch 'gsql-error
(lambda ()
ifelse(IFACE,[CGI],dnl
(display ["Content-type: text/html; charset=utf-8\r\n\r\n"]))
(ellinika:sql-connect ellinika-sql-connection)
(cond
- ((or (cgi:value "timestamp") (cgi:value "id"))
+ ((or (cgi:value-u8 "timestamp") (cgi:value-u8 "id"))
(let ((tuples
(cond
- ((cgi:value "timestamp") =>
+ ((cgi:value-u8 "timestamp") =>
(lambda (ts)
(ellinika:sql-query
"SELECT date,unix_timestamp(date),ident\
FROM news WHERE unix_timestamp(date)=~Q" ts)))
- ((cgi:value "id") =>
+ ((cgi:value-u8 "id") =>
(lambda (id)
(ellinika:sql-query
"SELECT date,unix_timestamp(date),ident\
FROM news WHERE ident=~N" id))))))
(if (not (null? tuples))
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,9 +1,8 @@
-;;;; -*- scheme -*-
-;;;; Greek Dictionary Web Engine
-;;;; Copyright (C) 2005, 2007, 2010 Sergey Poznyakoff
+;;;; Greek Dictionary Web Engine -*- scheme -*-
+;;;; Copyright (C) 2005, 2007, 2010, 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
;;;; (at your option) any later version.
;;;;
@@ -16,18 +15,34 @@
;;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;;;
(define-module (ellinika cgi)
#:use-module (ellinika config)
#:use-module (ellinika i18n)
#:use-module ifelse(IFACE,[CGI],(www cgi),(guile-user))
+ #:use-module (ice-9 iconv)
+ #:use-module (rnrs bytevectors)
#:re-export (base-dir html-dir sysconf-dir locale-path
ellinika-sql-connection
config-file-name ))
-ifelse(IFACE,[CGI],,dnl
+ifelse(IFACE,[CGI],[
+(define-public cgi-script-name
+ (cgi:getenv 'script-name))
+(define-public cgi-server-hostname
+ (cgi:getenv 'server-hostname))
+(define-public cgi-server-protocol-name
+ (cgi:getenv 'server-protocol-name))
+(define-public cgi-server-protocol-version
+ (cgi:getenv 'server-protocol-version))
+(define-public (cgi:value-u8 key)
+ (let ((x (cgi:value key)))
+ (if x
+ (utf8->string (string->bytevector x "ISO-8859-1"))
+ x)))
+],[
(define form-data
(append
(parse-form-data
(table:get (request-rec:subprocess-env Request) "QUERY_STRING"))
(if (= (request-rec:method-number Request) 2)
(parse-form-data (read-post-data Request))
@@ -56,13 +71,13 @@ ifelse(IFACE,[CGI],,dnl
(let ((slash (string-index server-protocol #\/)))
(set! cgi-server-protocol-name (substring server-protocol
0 slash))
(set! cgi-server-protocol-version (substring server-protocol
(1+ slash))))))
-)
+])
;;; User-definable variables
(define-public dict-template-file-name "dict.html")
(define-public nea-template-file-name "nea.html")
(define-public monima-nea-template-file-name "monima.html")
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,8 +1,8 @@
;;;; This file is part of Greek Dictionary Web Engine
-;;;; Copyright (C) 2006, 2007 Sergey Poznyakoff
+;;;; Copyright (C) 2006, 2007, 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, or (at your option)
;;;; any later version.
;;;;
@@ -12,16 +12,18 @@
;;;; GNU General Public License for more details.
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (ellinika i18n)
- #:use-syntax (ice-9 syncase)
#:export-syntax (_)
#:export (locale-setup))
+(if (= (string->number (major-version)) 1)
+ (use-modules (ice-9 syncase)))
+
(define-syntax _
(syntax-rules ()
((_ msg) (gettext msg))))
;;; ISO 639 language code => ISO 3166 country code
;;; The corresponding country codes where selected using the following
diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml
index 2a0068d..97a801f 100644
--- a/xml/ru/ellinika.xml
+++ b/xml/ru/ellinika.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2004-2011 Sergey Poznyakoff
+<!-- Copyright (C) 2004-2015 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
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
Texts. A copy of the license is included in the file COPYING.FDL -->
@@ -35,12 +35,13 @@
Copyright <![CDATA[&copy;]]> 2004-2011 Sergey Poznyakoff
</FOOTER>
</COPYRIGHT>
<GUILE>
(install-nea)
+ (install-conj)
(install-srch)
#f
</GUILE>
<GROUP TITLE="Введение">
diff --git a/xml/ru/rhmata.xml b/xml/ru/rhmata.xml
index e4f5a38..1c5dfaf 100644
--- a/xml/ru/rhmata.xml
+++ b/xml/ru/rhmata.xml
@@ -1,9 +1,9 @@
<!--
- Copyright (C) 2004 Sergey Poznyakoff
+ Copyright (C) 2004, 2015 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
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
Texts. A copy of the license is included in the file COPYING.FDL -->
@@ -2477,12 +2477,18 @@
<ITEM>θα εχώ αγαπήσει</ITEM>
<ITEM>αγαπημένος</ITEM>
</ROW>
</TABULAR>
</PAGE>
+<PAGE PREFIX="conj" MODE="unnumbered" HEADER="Конъюгатор" REF="CONJ">
+
+@@conj@@
+
+</PAGE>
+
</CHAPTER>
<!-- Local Variables: -->
<!-- mode: ellinika -->
<!-- buffer-file-coding-system: utf-8 -->
<!-- alternative-input-method: cyrillic-jcuken -->

Return to:

Send suggestions and report system problems to the System administrator.