diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-06-20 08:38:55 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-06-20 08:38:55 +0000 |
| commit | 200180e808406c8b103fcb0fdaa812b4500baed4 (patch) | |
| tree | eedf0f37a2a0bea696aa4b16bec36c4674441efa | |
| parent | 7c352b6703367978b1d25de225f2fbe28ef84c70 (diff) | |
| download | ellinika-200180e808406c8b103fcb0fdaa812b4500baed4.tar.gz ellinika-200180e808406c8b103fcb0fdaa812b4500baed4.tar.bz2 | |
Minor changes.
* ellinika/dico.scm4 (catch-sql-failure, ignore-sql-failure):
Remove. Use sql-catch-failure and sql-ignore-failure from Gamma,
instead.
* cgi-bin/dict.scm4: Likewise.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@522 941c8c0f-9102-463b-b60b-cd22ce0e6858
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | cgi-bin/dict.scm4 | 20 | ||||
| -rw-r--r-- | ellinika/dico.scm4 | 14 |
3 files changed, 11 insertions, 30 deletions
@@ -1,3 +1,10 @@ +2008-06-20 Sergey Poznyakoff <gray@gnu.org.ua> + + * ellinika/dico.scm4 (catch-sql-failure, ignore-sql-failure): + Remove. Use sql-catch-failure and sql-ignore-failure from Gamma, + instead. + * cgi-bin/dict.scm4: Likewise. + 2008-06-17 Sergey Poznyakoff <gray@gnu.org.ua> Move the Dico module to modules. diff --git a/cgi-bin/dict.scm4 b/cgi-bin/dict.scm4 index 9448b62..7397feb 100644 --- a/cgi-bin/dict.scm4 +++ b/cgi-bin/dict.scm4 @@ -64,20 +64,8 @@ ifelse(IFACE,[CGI],(cgi:init)) (define dict-connect (mk-dict-connect)) -(defmacro catch-sql-failure (expr) - `(catch 'gsql-error - (lambda () ,expr) - (lambda (key err descr) - (sql-error-handler err descr)))) - -(defmacro ignore-sql-failure (expr) - `(catch 'gsql-error - (lambda () ,expr) - (lambda (key err descr) - #f))) - (define (load-pos) - (ignore-sql-failure + (sql-ignore-failure (let ((conn (dict-connect))) (let ((plist (my-sql-query conn @@ -108,7 +96,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (let ((categories #f)) (letrec ((getcat (lambda () - (ignore-sql-failure + (sql-ignore-failure (let ((conn (dict-connect))) (let ((ctg (my-sql-query conn @@ -490,7 +478,7 @@ ifelse(IFACE,[CGI],(cgi:init)) v)))))))) (pos (or (cgi:value "POS") "0"))) - (catch-sql-failure + (sql-catch-failure (let ((conn (dict-connect))) (cond ((and keyval @@ -548,7 +536,7 @@ ifelse(IFACE,[CGI],(cgi:init)) (if (not stat-data) (set! stat-data (or - (ignore-sql-failure + (sql-ignore-failure (my-sql-query (dict-connect) (string-append "SELECT count,updated from stat WHERE lang='" diff --git a/ellinika/dico.scm4 b/ellinika/dico.scm4 index 4249d1e..64fc071 100644 --- a/ellinika/dico.scm4 +++ b/ellinika/dico.scm4 @@ -27,8 +27,6 @@ (ellinika xlat) (ellinika config)) -;; FIXME: These are defined in dict.scm4 - (define (sql-error-handler err descr) (format #t "cannot connect to the database") (with-output-to-port @@ -38,18 +36,6 @@ (display ": ") (display descr)))) -(defmacro catch-sql-failure (expr) - `(catch 'gsql-error - (lambda () ,expr) - (lambda (key err descr) - (sql-error-handler err descr)))) - -(defmacro ignore-sql-failure (expr) - `(catch 'gsql-error - (lambda () ,expr) - (lambda (key err descr) - #f))) - (define (my-sql-query conn query) (catch #t (lambda () |