diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2004-10-12 13:48:17 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2004-10-12 13:48:17 +0000 |
commit | fcf560f10c3e597fd74fabbddd2abcb7856dd7c1 (patch) | |
tree | 517829397ad6900f5ca07caf0846b73412ee047f | |
parent | d31ef40180393b0cd5eeee80164b958132f35423 (diff) | |
download | ellinika-fcf560f10c3e597fd74fabbddd2abcb7856dd7c1.tar.gz ellinika-fcf560f10c3e597fd74fabbddd2abcb7856dd7c1.tar.bz2 |
Improve compatibility with dict.cgi
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@226 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r-- | scm/dictrans.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scm/dictrans.scm b/scm/dictrans.scm index ec87ad8..5d7f38e 100644 --- a/scm/dictrans.scm +++ b/scm/dictrans.scm | |||
@@ -100,7 +100,7 @@ | |||
100 | (define sql-database "ellinika") | 100 | (define sql-database "ellinika") |
101 | (define sql-port 3306) | 101 | (define sql-port 3306) |
102 | (define sql-password #f) | 102 | (define sql-password #f) |
103 | (define sql-user #f) | 103 | (define sql-username #f) |
104 | (define verbose-option #f) | 104 | (define verbose-option #f) |
105 | (define debug-level 0) | 105 | (define debug-level 0) |
106 | (define input-files '()) | 106 | (define input-files '()) |
@@ -108,6 +108,8 @@ | |||
108 | (define sysconf-dir "=SYSCONFDIR=") | 108 | (define sysconf-dir "=SYSCONFDIR=") |
109 | (define config-file-name "ellinika.conf") | 109 | (define config-file-name "ellinika.conf") |
110 | 110 | ||
111 | (define dict-cgi-path #f) | ||
112 | |||
111 | ;;; Load the site defaults | 113 | ;;; Load the site defaults |
112 | (let ((rc-file (string-append sysconf-dir "/" config-file-name))) | 114 | (let ((rc-file (string-append sysconf-dir "/" config-file-name))) |
113 | (if (file-exists? rc-file) | 115 | (if (file-exists? rc-file) |
@@ -767,7 +769,7 @@ | |||
767 | ((password) | 769 | ((password) |
768 | (set! sql-password (cdr x))) | 770 | (set! sql-password (cdr x))) |
769 | ((user) | 771 | ((user) |
770 | (set! sql-user (cdr x))) | 772 | (set! sql-username (cdr x))) |
771 | ((interface) | 773 | ((interface) |
772 | (set! sql-iface (cdr x))) | 774 | (set! sql-iface (cdr x))) |
773 | ((verbose) | 775 | ((verbose) |
@@ -798,7 +800,7 @@ | |||
798 | input-files))) | 800 | input-files))) |
799 | 801 | ||
800 | (let ((conn (sql-connect sql-iface sql-host sql-port sql-database | 802 | (let ((conn (sql-connect sql-iface sql-host sql-port sql-database |
801 | sql-user sql-password))) | 803 | sql-username sql-password))) |
802 | (if (not conn) | 804 | (if (not conn) |
803 | (begin | 805 | (begin |
804 | (display "Cannot connect to the database\n" (current-error-port)) | 806 | (display "Cannot connect to the database\n" (current-error-port)) |