===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.14
retrieving revision 1.19
diff -u -p -r1.14 -r1.19
--- mandoc/Attic/mandoc-db.c	2011/05/01 11:56:26	1.14
+++ mandoc/Attic/mandoc-db.c	2011/05/04 20:43:38	1.19
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.14 2011/05/01 11:56:26 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.19 2011/05/04 20:43:38 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -49,7 +49,9 @@ enum	type {
 	MANDOC_UTILITY,
 	MANDOC_INCLUDES,
 	MANDOC_VARIABLE,
-	MANDOC_STANDARD
+	MANDOC_STANDARD,
+	MANDOC_AUTHOR,
+	MANDOC_CONFIG
 };
 
 #define	MAN_ARGS	  DB *db, \
@@ -77,6 +79,8 @@ static	int		  pman_node(MAN_ARGS);
 static	void		  pmdoc(DB *, const char *, DBT *, size_t *, 
 				DBT *, DBT *, size_t *, struct mdoc *);
 static	void		  pmdoc_node(MDOC_ARGS);
+static	void		  pmdoc_An(MDOC_ARGS);
+static	void		  pmdoc_Cd(MDOC_ARGS);
 static	void		  pmdoc_Fd(MDOC_ARGS);
 static	void		  pmdoc_In(MDOC_ARGS);
 static	void		  pmdoc_Fn(MDOC_ARGS);
@@ -106,9 +110,9 @@ static	const pmdoc_nf	  mdocs[MDOC_MAX] = {
 	NULL, /* El */
 	NULL, /* It */
 	NULL, /* Ad */ 
-	NULL, /* An */ 
+	pmdoc_An, /* An */ 
 	NULL, /* Ar */
-	NULL, /* Cd */ 
+	pmdoc_Cd, /* Cd */ 
 	NULL, /* Cm */
 	NULL, /* Dv */ 
 	NULL, /* Er */ 
@@ -223,6 +227,8 @@ main(int argc, char *argv[])
 	struct man	*man; /* resulting man */
 	char		*fn; /* current file being parsed */
 	const char	*msec, /* manual section */
+	      	 	*mtitle, /* manual title */
+			*arch, /* manual architecture */
 	      		*dir; /* result dir (default: cwd) */
 	char		 ibuf[MAXPATHLEN], /* index fname */
 			 ibbuf[MAXPATHLEN], /* index backup fname */
@@ -356,8 +362,13 @@ main(int argc, char *argv[])
 		msec = NULL != mdoc ? 
 			mdoc_meta(mdoc)->msec :
 			man_meta(man)->msec;
+		mtitle = NULL != mdoc ? 
+			mdoc_meta(mdoc)->title :
+			man_meta(man)->title;
+		arch = NULL != mdoc ? mdoc_meta(mdoc)->arch : NULL;
 
 		assert(msec);
+		assert(mtitle);
 
 		/* 
 		 * The index record value consists of a nil-terminated
@@ -370,6 +381,10 @@ main(int argc, char *argv[])
 		dbt_init(&rval, &rsz);
 		dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1);
 		dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1);
+		dbt_appendb(&rval, &rsz, mtitle, strlen(mtitle) + 1);
+		dbt_appendb(&rval, &rsz, arch ? arch : "", 
+				arch ? strlen(arch) + 1 : 1);
+
 		sv = rval.size;
 
 		/* Fix the record number in the btree value. */
@@ -443,9 +458,6 @@ dbt_init(DBT *key, size_t *ksz)
 static void
 dbt_appendb(DBT *key, size_t *ksz, const void *cp, size_t sz)
 {
-	void		*dstp, *endp;
-	int		 ssz;
-	enum mandoc_esc	 esc;
 
 	assert(key->data);
 
@@ -456,6 +468,7 @@ dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz
 		key->data = mandoc_realloc(key->data, *ksz);
 	}
 
+#if 0
 	dstp = key->data + (int)key->size;
 
 	while (NULL != (endp = memchr(cp, '\\', sz))) {
@@ -495,8 +508,9 @@ dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz
 
 		cp = endp;
 	}
+#endif
 
-	memcpy(dstp, cp, sz);
+	memcpy(key->data + (int)key->size, cp, sz);
 	key->size += sz;
 }
 
@@ -523,6 +537,23 @@ dbt_append(DBT *key, size_t *ksz, const char *cp)
 
 /* ARGSUSED */
 static void
+pmdoc_An(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_AUTHORS != n->sec)
+		return;
+
+	for (n = n->child; n; n = n->next)
+		if (MDOC_TEXT == n->type)
+			dbt_append(key, ksz, n->string);
+
+	fl = MANDOC_AUTHOR;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+static void
 pmdoc_Fd(MDOC_ARGS)
 {
 	uint32_t	 fl;
@@ -564,6 +595,23 @@ pmdoc_Fd(MDOC_ARGS)
 	dbt_appendb(key, ksz, "", 1);
 
 	fl = MANDOC_INCLUDES;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+static void
+pmdoc_Cd(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_SYNOPSIS != n->sec)
+		return;
+
+	for (n = n->child; n; n = n->next)
+		if (MDOC_TEXT == n->type)
+			dbt_append(key, ksz, n->string);
+
+	fl = MANDOC_CONFIG;
 	memcpy(val->data, &fl, 4);
 }