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 /scm/dictrans.scm | |
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
Diffstat (limited to 'scm/dictrans.scm')
-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 @@ -97,20 +97,22 @@ (define sql-iface "mysql") (define sql-host "localhost") (define sql-database "ellinika") (define sql-port 3306) (define sql-password #f) -(define sql-user #f) +(define sql-username #f) (define verbose-option #f) (define debug-level 0) (define input-files '()) (define sysconf-dir "=SYSCONFDIR=") (define config-file-name "ellinika.conf") +(define dict-cgi-path #f) + ;;; Load the site defaults (let ((rc-file (string-append sysconf-dir "/" config-file-name))) (if (file-exists? rc-file) (load rc-file))) (define (debug level . rest) @@ -764,13 +766,13 @@ (set! sql-host (cdr x))) ((port) (set! sql-port (string->number (cdr x)))) ((password) (set! sql-password (cdr x))) ((user) - (set! sql-user (cdr x))) + (set! sql-username (cdr x))) ((interface) (set! sql-iface (cdr x))) ((verbose) (set! verbose-option #t)) ((preserve) (set! preserve-option #t)) @@ -795,13 +797,13 @@ (lambda (x) (if (not (xmltrans:parse-file x)) (exit 1))) input-files))) (let ((conn (sql-connect sql-iface sql-host sql-port sql-database - sql-user sql-password))) + sql-username sql-password))) (if (not conn) (begin (display "Cannot connect to the database\n" (current-error-port)) (exit 1))) (read-pos conn) |