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.

5 files changed, 55 insertions, 35 deletions

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,4 +1,4 @@
 ;;;; 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
@@ -19,4 +19,5 @@
 (set! %load-path (cons "GUILE_SITE" %load-path))
 
+(setlocale LC_ALL "")
 (use-modules ifelse(IFACE,[CGI],(www cgi),(guile-user))
 	     (srfi srfi-1)
@@ -62,5 +63,5 @@ ifelse(IFACE,[CGI],(cgi:init))
  <td>
   <input size=\"36\" name=\"key\" tabindex=\"1\"")
-  (let ((value (cgi:value "key")))
+  (let ((value (cgi:value-u8 "key")))
     (if value
 	(begin
@@ -351,5 +352,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 
 (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
@@ -401,5 +402,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 			       ((string=? name "lang"))
 			       (else
-				(let ((v (cgi:value name)))
+				(let ((v (cgi:value-u8 name)))
 				  (cond ((and v (not (string-null? v)))
 					 (display "&amp;")
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,4 +1,4 @@
 ;;;; 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
@@ -19,8 +19,11 @@
 (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)
@@ -80,5 +83,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 (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)
@@ -113,5 +116,5 @@ ifelse(IFACE,[CGI],(cgi:init))
  <td>
   <input size=\"36\" name=\"key\" tabindex=\"1\"")
-  (let ((value (cgi:value "key")))
+  (let ((value (cgi:value-u8 "key")))
     (if value
 	(begin
@@ -133,5 +136,5 @@ ifelse(IFACE,[CGI],(cgi:init))
   (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)
@@ -167,5 +170,5 @@ ifelse(IFACE,[CGI],(cgi:init))
        (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)
@@ -354,5 +357,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 	(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")
@@ -419,19 +422,18 @@ 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))
 		    (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
@@ -522,5 +524,5 @@ dict.forms,articles.subindex,articles.meaning,(dict.pos & conv(\"100000\",16,10)
 			       ((string=? name "lang"))
 			       (else
-				(let ((v (cgi:value name)))
+				(let ((v (cgi:value-u8 name)))
 				  (cond ((and v (not (string-null? v)))
 					 (display "&amp;")
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,4 +1,4 @@
 ;;;; 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
@@ -31,5 +31,5 @@ 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))
@@ -178,5 +178,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 	  (from (catch #t
 		       (lambda ()
-			 (let ((x (string->number (cgi:value "from"))))
+			 (let ((x (string->number (cgi:value-u8 "from"))))
 			   (if (< x count)
 			       x
@@ -184,5 +184,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 		       (lambda args
 			 0)))
-	  (fwd (let ((dir (cgi:value "dir")))
+	  (fwd (let ((dir (cgi:value-u8 "dir")))
 		 (or (not dir)
 		     (string=? dir "1"))))
@@ -200,5 +200,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 	       (begin (if fwd from start))
 	       (end   (if fwd start from))
-	       (id (cgi:value "id")))
+	       (id (cgi:value-u8 "id")))
 
 	   (cond
@@ -274,5 +274,5 @@ ifelse(IFACE,[CGI],(cgi:init))
   (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 -->"))
@@ -338,5 +338,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 				   ((string=? name "lang"))
 				   (else
-				    (let ((v (cgi:value name)))
+				    (let ((v (cgi:value-u8 name)))
 				      (cond ((and v (not (string-null? v)))
 					     (display "&amp;")
@@ -436,5 +436,5 @@ ifelse(IFACE,[CGI],(cgi:init))
 
 (cond
- ((cgi:value "rss")
+ ((cgi:value-u8 "rss")
   ifelse(IFACE,[CGI],
          (display ["Content-type: text/xml; charset=utf-8\r\n\r\n"]),
@@ -448,13 +448,13 @@ ifelse(IFACE,[CGI],(cgi:init))
 	   (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
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 @@
-;;;;                                   -*- 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
@@ -20,4 +19,6 @@
   #: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
@@ -25,5 +26,19 @@
 
 
-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
@@ -60,5 +75,5 @@ ifelse(IFACE,[CGI],,dnl
                                                         (1+ slash))))))
 
-)
+])
 
 
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 @@
 ;;;; 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
@@ -16,8 +16,10 @@
 
 (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 ()