aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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,6 +1,13 @@
+2010-03-15 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * src/ellinika/dico.scm (sql-error-handler): Update arguments
+ to match gamma 5c3643f95.
+ * src/cgi-bin/dict.scm4: Likewise.
+ * src/cgi-bin/nea.scm4: Likewise.
+
2010-03-10 Sergey Poznyakoff <gray@gnu.org.ua>
Update for newer Gamma.
* scm/dictrans.scm: Use Gamma 1.99 syntax.
* scm/neatrans.scm: Likewise.
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
@@ -30,21 +30,16 @@ ifelse(IFACE,[CGI],(cgi:init))
(ellinika-cgi-init dict-template-file-name)
;; Τα μέρη του λογου
(define part-of-speech '())
-(define (sql-error-handler err descr)
+(define (sql-error-handler key func fmt fmtargs data)
(format #t "<h1 class=\"error\">~A</h1>\n"
(_ "ΣΦΆΛΜΑ: σύνδεση με το λέξικο απέτυχε."))
- (with-output-to-port
- (current-error-port)
- (lambda ()
- (display err)
- (display ": ")
- (display descr))))
+ (apply format (current-error-port) fmt fmtargs))
(define (mk-dict-connect)
(let ((db-connection #f))
(lambda (. rest)
(cond
((null? rest)
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
@@ -59,18 +59,13 @@ ifelse(IFACE,[CGI],(cgi:init))
(display "\">[permanent link]</a>")
(display (string-append "</" tag ">")))
(define (sql-error-handler err descr)
(format #t "<h1 class=\"error\">~A</h1>\n"
(_ "ΣΦΆΛΜΑ: σύνδεση με την βάση δεδομένων απέτυχε."))
- (with-output-to-port
- (current-error-port)
- (lambda ()
- (display err)
- (display ": ")
- (display descr))))
+ (apply format (current-error-port) fmt fmtargs))
(defmacro catch-sql (expr)
`(catch 'gsql-error
(lambda () ,expr)
(lambda (key err descr)
(sql-error-handler err descr))))
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
@@ -21,20 +21,14 @@
(ice-9 rdelim)
(gamma sql)
(xmltools dict)
(ellinika xlat)
(ellinika config))
-(define (sql-error-handler err descr)
- (format #t "cannot connect to the database")
- (with-output-to-port
- (current-error-port)
- (lambda ()
- (display err)
- (display ": ")
- (display descr))))
+(define (sql-error-handler key func fmt fmtargs data)
+ (apply format (current-error-port) fmt fmtargs))
(define (my-sql-query conn query)
(catch #t
(lambda ()
(sql-query conn query))
(lambda args

Return to:

Send suggestions and report system problems to the System administrator.