diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-20 17:06:59 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-20 17:06:59 +0300 |
commit | b6bbb4f2cf0144aa58701cd2b46277838743a277 (patch) | |
tree | 1e9bcd3bd7871f2d38ee804b8d803f85317c788b /src/cgi-bin | |
parent | 554d5663361e1506a757e7639524ce4d461d043c (diff) | |
download | ellinika-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')
-rw-r--r-- | src/cgi-bin/conj.scm4 | 3 |
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)) | |||
328 | (cond | 328 | (cond |
329 | ((null? result) | 329 | ((null? result) |
330 | (search-failure key)) | 330 | (search-failure key)) |
331 | ((= (length result) 1) | ||
332 | (show-conjugation (caar result))) | ||
331 | (else | 333 | (else |
332 | (format #t | 334 | (format #t |
333 | "<div class=\"error\"><p>~A</p></div>" | 335 | "<div class=\"error\"><p>~A</p></div>" |
@@ -407,6 +409,7 @@ ifelse(IFACE,[CGI],(cgi:init)) | |||
407 | (cgi:names)))) | 409 | (cgi:names)))) |
408 | (cons "@@conj@@" | 410 | (cons "@@conj@@" |
409 | (lambda () | 411 | (lambda () |
412 | (format #t "<!-- ~A -->" (environ)) | ||
410 | (dict-connect) | 413 | (dict-connect) |
411 | (main-form) | 414 | (main-form) |
412 | (do-conj) | 415 | (do-conj) |