Improve coupling between dict and conj.

* po/pl.po: Update
* src/cgi-bin/conj.scm4: Use cgi-program-name to generate
references to dict.
* src/cgi-bin/dict.scm4: Add a reference to conjugator (for verbs).
* src/ellinika/Makefile.am: Define SCRIP_SUFFIX
* src/ellinika/cgi.scm4 (cgi-program-name): New function.
* style.css: Update.

8 files changed, 138 insertions, 61 deletions

diff --git a/po/pl.po b/po/pl.po
index d73b4b6..f5b9957 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,4 +9,4 @@ msgstr ""
 "Report-Msgid-Bugs-To: gray@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 17:11+0300\n"
-"PO-Revision-Date: 2011-06-18 17:13+0300\n"
+"POT-Creation-Date: 2011-06-20 13:02+0300\n"
+"PO-Revision-Date: 2011-06-20 13:04+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org.ua>\n"
@@ -48,3 +48,7 @@ msgstr "Szukaj"
 
-#: src/cgi-bin/dict.scm4:314 src/cgi-bin/conj.scm4:289
+#: src/cgi-bin/dict.scm4:271
+msgid "κλίση"
+msgstr "koniugacja"
+
+#: src/cgi-bin/dict.scm4:323 src/cgi-bin/conj.scm4:311
 #, lisp-format
@@ -53,3 +57,3 @@ msgstr "Słowa \"~A\" nie znaleziono w słowniku."
 
-#: src/cgi-bin/dict.scm4:462
+#: src/cgi-bin/dict.scm4:471
 msgid "Αντώνυμο: "
@@ -57,3 +61,3 @@ msgstr "Antonim: "
 
-#: src/cgi-bin/dict.scm4:462
+#: src/cgi-bin/dict.scm4:471
 msgid "Αντώνυμα: "
@@ -61,3 +65,3 @@ msgstr "Antonimy: "
 
-#: src/cgi-bin/dict.scm4:470
+#: src/cgi-bin/dict.scm4:479
 msgid "Βλέπετε επίσης "
@@ -65,3 +69,3 @@ msgstr "Patrz także "
 
-#: src/cgi-bin/dict.scm4:540
+#: src/cgi-bin/dict.scm4:549
 msgid "λέξη"
@@ -105,3 +109,3 @@ msgstr "Koniugacja"
 
-#: src/cgi-bin/conj.scm4:252
+#: src/cgi-bin/conj.scm4:270
 msgid "δεν βρέθηκε στο λέξικο"
@@ -109,3 +113,7 @@ msgstr "nie znaleziono w słowniku"
 
-#: src/cgi-bin/conj.scm4:266
+#: src/cgi-bin/conj.scm4:275
+msgid "Η συζυγία αυτό του ρήματος δεν επιβεβαιώνεται από τη βάση δεδοµένων"
+msgstr ""
+
+#: src/cgi-bin/conj.scm4:288
 msgid "Μη έγκυρη είσοδος"
@@ -113,3 +121,3 @@ msgstr "Niepoprawne wejście"
 
-#: src/cgi-bin/conj.scm4:312
+#: src/cgi-bin/conj.scm4:334
 msgid ""
@@ -121,3 +129,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:345
+#: src/cgi-bin/conj.scm4:367
 msgid ""
@@ -126 +134,5 @@ msgid ""
 msgstr "Podane słowo nie jest rzeczownikiem w formie 1.os. liczby pojedynczej."
+
+#: src/cgi-bin/conj.scm4:387
+msgid "Το θέμα αυτού του χρόνου δεν επιβεβαιώνεται από τη βάση δεδοµένων"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 41a7896..d6517cd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,3 +9,3 @@ msgstr ""
 "Report-Msgid-Bugs-To: gray@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 17:11+0300\n"
+"POT-Creation-Date: 2011-06-20 13:02+0300\n"
 "PO-Revision-Date: 2006-03-17 21:42+0200\n"
@@ -49,3 +49,7 @@ msgstr "Поиск"
 
-#: src/cgi-bin/dict.scm4:314 src/cgi-bin/conj.scm4:289
+#: src/cgi-bin/dict.scm4:271
+msgid "κλίση"
+msgstr ""
+
+#: src/cgi-bin/dict.scm4:323 src/cgi-bin/conj.scm4:311
 #, lisp-format
@@ -54,3 +58,3 @@ msgstr "Извините, слово \"~A\" не найдено в словар�
 
-#: src/cgi-bin/dict.scm4:462
+#: src/cgi-bin/dict.scm4:471
 msgid "Αντώνυμο: "
@@ -58,3 +62,3 @@ msgstr "Антоним: "
 
-#: src/cgi-bin/dict.scm4:462
+#: src/cgi-bin/dict.scm4:471
 msgid "Αντώνυμα: "
@@ -62,3 +66,3 @@ msgstr "Антонимы: "
 
-#: src/cgi-bin/dict.scm4:470
+#: src/cgi-bin/dict.scm4:479
 msgid "Βλέπετε επίσης "
@@ -66,3 +70,3 @@ msgstr "См. также "
 
-#: src/cgi-bin/dict.scm4:540
+#: src/cgi-bin/dict.scm4:549
 msgid "λέξη"
@@ -107,3 +111,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:252
+#: src/cgi-bin/conj.scm4:270
 #, fuzzy
@@ -112,3 +116,7 @@ msgstr "Извините, слово \"~A\" не найдено в словар�
 
-#: src/cgi-bin/conj.scm4:266
+#: src/cgi-bin/conj.scm4:275
+msgid "Η συζυγία αυτό του ρήματος δεν επιβεβαιώνεται από τη βάση δεδοµένων"
+msgstr ""
+
+#: src/cgi-bin/conj.scm4:288
 msgid "Μη έγκυρη είσοδος"
@@ -116,3 +124,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:312
+#: src/cgi-bin/conj.scm4:334
 msgid ""
@@ -122,3 +130,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:345
+#: src/cgi-bin/conj.scm4:367
 msgid ""
@@ -127 +135,5 @@ msgid ""
 msgstr ""
+
+#: src/cgi-bin/conj.scm4:387
+msgid "Το θέμα αυτού του χρόνου δεν επιβεβαιώνεται από τη βάση δεδοµένων"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 100ce42..3bd8d08 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,3 +9,3 @@ msgstr ""
 "Report-Msgid-Bugs-To: gray@gnu.org\n"
-"POT-Creation-Date: 2011-06-18 17:11+0300\n"
+"POT-Creation-Date: 2011-06-20 13:02+0300\n"
 "PO-Revision-Date: 2006-03-24 19:25+0200\n"
@@ -48,3 +48,7 @@ msgstr "Пошук"
 
-#: src/cgi-bin/dict.scm4:314 src/cgi-bin/conj.scm4:289
+#: src/cgi-bin/dict.scm4:271
+msgid "κλίση"
+msgstr ""
+
+#: src/cgi-bin/dict.scm4:323 src/cgi-bin/conj.scm4:311
 #, lisp-format
@@ -53,3 +57,3 @@ msgstr "Пробачте, слова \"~A\" у словнику немає."
 
-#: src/cgi-bin/dict.scm4:462
+#: src/cgi-bin/dict.scm4:471
 msgid "Αντώνυμο: "
@@ -57,3 +61,3 @@ msgstr "Антоним:"
 
-#: src/cgi-bin/dict.scm4:462
+#: src/cgi-bin/dict.scm4:471
 msgid "Αντώνυμα: "
@@ -61,3 +65,3 @@ msgstr "Антоними:"
 
-#: src/cgi-bin/dict.scm4:470
+#: src/cgi-bin/dict.scm4:479
 msgid "Βλέπετε επίσης "
@@ -65,3 +69,3 @@ msgstr "Див. також "
 
-#: src/cgi-bin/dict.scm4:540
+#: src/cgi-bin/dict.scm4:549
 msgid "λέξη"
@@ -106,3 +110,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:252
+#: src/cgi-bin/conj.scm4:270
 #, fuzzy
@@ -111,3 +115,7 @@ msgstr "Пробачте, слова \"~A\" у словнику немає."
 
-#: src/cgi-bin/conj.scm4:266
+#: src/cgi-bin/conj.scm4:275
+msgid "Η συζυγία αυτό του ρήματος δεν επιβεβαιώνεται από τη βάση δεδοµένων"
+msgstr ""
+
+#: src/cgi-bin/conj.scm4:288
 msgid "Μη έγκυρη είσοδος"
@@ -115,3 +123,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:312
+#: src/cgi-bin/conj.scm4:334
 msgid ""
@@ -121,3 +129,3 @@ msgstr ""
 
-#: src/cgi-bin/conj.scm4:345
+#: src/cgi-bin/conj.scm4:367
 msgid ""
@@ -126 +134,5 @@ msgid ""
 msgstr ""
+
+#: src/cgi-bin/conj.scm4:387
+msgid "Το θέμα αυτού του χρόνου δεν επιβεβαιώνεται από τη βάση δεδοµένων"
+msgstr ""
diff --git a/src/cgi-bin/conj.scm4 b/src/cgi-bin/conj.scm4
index 72da00e..fec7eca 100644
--- a/src/cgi-bin/conj.scm4
+++ b/src/cgi-bin/conj.scm4
@@ -247,7 +247,2 @@ ifelse(IFACE,[CGI],(cgi:init))
 	  
-(define (dict-cgi-name)
-  (let* ((my-name cgi-script-name)
-	 (slpos (string-rindex my-name #\/)))
-    (string-append (substring my-name 0 slpos) "/dict.SCRIPT_SUFFIX")))
-
 (define (show-conjugation verb)
@@ -268,3 +263,3 @@ ifelse(IFACE,[CGI],(cgi:init))
 		       (make-cgi-name
-			(dict-cgi-name) "ident" (dict:encode-string verb))
+			(cgi-program-name "dict") "ident" (dict:encode-string verb))
 		       verb (caar descr)))
@@ -330,3 +325,3 @@ ifelse(IFACE,[CGI],(cgi:init))
  WHERE sound LIKE ~Q\
- AND (pos & 1048576) = 1048576 ORDER BY 1"
+ AND (pos & 1048576) <> 0 ORDER BY 1"
 		 (ellinika:sounds-like key))))
diff --git a/src/cgi-bin/dict.scm4 b/src/cgi-bin/dict.scm4
index de6b8c5..77c1b3a 100644
--- a/src/cgi-bin/dict.scm4
+++ b/src/cgi-bin/dict.scm4
@@ -235,6 +235,8 @@ ifelse(IFACE,[CGI],(cgi:init))
 (define (display-results rlist)
-  (let ((x (car rlist)))
-    (display "<table class=\"noframe\">")
-    (display "<tr><td>")
-    (display (car x))
+  (let* ((x (car rlist))
+	 (word (car x))
+	 (isverb (> (string->number (list-ref x 6)) 0)))
+    (display "<table class=\"dict-result\">")
+    (display "<tr><td class=\"dict-word\">")
+    (display word)
     (display "</td>")
@@ -242,3 +244,3 @@ ifelse(IFACE,[CGI],(cgi:init))
      ((list-ref x 3)
-      (display "<td>")
+      (display "<td class=\"dict-word-forms\">")
       (let ((href (assoc (list-ref x 2) word-forms-reference)))
@@ -261,14 +263,21 @@ ifelse(IFACE,[CGI],(cgi:init))
       (display "</td>")))
-    (display "<td>")
+    (display "<td class=\"dict-pos\">")
     (display (list-ref x 2))
-    (display "</td></tr>"))
+    (display "</td>")
+    (if isverb
+	(format #t "<td class=\"conj-ref\"><a href=\"~A\">~A</a></td>"
+		(make-cgi-name
+		 (cgi-program-name "conj") "key" (dict:encode-string word))
+		(_ "κλίση")))
+    (display "</tr>"))
+  (display "</table>")
+  (newline)
+  (display "<ol class=\"dict-articles\">")
   (for-each
    (lambda (x)
-     (display "<tr><td>")
-     (display (1+ (string->number (list-ref x 4))))
-     (display "</td><td>")
+     (display "<li>")
      (display (replace-tilde (car x) (list-ref x 5)))
-     (display ";</td></tr>"))
+     (display ";</li>"))
    rlist)
-  (display "</table>")
+  (display "</ol>")
   (newline))
@@ -437,3 +446,3 @@ ifelse(IFACE,[CGI],(cgi:init))
 		       "SELECT dict.word,dict.ident,pos.abbr,\
-dict.forms,articles.subindex,articles.meaning\
+dict.forms,articles.subindex,articles.meaning,(dict.pos & conv(\"100000\",16,10))\
  FROM dict,articles,pos WHERE dict.word=~Q\
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am
index 01534c0..12e0392 100644
--- a/src/ellinika/Makefile.am
+++ b/src/ellinika/Makefile.am
@@ -34,12 +34,13 @@ cgi.m4: Makefile
 	echo 'undefine([format])' >> $@
-	echo 'define([IFACE],$(APACHE_IFACE))' >> $@
-	echo 'define([GUILE_BINDIR],$(GUILE_BINDIR))' >> $@
-	echo 'define([GUILE_SITE],@GUILE_SITE@)' >> $@
-	echo 'define([PACKAGE],$(PACKAGE))'>> $@
-	echo 'define([PREFIX],$(prefix))' >> $@
-	echo 'define([SYSCONFDIR],$(sysconfdir))' >> $@
-	echo 'define([LOCALEDIR],$(datadir)/locale)' >> $@
-	echo 'define([HTMLDIR],$(HTMLDIR))' >> $@
-	echo 'define([VERSION],$(VERSION))' >> $@
-	echo 'define([LIBDIR],$(pkglibdir))' >> $@
+	echo 'define([IFACE],[$(APACHE_IFACE)])' >> $@
+	echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@
+	echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])' >> $@
+	echo 'define([GUILE_SITE],[@GUILE_SITE@])' >> $@
+	echo 'define([PACKAGE],[$(PACKAGE)])'>> $@
+	echo 'define([PREFIX],[$(prefix)])' >> $@
+	echo 'define([SYSCONFDIR],[$(sysconfdir)])' >> $@
+	echo 'define([LOCALEDIR],[$(datadir)/locale])' >> $@
+	echo 'define([HTMLDIR],[$(HTMLDIR)])' >> $@
+	echo 'define([VERSION],[$(VERSION)])' >> $@
+	echo 'define([LIBDIR],[$(pkglibdir)])' >> $@
 	echo 'divert(0)dnl' >> $@
diff --git a/src/ellinika/cgi.scm4 b/src/ellinika/cgi.scm4
index d1b4a5c..8c9b54d 100644
--- a/src/ellinika/cgi.scm4
+++ b/src/ellinika/cgi.scm4
@@ -111,2 +111,7 @@ ifelse(IFACE,[CGI],,dnl
 
+(define-public (cgi-program-name prog)
+  (string-append
+   (substring cgi-script-name 0 (string-rindex cgi-script-name #\/)) "/"
+   prog ".SCRIPT_SUFFIX"))
+
 (define-public (expand-template explist template)
diff --git a/style.css b/style.css
index d918d6e..9e17565 100644
--- a/style.css
+++ b/style.css
@@ -484,2 +484,32 @@ img.ellinika-img {
 
+/*
+  Dictionary
+ */  
+td.conj-ref:before {
+	content: "[ ";
+}
+
+td.conj-ref:after {
+	content: " ]";
+}
+
+td.conj-ref {
+	margin-left: 0;
+}
+
+table.dict-result {
+	border-style: none;
+}
+
+td.dict-word {
+	font-weight: bold;
+}
+
+td.dict-word-forms {
+	font-size: smaller;
+}
+
+/*
+  Conjugator
+ */
 h2.verb {
@@ -494 +524,2 @@ div.unattested {
 }	
+