Improve SQL interface.

* src/ellinika/sql.scm (ellinika:sql-verbose)
(ellinika:sql-dry-run,ellinika:sql-conn): New public vars.
(ellinika:format-sql-query): New function.
(ellinika:sql-query): Rewrite.

* scm/verbop.scm: Use (ellinika sql).
* src/ellinika/conjugator.scm: Likewise.
* src/ellinika/test-conjugation.scm: Likewise.
* data/irregular-verbs.xml: Update.
* src/ellinika/tests/conj/apomenv.scm: New file.

5 files changed, 151 insertions, 84 deletions

diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm
index 25ae255..0079d12 100644
--- a/src/ellinika/conjugator.scm
+++ b/src/ellinika/conjugator.scm
@@ -1,4 +1,4 @@
-;;;; Modern Greek Verb Conjugator.
+;;;; Verb Conjugator for modern Greek (δημοτική).
 ;;;; This file is part of Ellinika project.
 ;;;; Copyright (C) 2011 Sergey Poznyakoff
 ;;;;
@@ -21,15 +21,10 @@
              (ellinika elmorph)
              (ellinika i18n)
              (ellinika tenses)
-             (gamma sql))
+             (ellinika sql))
 
 (use-syntax (ice-9 syncase))
 
-(define (my-sql-query conn query)
-;  (format #t "Q: ~A~%" query)
-  (let ((res (sql-query conn query)))
-;    (format #t "R: ~A~%" res)
-    res))
 
 ;; Verb info
 ;;  #:verb  - Verb in dictionary form
@@ -80,36 +75,33 @@
    ;; FIXME: deponentia?
    (else                         "A")))
 
-(define (create-basic-verb-info conn verb proplist . rest)
+(define (create-basic-verb-info verb proplist . rest)
 ;  (format #t "PROPLIST ~A~%" proplist)
   (let ((class (if (null? rest)
                    ""
-                   (string-append " AND conj='" (car rest) "'"))))
-    (let ((vdb (my-sql-query
-                conn
-                (string-append
-                 "SELECT conj FROM verbclass WHERE verb='" (force-string verb) "'"
-                 class))))
+                   (string-append
+                    " AND conj=\"" (utf8-escape (car rest)) "\""))))
+    (let ((vdb (ellinika:sql-query
+                "SELECT conj FROM verbclass WHERE verb=\"~A\"~A"
+                verb class)))
       (cond
-       ((and vdb (not (null? vdb)));FIXME
+       ((and vdb (not (null? vdb)))
         (list (caar vdb) verb proplist '(class)))
        ((elstr-suffix? verb "άω")
-        (create-basic-verb-info conn (elstr-append
-                                      (elstr-trim verb -2) "ώ") "B1"))
+        (create-basic-verb-info (elstr-append
+                                 (elstr-trim verb -2) "ώ") "B1"))
        ((null? rest)
         (list (guess-verb-class verb) verb proplist '()))
        (else
         (list (car rest) verb '() '()))))))
 
-(define (load-verb-info conn verb voice mood tense)
+(define (load-verb-info verb voice mood tense)
 ;  (format #t "LOAD ~A~%" verb)
-  (let ((verbprop (my-sql-query
-                   conn
-                   (string-append
-                    "SELECT property,value FROM verbtense WHERE "
-                    "verb=\"" verb "\" AND voice=\"" voice
-                    "\" AND mood=\"" mood "\" AND tense=\"" tense "\""))))
-    (create-basic-verb-info conn verb
+  (let ((verbprop (ellinika:sql-query
+                   "SELECT property,value FROM verbtense WHERE \
+verb=\"~A\" AND voice=\"~A\" AND mood=\"~A\" AND tense=\"~A\""
+                   verb voice mood tense)))
+    (create-basic-verb-info verb
                             (if (null? verbprop)
                                 '()
                                 (map
@@ -173,12 +165,11 @@
      (else
       (elstr-append root "ηθ")))))
 
-(define (lookup-verb-info conn verb voice thema)
-  (my-sql-query
-   conn
-   (string-append
-                 "SELECT root FROM irregular_root \
-WHERE verb='" verb "' AND voice='" voice "' AND thema='" thema "'")))
+(define (lookup-verb-info verb voice thema)
+  (ellinika:sql-query
+   "SELECT root FROM irregular_root \
+WHERE verb=\"~A\" AND voice=\"~A\" AND thema=\"~A\""
+   verb voice thema))
 
 (define (verb-A-root verb)
   (cond
@@ -189,12 +180,12 @@ WHERE verb='" verb "' AND voice='" voice "' AND thema='" thema "'")))
    (else
     (error "cannot handle ~A~%" verb))))
 
-(define (complement-verb-info conn vinfo verb voice thema)
+(define (complement-verb-info vinfo verb voice thema)
 ;  (format #t "COMPLEMENT ~A~%" thema)
   (let ((elverb (string->elstr verb))
-        (result (let ((tmpres (lookup-verb-info conn verb voice thema)))
+        (result (let ((tmpres (lookup-verb-info verb voice thema)))
                   (if (and (null? tmpres) (string=? thema "sub"))
-                      (lookup-verb-info conn verb voice "aor")
+                      (lookup-verb-info verb voice "aor")
                       tmpres))))
     (verb-set! vinfo #:root
                (cond
@@ -235,7 +226,7 @@ WHERE verb='" verb "' AND voice='" voice "' AND thema='" thema "'")))
                      (thema-aoristoy-mesapathitikis-B
                       root
                       (list-ref
-                       (conjugate conn verb "act" "ind" "Αόριστος")
+                       (conjugate verb "act" "ind" "Αόριστος")
                        0)))
                     (else
                      #f))))
@@ -292,15 +283,15 @@ WHERE verb='" verb "' AND voice='" voice "' AND thema='" thema "'")))
     ((conj-info-set! #:accmap v)
      (list-set! v 2 val)) ))
 
-(define (get-conj-info conn conj voice mood tense)
-  (let ((answer (my-sql-query
-                 conn
-                 (string-append
+(define (get-conj-info conj voice mood tense)
+  (let ((answer (ellinika:sql-query
       "SELECT c.thema,c.suffix,c.accmap,c.particle,c.aux,c.auxtense,c.fold AS fold,\
 f.sing1,f.sing2,f.sing3,f.plur1,f.plur2,f.plur3 \
 FROM conjugation c, verbflect f \
-WHERE c.conj='" conj "' AND c.voice='" voice "' AND c.mood='" mood
-"' AND c.tense='" tense "' AND c.flect = f.ident ORDER by fold"))))
+WHERE c.conj=\"~A\" AND c.voice=\"~A\" AND c.mood=\"~A\" \
+AND c.tense=\"~A\" AND c.flect = f.ident ORDER by fold"
+      conj voice mood tense)))
+    
     (if (null? answer)
         #f
         answer)))
@@ -439,14 +430,13 @@ WHERE c.conj='" conj "' AND c.voice='" voice "' AND c.mood='" mood
            forms)
           (map force-string forms)))))
 
-(define (individual-verb conn verb voice mood tense)
-  (let ((res (my-sql-query
-              conn
-              (string-append
-               "SELECT f.sing1,f.sing2,f.sing3,f.plur1,f.plur2,f.plur3 \
+(define (individual-verb verb voice mood tense)
+  (let ((res (ellinika:sql-query
+              "SELECT f.sing1,f.sing2,f.sing3,f.plur1,f.plur2,f.plur3 \
 FROM individual_verb i,verbflect f \
-WHERE i.verb='" verb "' AND i.voice='" voice "' AND i.mood='" mood
-"' AND i.tense = '" tense "' AND i.ident=f.ident"))))
+WHERE i.verb=\"~A\" AND i.voice=\"~A\" AND i.mood=\"~A\"\
+AND i.tense=\"~A\" AND i.ident=f.ident"
+              verb voice mood tense)))
     (if (not (null? res))
         (append (car res)
                 (list "I"
@@ -459,15 +449,14 @@ WHERE i.verb='" verb "' AND i.voice='" voice "' AND i.mood='" mood
      (or a b))
    lista listb))
 
-(define (conjugate conn verb voice mood tense . rest)
+(define (conjugate verb voice mood tense . rest)
   (cond
-   ((individual-verb conn verb voice mood tense) =>
+   ((individual-verb verb voice mood tense) =>
     (lambda (res)
       (list res)))
    (else
-    (let* ((vinfo (load-verb-info conn verb voice mood tense))
-           (conj-list (get-conj-info conn
-                                     (verb-get vinfo #:conj)
+    (let* ((vinfo (load-verb-info verb voice mood tense))
+           (conj-list (get-conj-info (verb-get vinfo #:conj)
                                      voice mood tense)))
       (if (not conj-list)
           (list (list #f #f #f #f #f #f) #f #f)
@@ -496,7 +485,7 @@ WHERE i.verb='" verb "' AND i.voice='" voice "' AND i.mood='" mood
                 (cond
                  ((string=? (conj-info #:thema conj) "synt")
                   (let* ((verb-conj
-                          (car (conjugate conn verb voice "sub" "Αόριστος"
+                          (car (conjugate verb voice "sub" "Αόριστος"