17 files changed, 207 insertions, 31 deletions

diff --git a/NEWS b/NEWS
index 3fd7b93..a0cc8d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-GNU Dico NEWS -- history of user-visible changes. 2012-03-03
+GNU Dico NEWS -- history of user-visible changes. 2012-03-04
 Copyright (C) 2008-2010, 2012 Sergey Poznyakoff
@@ -7,3 +7,3 @@ Please send Dico bug reports to <bug-dico@gnu.org.ua>
 
-Version 2.2 (Git)
+Version 2.2, 2012-03-04
 
diff --git a/doc/dico.texi b/doc/dico.texi
index 59639a2..8c55707 100644
--- a/doc/dico.texi
+++ b/doc/dico.texi
@@ -2992,3 +2992,4 @@ Other options are:
 @deffn {gcide parameter} idxdir directory
-Specifies alternate directory for the @file{CIDE.IDX} index file.
+Specifies the directory where the @file{CIDE.IDX} index file resides
+or should reside.
 @end deffn
@@ -3016,2 +3017,8 @@ displaying them at all.
 
+  Starting from version 0.51, GCIDE contains the file @file{INFO},
+which provides basic information about the dictionary.  The
+@command{gcide} module returns contents of this file at the
+@samp{SHOW INFO} request.  The first line of this file (with the
+trailing newline and final point removed) is returned as the short
+database description.
 
@@ -3026,17 +3033,5 @@ database @{
     name "gcide";
-    handler "gcide dbdir=/var/dictdb/gcide suppress-pr";
+    handler "gcide dbdir=/var/dictdb/gcide-0.51 suppress-pr";
     languages-from "en";
     languages-to "en";
-    description "Collaborative International Dictionary"
-                " of English";
-    info <<EOT
-The dictionary was derived from the
-         Webster's Revised Unabridged Dictionary
-                 Version published 1913
-               by the  C. & G.  Merriam Co.
-                   Springfield, Mass.
-                 Under the direction of
-                Noah Porter, D.D., LL.D.
-@dots{}
-EOT;
 @}
@@ -3045,5 +3040,2 @@ EOT;
 
-  The dots represent further content of the description which is too
-big and irrelevant to copy it here.
-
 @menu
diff --git a/include/dico/util.h b/include/dico/util.h
index 115ae08..899dbcb 100644
--- a/include/dico/util.h
+++ b/include/dico/util.h
@@ -20,2 +20,3 @@
 char *dico_full_file_name(const char *dir, const char *file);
+size_t dico_string_trim(char *buf, size_t len, int (*pred)(int c));
 size_t dico_trim_nl(char *buf);
diff --git a/modules/gcide/gcide.c b/modules/gcide/gcide.c
index fa10c02..fbbd788 100644
--- a/modules/gcide/gcide.c
+++ b/modules/gcide/gcide.c
@@ -298,3 +298,90 @@ gcide_free_db(dico_handle_t hp)
 }
+
+static int
+_is_nl_or_punct(int c)
+{
+    return !!strchr("\r\n!,-./:;?", c);
+}
+
+static char *
+read_info_file(const char *fname, int first_line)
+{
+    dico_stream_t stream;
+    int rc;
+    char *bufptr = NULL;
+    size_t bufsize = 0;
+    
+    stream = dico_mapfile_stream_create(fname, DICO_STREAM_READ);
+    if (!stream) {
+        dico_log(L_NOTICE, errno, _("cannot create stream `%s'"), fname);
+        return NULL;
+    }
+
+    rc = dico_stream_open(stream);
+    if (rc) {
+        dico_log(L_ERR, 0,
+                 _("cannot open stream `%s': %s"),
+                 fname, dico_stream_strerror(stream, rc));
+        dico_stream_destroy(&stream);
+        return NULL;
+    }
+
+    if (first_line) {
+        size_t n;
+        
+        rc = dico_stream_getline(stream, &bufptr, &bufsize, &n);
+        if (rc) {
+            dico_log(L_ERR, 0,
+                     _("read error in stream `%s': %s"),
+                     fname, dico_stream_strerror(stream, rc));
+        } else
+            dico_string_trim(bufptr, n, _is_nl_or_punct);
+    } else {
+        off_t size;
+        rc = dico_stream_size(stream, &size);
+        if (rc) {
+            dico_log(L_ERR, 0,
+                     _("cannot get size of stream `%s': %s"),
+                     fname, dico_stream_strerror(stream, rc));
+        } else {
+            bufsize = size;
+            bufptr = malloc (bufsize + 1);
+            if (!bufptr) {
+                dico_log(L_ERR, errno,
+                         _("cannot allocate dictionary information buffer"));
+            } else if ((rc = dico_stream_read(stream, bufptr, bufsize, NULL))) {
+                dico_log(L_ERR, 0,
+                         _("read error in stream `%s': %s"),
+                         fname, dico_stream_strerror(stream, rc));
+                free(bufptr);
+                bufptr = NULL;
+            } else
+                bufptr[bufsize] = 0;
+        }
+    }
+    
+    dico_stream_destroy(&stream);
+    return bufptr;
+}
+
+static char *
+read_dictionary_info(struct gcide_db *db, int first_line)
+{
+    char *fname = dico_full_file_name(db->db_dir, "INFO");
+    char *info = read_info_file(fname, first_line);
+    free(fname);
+    return info;
+}
+
+char *
+gcide_info(dico_handle_t hp)
+{
+    return read_dictionary_info((struct gcide_db *) hp, 0);
+}
 
+char *
+gcide_descr(dico_handle_t hp)
+{
+    return read_dictionary_info((struct gcide_db *) hp, 1);
+}
 
@@ -750,4 +837,4 @@ struct dico_database_module DICO_EXPORT(gcide, module) = {
     NULL,
-    NULL,
-    NULL,
+    gcide_info,
+    gcide_descr,
     NULL,
diff --git a/modules/gcide/tests/Makefile.am b/modules/gcide/tests/Makefile.am
index 3bbda92..3145258 100644
--- a/modules/gcide/tests/Makefile.am
+++ b/modules/gcide/tests/Makefile.am
@@ -29,3 +29,3 @@ CLEANFILES = dicod.conf
 dist-hook:
-        tar -C $(srcdir) -c -f - dict/CIDE.[A-Z] | \
+        tar -C $(srcdir) -c -f - dict/CIDE.[A-Z] dict/INFO | \
               tar -C $(distdir) -x -f -
@@ -73,2 +73,3 @@ TESTSUITE_AT = \
  def05.at\
+ descr.at\
  exact.at\
@@ -76,2 +77,3 @@ TESTSUITE_AT = \
  idx.at\
+ info.at\
  markup.at\
diff --git a/modules/gcide/tests/def00.at b/modules/gcide/tests/def00.at
index bd8a153..bbf134e 100644
--- a/modules/gcide/tests/def00.at
+++ b/modules/gcide/tests/def00.at
@@ -23,3 +23,3 @@ quit
 150 1 definitions found: list follows
-151 "GNU" gcide "A mock GCIDE dictionary"
+151 "GNU" gcide "A mock GCIDE dictionary for GNU Dico test suite"
 GNU n. GNU's Not UNIX.
diff --git a/modules/gcide/tests/def01.at b/modules/gcide/tests/def01.at
index 0f2ed99..f12d5bb 100644
--- a/modules/gcide/tests/def01.at
+++ b/modules/gcide/tests/def01.at
@@ -23,3 +23,3 @@ quit
 150 2 definitions found: list follows
-151 "kludge" gcide "A mock GCIDE dictionary"
+151 "kludge" gcide "A mock GCIDE dictionary for GNU Dico test suite"
 kludge n. A working solution, not particularly elegant.
@@ -30,3 +30,3 @@ kludge n. A working solution, not particularly elegant.
 .
-151 "kludge" gcide "A mock GCIDE dictionary"
+151 "kludge" gcide "A mock GCIDE dictionary for GNU Dico test suite"
 kludge v. To use such a solution.
diff --git a/modules/gcide/tests/def02.at b/modules/gcide/tests/def02.at
index eeb2722..18631ff 100644
--- a/modules/gcide/tests/def02.at
+++ b/modules/gcide/tests/def02.at
@@ -23,3 +23,3 @@ quit
 150 1 definitions found: list follows
-151 "atlantes" gcide "A mock GCIDE dictionary"
+151 "atlantes" gcide "A mock GCIDE dictionary for GNU Dico test suite"
 ‖Atlantes, n. pl. A definition with alternate name telamones.
diff --git a/modules/gcide/tests/def03.at b/modules/gcide/tests/def03.at
index 6393734..f20f01a 100644
--- a/modules/gcide/tests/def03.at
+++ b/modules/gcide/tests/def03.at
@@ -23,3 +23,3 @@ quit
 150 1 definitions found: list follows
-151 "telamones" gcide "A mock GCIDE dictionary"
+151 "telamones" gcide "A mock GCIDE dictionary for GNU Dico test suite"
 ||Atlantes, n. pl. A definition with alternate name telamones.
diff --git a/modules/gcide/tests/def04.at b/modules/gcide/tests/def04.at
index 73b49a3..1b23b32 100644
--- a/modules/gcide/tests/def04.at
+++ b/modules/gcide/tests/def04.at
@@ -23,3 +23,3 @@ quit
 150 1 definitions found: list follows
-151 "cyclic" gcide "A mock GCIDE dictionary"
+151 "cyclic" gcide "A mock GCIDE dictionary for GNU Dico test suite"
 { Cyclic, Cyclical} a.
diff --git a/modules/gcide/tests/def05.at b/modules/gcide/tests/def05.at
index 16f17e0..bd8db48 100644
--- a/