3 files changed, 50 insertions, 28 deletions

diff --git a/src/cgi-bin/conj.scm4 b/src/cgi-bin/conj.scm4
index fec7eca..8c5e317 100644
--- a/src/cgi-bin/conj.scm4
+++ b/src/cgi-bin/conj.scm4
@@ -329,4 +329,6 @@ ifelse(IFACE,[CGI],(cgi:init))
      ((null? result)
       (search-failure key))
+     ((= (length result) 1)
+      (show-conjugation (caar result)))
      (else
       (format #t
@@ -408,4 +410,5 @@ ifelse(IFACE,[CGI],(cgi:init))
                    (cons "@@conj@@"
                          (lambda ()
+                           (format #t "<!-- ~A -->" (environ))
                            (dict-connect)
                            (main-form)
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
@@ -48,5 +48,8 @@
      (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)
@@ -102,19 +105,31 @@
 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)
@@ -193,5 +208,5 @@ WHERE verb=\"~A\" AND voice=\"~A\" AND thema=\"~A\""
                 ((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)))
@@ -358,8 +373,7 @@ AND c.tense=\"~A\" AND c.flect = f.ident ORDER by fold"
             "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 ""))
@@ -553,11 +567,16 @@ AND i.tense=\"~A\" AND i.ident=f.ident"
                                              (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
@@ -45,5 +45,5 @@
    ((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))))