Save the manual type (mdoc, man, or cat) in the index file

of the mandoc databases, as suggested by kristaps@.
Given the well-structured code, this is surprisingly simple.

This changes the mandoc.index database format.
Run "sudo mandocdb" to regenerate your databases.

diff --git a/apropos_db.c b/apropos_db.c
index 4e41a22b2470c55504f80998add955397d7b45ba..4a83a3bb879877312b16acf7b0d628477eab195e 100644 (file)
--- a/apropos_db.c
+++ b/apropos_db.c
@@ -1,4 +1,4 @@
-/*     $Id: apropos_db.c,v 1.13 2011/11/27 18:54:01 kristaps Exp $ */
+/*     $Id: apropos_db.c,v 1.14 2011/11/27 23:11:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -366,6 +366,7 @@ index_read(const DBT *key, const DBT *val, int index,
        rec->res.rec = *(recno_t *)key->data;
        rec->res.volume = index;
 
+       INDEX_BREAD(rec->res.type);
        INDEX_BREAD(rec->res.file);
        INDEX_BREAD(rec->res.cat);
        INDEX_BREAD(rec->res.title);

diff --git a/apropos_db.h b/apropos_db.h
index 8d03e5be04f6a97e8a05d1f30bd4584a3a53405e..be48b06311af145207d38e31ecb9c4029c89f23b 100644 (file)
--- a/apropos_db.h
+++ b/apropos_db.h
@@ -1,4 +1,4 @@
-/*     $Id: apropos_db.h,v 1.9 2011/11/27 18:54:01 kristaps Exp $ */
+/*     $Id: apropos_db.h,v 1.10 2011/11/27 23:11:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,6 +18,7 @@
 #define APROPOS_H
 
 struct res {
+       char            *type; /* file type: mdoc, man or cat */
        char            *file; /* file in file-system */
        char            *cat; /* category (3p, 3, etc.) */
        char            *title; /* title (FOO, etc.) */

diff --git a/mandocdb.c b/mandocdb.c
index a6b8bf050664880e9962d85da6bc3f14caea678d..1925389a47062e8d7736cf3a23d55f04fe7b7d15 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.14 2011/11/27 22:57:53 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.15 2011/11/27 23:11:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -592,6 +592,7 @@ index_merge(const struct of *of, struct mparse *mp,
                 */
 
                dbuf->len = 0;
+               buf_append(dbuf, mdoc ? "mdoc" : (man ? "man" : "cat"));
                buf_appendb(dbuf, fn, strlen(fn) + 1);
                buf_appendb(dbuf, msec, strlen(msec) + 1);
                buf_appendb(dbuf, mtitle, strlen(mtitle) + 1);