2 files changed, 47 insertions, 28 deletions

diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm
index 0abec8d..f70e20c 100644
--- a/src/ellinika/conjugator.scm
+++ b/src/ellinika/conjugator.scm
@@ -47,7 +47,10 @@
     ((#:attested)
      (list-set! verb 3 (append (list-ref verb 3) (list value))))
     (else
-     (let ((container (assoc key (list-ref verb 2))))
+     (let ((container (assoc key (list-ref verb 2)))
+           (value (if (and (eq? key #:root) (not (list? value)))
+                      (list value)
+                      value)))
        (if container
            (set-cdr! container value)
            (list-set! verb 2 (append (list-ref verb 2)
@@ -101,21 +104,33 @@
                    "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
-                                 (lambda (elt)
-                                   (let ((name (car elt))
-                                         (value (cadr elt)))
-                                     (if (string=? name "override")
-                                         (cons #:override
-                                               (string-split value #\,))
-                                         (cons (symbol->keyword
-                                                (string->symbol name))
-                                               value))))
-                                 verbprop)))))
-    
+    (create-basic-verb-info
+     verb
+     (let loop ((inlist (if (null? verbprop)
+                            '()
+                            (map
+                             (lambda (elt)
+                               (let ((name (car elt))
+                                     (value (cadr elt)))
+                                 (if (string=? name "override")
+                                     (cons #:override
+                                           (string-split value #\,))
+                                     (cons (symbol->keyword
+                                            (string->symbol name))
+                                           value))))
+                             verbprop)))
+                (rootlist '())
+                (outlist '()))
+;       (format #t "ARGS: ~A/~A/~A~%" inlist rootlist outlist)
+       (cond
+        ((null? inlist)
+         (if (null? rootlist)
+             outlist
+             (cons (cons #:root rootlist) outlist)))
+        ((eq? (caar inlist) #:root)
+         (loop (cdr inlist) (cons (cdar inlist) rootlist) outlist))
+        (else
+         (loop (cdr inlist) rootlist (cons (car inlist) outlist))))))))
         
 (define (thema-aoristoy-mesapathitikis-A root)
   (cond
@@ -192,7 +207,7 @@ WHERE verb=\"~A\" AND voice=\"~A\" AND thema=\"~A\""
                (cond
                 ((not (null? result))
                  (verb-set! vinfo #:attested 'root)
-                 (caar result))
+                 (map car result))
                 ((string=? (verb-get vinfo #:conj) "A")
                  (let ((root (verb-A-root elverb)))
                    (cond
@@ -357,10 +372,9 @@ AND c.tense=\"~A\" AND c.flect = f.ident ORDER by fold"
             (conj-info #:accmap conj)
             "000000"))))
         
-(define (apply-flect conj vinfo verb)
+(define (apply-flect conj vinfo verb root)
 ;  (format #t "VINFO ~A~%" vinfo)
-  (let ((root (verb-get vinfo #:root))
-        (suffix (get-suffix conj vinfo))
+  (let ((suffix (get-suffix conj vinfo))
         (accmap (string->list (get-accmap conj vinfo)))
         (augment ""))
 ;    (format #t "ROOT ~A, ACCMAP ~S, SUFFIX: ~A~%" root accmap suffix)
@@ -552,13 +566,18 @@ AND i.tense=\"~A\" AND i.ident=f.ident"
                                                  (car (cdr thema)))
                                              (car thema))))
 ;                   (format #t "VINFO ~A~%" vinfo)
-                 (cons
-                  (cons
-                   (append (apply-flect conj vinfo verb)
-                           (list (verb-get vinfo #:conj)
-                                 (verb-get vinfo #:attested)))
-                   (conj-info #:fold conj))
-                  prev)))))
+
+                 (fold
+                  (lambda (stem prev)
+                    (cons
+                     (cons
+                      (append (apply-flect conj vinfo verb stem)
+                              (list (verb-get vinfo #:conj)
+                                    (verb-get vinfo #:attested)))
+                      (conj-info #:fold conj))
+                     prev))
+                  prev
+                  (verb-get vinfo #:root))))))
            '()
            conj-list))))))))
 
diff --git a/src/ellinika/sql.scm b/src/ellinika/sql.scm
index 5867d28..f281847 100644
--- a/src/ellinika/sql.scm
+++ b/src/ellinika/sql.scm
@@ -44,7 +44,7 @@
    ((string? arg) arg)
    ((elstr? arg) (elstr->string arg))
    ((number? arg) (number->string arg))
-   ((bool? arg) (if arg "true" "false"))
+   ((boolean? arg) (if arg "true" "false"))
    (else
     (error "Unhandled argument type: ~S" arg))))