aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2010-03-15 20:16:21 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2010-03-15 20:16:21 +0000
commit97cb49f1c40856804ccac5925459187b4d3724bb (patch)
treeacf3fbd4f163ccf1970d0fc61efc6801c1da0dec
parent150f2f64e4e580c0d6ab75d4bee150a4369cc4f1 (diff)
downloadellinika-97cb49f1c40856804ccac5925459187b4d3724bb.tar.gz
ellinika-97cb49f1c40856804ccac5925459187b4d3724bb.tar.bz2
Update sql-error-handler definitions.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@542 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r--ChangeLog7
-rw-r--r--src/cgi-bin/dict.scm49
-rw-r--r--src/cgi-bin/nea.scm47
-rw-r--r--src/ellinika/dico.scm10
4 files changed, 12 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index b686a35..c0057fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
12010-03-15 Sergey Poznyakoff <gray@gnu.org.ua>
2
3 * src/ellinika/dico.scm (sql-error-handler): Update arguments
4 to match gamma 5c3643f95.
5 * src/cgi-bin/dict.scm4: Likewise.
6 * src/cgi-bin/nea.scm4: Likewise.
7
12010-03-10 Sergey Poznyakoff <gray@gnu.org.ua> 82010-03-10 Sergey Poznyakoff <gray@gnu.org.ua>
2 9
3 Update for newer Gamma. 10 Update for newer Gamma.
diff --git a/src/cgi-bin/dict.scm4 b/src/cgi-bin/dict.scm4
index 4d301fb..9cd23a8 100644
--- a/src/cgi-bin/dict.scm4
+++ b/src/cgi-bin/dict.scm4
@@ -33,15 +33,10 @@ ifelse(IFACE,[CGI],(cgi:init))
33;; Τα μέρη του λογου 33;; Τα μέρη του λογου
34(define part-of-speech '()) 34(define part-of-speech '())
35 35
36(define (sql-error-handler err descr) 36(define (sql-error-handler key func fmt fmtargs data)
37 (format #t "<h1 class=\"error\">~A</h1>\n" 37 (format #t "<h1 class=\"error\">~A</h1>\n"
38 (_ "ΣΦΆΛΜΑ: σύνδεση με το λέξικο απέτυχε.")) 38 (_ "ΣΦΆΛΜΑ: σύνδεση με το λέξικο απέτυχε."))
39 (with-output-to-port 39 (apply format (current-error-port) fmt fmtargs))
40 (current-error-port)
41 (lambda ()
42 (display err)
43 (display ": ")
44 (display descr))))
45 40
46(define (mk-dict-connect) 41(define (mk-dict-connect)
47 (let ((db-connection #f)) 42 (let ((db-connection #f))
diff --git a/src/cgi-bin/nea.scm4 b/src/cgi-bin/nea.scm4
index b5a9af0..d6099d1 100644
--- a/src/cgi-bin/nea.scm4
+++ b/src/cgi-bin/nea.scm4
@@ -62,12 +62,7 @@ ifelse(IFACE,[CGI],(cgi:init))
62(define (sql-error-handler err descr) 62(define (sql-error-handler err descr)
63 (format #t "<h1 class=\"error\">~A</h1>\n" 63 (format #t "<h1 class=\"error\">~A</h1>\n"
64 (_ "ΣΦΆΛΜΑ: σύνδεση με την βάση δεδομένων απέτυχε.")) 64 (_ "ΣΦΆΛΜΑ: σύνδεση με την βάση δεδομένων απέτυχε."))
65 (with-output-to-port 65 (apply format (current-error-port) fmt fmtargs))
66 (current-error-port)
67 (lambda ()
68 (display err)
69 (display ": ")
70 (display descr))))
71 66
72(defmacro catch-sql (expr) 67(defmacro catch-sql (expr)
73 `(catch 'gsql-error 68 `(catch 'gsql-error
diff --git a/src/ellinika/dico.scm b/src/ellinika/dico.scm
index 7c04db2..f9a6f63 100644
--- a/src/ellinika/dico.scm
+++ b/src/ellinika/dico.scm
@@ -24,14 +24,8 @@
24 (ellinika xlat) 24 (ellinika xlat)
25 (ellinika config)) 25 (ellinika config))
26 26
27(define (sql-error-handler err descr) 27(define (sql-error-handler key func fmt fmtargs data)
28 (format #t "cannot connect to the database") 28 (apply format (current-error-port) fmt fmtargs))
29 (with-output-to-port
30 (current-error-port)
31 (lambda ()
32 (display err)
33 (display ": ")
34 (display descr))))
35 29
36(define (my-sql-query conn query) 30(define (my-sql-query conn query)
37 (catch #t 31 (catch #t

Return to:

Send suggestions and report system problems to the System administrator.