Implement info/descr for gcide.release-2.2

* NEWS: Update.
* doc/dico.texi: Update.
* include/dico/util.h (dico_string_trim): Add missing proto.
* modules/gcide/gcide.c (gcide_info, gcide_descr): Implement
info and description methods.
* modules/gcide/tests/dict/INFO: New file.
* modules/gcide/tests/Makefile.am (TESTSUITE_AT): Add descr.at and
info.at.
* modules/gcide/tests/testsuite.at: Include descr.at and info.at
* modules/gcide/tests/dicod.cfin: Remove description.
* modules/gcide/tests/descr.at: New test case.
* modules/gcide/tests/info.at: New test case.
* modules/gcide/tests/def00.at: Update.
* modules/gcide/tests/def01.at: Update.
* modules/gcide/tests/def02.at: Update.
* modules/gcide/tests/def03.at: Update.
* modules/gcide/tests/def04.at: Update.
* modules/gcide/tests/def05.at: Update.

* scripts/Makefile.am: Exempt gcider from standard options check.

17 files changed, 207 insertions, 31 deletions

diff --git a/NEWS b/NEWS
index 3fd7b93..a0cc8d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-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
 See the end of file for copying conditions.
 
 Please send Dico bug reports to <bug-dico@gnu.org.ua>
 
 
-Version 2.2 (Git)
+Version 2.2, 2012-03-04
 
 * Configuration changes
 
diff --git a/doc/dico.texi b/doc/dico.texi
index 59639a2..8c55707 100644
--- a/doc/dico.texi
+++ b/doc/dico.texi
@@ -2990,7 +2990,8 @@ for the user @command{dicod} is started as.
 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
 
 @deffn {gcide parameter} index-cache-size size
@@ -3014,6 +3015,12 @@ fields have been filled in}, so it might be reasonable to avoid
 displaying them at all.
 @end deffn
 
+  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.
 
   Here's a full example of a @samp{gcide} as used in
 @indicateurl{dico.gnu.org.ua}:
@@ -3024,28 +3031,13 @@ load-module gcide;
 
 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;
 @}
 @end group
 @end example
 
-  The dots represent further content of the description which is too
-big and irrelevant to copy it here.
-
 @menu
 * idxgcide::
 @end 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
@@ -18,6 +18,7 @@
 #define __dico_util_h
 
 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);
 size_t dico_trim_ws(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
@@ -296,7 +296,94 @@ gcide_free_db(dico_handle_t hp)
     free_db(db);
     return 0;
 }
+
+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);
+}
 
 static gcide_iterator_t
 exact_match(struct gcide_db *db, const char *hw)
@@ -748,8 +835,8 @@ struct dico_database_module DICO_EXPORT(gcide, module) = {
     gcide_free_db,
     NULL,
     NULL,
-    NULL,
-    NULL,
+    gcide_info,
+    gcide_descr,
     NULL,
     gcide_match,
     gcide_define,
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
@@ -27,7 +27,7 @@ noinst_DATA = dicod.conf
 CLEANFILES = dicod.conf