summaryrefslogtreecommitdiffabout
path: root/src/cgi-bin/conj.scm4
authorSergey Poznyakoff <gray@gnu.org.ua>2011-06-20 14:06:59 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-06-20 14:06:59 (GMT)
commitb6bbb4f2cf0144aa58701cd2b46277838743a277 (patch) (side-by-side diff)
tree1e9bcd3bd7871f2d38ee804b8d803f85317c788b /src/cgi-bin/conj.scm4
parent554d5663361e1506a757e7639524ce4d461d043c (diff)
downloadellinika-b6bbb4f2cf0144aa58701cd2b46277838743a277.tar.gz
ellinika-b6bbb4f2cf0144aa58701cd2b46277838743a277.tar.bz2
Allow for alternative stems in a same tense.
* data/irregular-verbs.xml: Add alternative passive aorist stem for "lev". * scm/verbop.scm (conjugation-set): When setting #:root, keep a list of alternative stems. (flush-mood): Update for changes in #:root storage. * src/cgi-bin/conj.scm4 (show-best-matches): If only one match is produced, show it immediately. * src/ellinika/conjugator.scm: Allow for multiple stems. * src/ellinika/sql.scm (->string): Bugfix.
Diffstat (limited to 'src/cgi-bin/conj.scm4') (more/less context) (ignore whitespace changes)
-rw-r--r--src/cgi-bin/conj.scm43
1 files changed, 3 insertions, 0 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
@@ -328,6 +328,8 @@ ifelse(IFACE,[CGI],(cgi:init))
(cond
((null? result)
(search-failure key))
+ ((= (length result) 1)
+ (show-conjugation (caar result)))
(else
(format #t
"<div class=\"error\"><p>~A</p></div>"
@@ -407,6 +409,7 @@ ifelse(IFACE,[CGI],(cgi:init))
(cgi:names))))
(cons "@@conj@@"
(lambda ()
+ (format #t "<!-- ~A -->" (environ))
(dict-connect)
(main-form)
(do-conj)

Return to:

Send suggestions and report system problems to the System administrator.