X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzinfo.c;h=91e05d1024099c4f7661ff9d5e2ac7a3242853b5;hp=41c6dd904a623bc9c3854b0110eb211022cdc78a;hb=2b99f08490d3bd763bb086693044a6db10c0bcf9;hpb=8c63ceb6afdfcea5c1efbd716f75c99f18c77b5c

diff --git a/index/zinfo.c b/index/zinfo.c
index 41c6dd9..91e05d1 100644
--- a/index/zinfo.c
+++ b/index/zinfo.c
@@ -1,42 +1,24 @@
-/*
- * Copyright (C) 1994-1998, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: zinfo.c,v $
- * Revision 1.9  1998-06-02 12:10:27  adam
- * Fixed bug related to attributeDetails.
- *
- * Revision 1.8  1998/05/20 10:12:20  adam
- * Implemented automatic EXPLAIN database maintenance.
- * Modified Zebra to work with ASN.1 compiled version of YAZ.
- *
- * Revision 1.7  1998/03/05 08:45:13  adam
- * New result set model and modular ranking system. Moved towards
- * descent server API. System information stored as "SGML" records.
- *
- * Revision 1.6  1998/02/17 10:29:27  adam
- * Moved towards 'automatic' EXPLAIN database.
- *
- * Revision 1.5  1997/10/27 14:33:05  adam
- * Moved towards generic character mapping depending on "structure"
- * field in abstract syntax file. Fixed a few memory leaks. Fixed
- * bug with negative integers when doing searches with relational
- * operators.
- *
- * Revision 1.4  1997/09/25 14:57:08  adam
- * Added string.h.
- *
- * Revision 1.3  1996/05/22 08:21:59  adam
- * Added public ZebDatabaseInfo structure.
- *
- * Revision 1.2  1996/05/14 06:16:41  adam
- * Compact use/set bytes used in search service.
- *
- * Revision 1.1  1996/05/13 14:23:07  adam
- * Work on compaction of set/use bytes in dictionary.
- *
- */
+/* $Id: zinfo.c,v 1.39 2004-08-06 13:36:23 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
 
 #include <stdlib.h>
 #include <assert.h>
@@ -62,7 +44,7 @@ struct zebSUInfoB {
 typedef struct zebAccessObjectB *zebAccessObject;
 struct zebAccessObjectB {
     void *handle;
-    int sysno;
+    SYSNO sysno;
     Odr_oid *oid;
     zebAccessObject next;
 };
@@ -75,7 +57,7 @@ struct zebAccessInfoB {
 
 typedef struct {
     struct zebSUInfoB *SUInfo;
-    int sysno;
+    SYSNO sysno;
     int dirty;
     int readFlag;
     data1_node *data1_tree;
@@ -85,9 +67,9 @@ struct zebDatabaseInfoB {
     zebAttributeDetails attributeDetails;
     char *databaseName;
     data1_node *data1_database;
-    int recordCount;     /* records in db */
-    int recordBytes;     /* size of records */
-    int sysno;           /* sysno of database info */
+    zint recordCount;    /* records in db */
+    zint recordBytes;    /* size of records */
+    SYSNO sysno;         /* sysno of database info */
     int readFlag;        /* 1: read is needed when referenced; 0 if not */
     int dirty;           /* 1: database is dirty: write is needed */
     struct zebDatabaseInfoB *next;
@@ -100,16 +82,24 @@ struct zebraExplainAttset {
     struct zebraExplainAttset *next;
 };
 
+struct zebraCategoryListInfo {
+    int dirty;
+    SYSNO sysno;
+    data1_node *data1_categoryList;
+};
+
 struct zebraExplainInfo {
-    int  ordinalSU;
-    int  runNumber;
-    int  dirty;
+    int ordinalSU;
+    zint runNumber;
+    int dirty;
+    int write_flag;
     Records records;
     data1_handle dh;
     Res res;
     struct zebraExplainAttset *attsets;
     NMEM nmem;
     data1_node *data1_target;
+    struct zebraCategoryListInfo *categoryList;
     struct zebDatabaseInfoB *databaseInfo;
     struct zebDatabaseInfoB *curDatabaseInfo;
     zebAccessInfo accessInfo;
@@ -126,139 +116,6 @@ static data1_node *read_sgml_rec (data1_handle dh, NMEM nmem, Record rec)
     return data1_read_sgml (dh, nmem, rec->info[recInfo_storeData]);
 }
 
-static data1_node *data1_search_tag (data1_handle dh, data1_node *n,
-				    const char *tag)
-{
-    logf (LOG_DEBUG, "data1_search_tag %s", tag);
-    for (; n; n = n->next)
-	if (n->which == DATA1N_tag && n->u.tag.tag &&
-	    !yaz_matchstr (tag, n->u.tag.tag))
-	{
-	    logf (LOG_DEBUG, " found");
-	    return n;
-	}
-    logf (LOG_DEBUG, " not found");
-    return 0;
-}
-
-static data1_node *data1_add_tag (data1_handle dh, data1_node *at,
-				  const char *tag, NMEM nmem)
-{
-    data1_node *partag = get_parent_tag(dh, at);
-    data1_node *res = data1_mk_node (dh, nmem);
-    data1_element *e = NULL;
-
-    res->parent = at;
-    res->which = DATA1N_tag;
-    res->u.tag.tag = data1_insert_string (dh, res, nmem, tag);
-    res->u.tag.node_selected = 0;
-    res->u.tag.make_variantlist = 0;
-    res->u.tag.no_data_requested = 0;
-    res->u.tag.get_bytes = -1;
-   
-    if (partag)
-	e = partag->u.tag.element;
-    res->u.tag.element =
-	data1_getelementbytagname (dh, at->root->u.root.absyn,
-				   e, res->u.tag.tag);
-    res->root = at->root;
-    if (!at->child)
-	at->child = res;
-    else
-    {
-	assert (at->last_child);
-	at->last_child->next = res;
-    }
-    at->last_child = res;
-    return res;
-}
-
-static data1_node *data1_make_tag (data1_handle dh, data1_node *at,
-				   const char *tag, NMEM nmem)
-{
-    data1_node *node = data1_search_tag (dh, at->child, tag);
-    if (!node)
-	node = data1_add_tag (dh, at, tag, nmem);
-    else
-	node->child = node->last_child = NULL;
-    return node;
-}
-
-static data1_node *data1_add_tagdata_int (data1_handle dh, data1_node *at,
-					  const char *tag, int num,
-					  NMEM nmem)
-{
-    data1_node *node_data;
-    
-    node_data = data1_add_taggeddata (dh, at->root, at, tag, nmem);
-    if (!node_data)
-	return 0;
-    node_data->u.data.what = DATA1I_num;
-    node_data->u.data.data = node_data->lbuf;
-    sprintf (node_data->u.data.data, "%d", num);
-    node_data->u.data.len = strlen (node_data->u.data.data);
-    return node_data;
-}
-
-static data1_node *data1_add_tagdata_oid (data1_handle dh, data1_node *at,
-					   const char *tag, Odr_oid *oid,
-					   NMEM nmem)
-{
-    data1_node *node_data;
-    char str[128], *p = str;
-    Odr_oid *ii;
-    
-    node_data = data1_add_taggeddata (dh, at->root, at, tag, nmem);
-    if (!node_data)
-	return 0;
-    
-    for (ii = oid; *ii >= 0; ii++)
-    {
-	if (ii != oid)
-	    *p++ = '.';
-	sprintf (p, "%d", *ii);
-	p += strlen (p);
-    }
-    node_data->u.data.what = DATA1I_oid;
-    node_data->u.data.len = strlen (str);
-    node_data->u.data.data = data1_insert_string (dh, node_data, nmem, str);
-    return node_data;
-}
-
-
-static data1_node *data1_add_tagdata_text (data1_handle dh, data1_node *at,
-					   const char *tag, const char *str,
-					   NMEM nmem)
-{
-    data1_node *node_data;
-    
-    node_data = data1_add_taggeddata (dh, at->root, at, tag, nmem);
-    if (!node_data)
-	return 0;
-    node_data->u.data.what = DATA1I_text;
-    node_data->u.data.len = strlen (str);
-    node_data->u.data.data = data1_insert_string (dh, node_data, nmem, str);
-    return node_data;
-}
-
-static data1_node *data1_make_tagdata_text (data1_handle dh, data1_node *at,
-					    const char *tag, const char *str,
-					    NMEM nmem)
-{
-    data1_node *node = data1_search_tag (dh, at->child, tag);
-    if (!node)
-        return data1_add_tagdata_text (dh, at, tag, str, nmem);
-    else
-    {
-	data1_node *node_data = node->child;
-	node_data->u.data.what = DATA1I_text;
-	node_data->u.data.data = node_data->lbuf;
-	strcpy (node_data->u.data.data, str);
-	node_data->u.data.len = strlen (node_data->u.data.data);
-	return node_data;
-    }
-}
-
 static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
                                         struct zebDatabaseInfoB *zdi,
 					int key_flush);
@@ -270,8 +127,12 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush);
 static void zebraExplain_writeAttributeSet (ZebraExplainInfo zei,
 					    zebAccessObject o,
 					    int key_flush);
+static void zebraExplain_writeCategoryList (ZebraExplainInfo zei,
+					    struct zebraCategoryListInfo *zcl,
+					    int key_flush);
+
 
-static Record createRecord (Records records, int *sysno)
+static Record createRecord (Records records, SYSNO *sysno)
 {
     Record rec;
     if (*sysno)
@@ -293,15 +154,16 @@ static Record createRecord (Records records, int *sysno)
     return rec;
 }
 
-void zebraExplain_close (ZebraExplainInfo zei, int writeFlag,
-			 int (*updateH)(Record drec, data1_node *n))
+void zebraExplain_flush (ZebraExplainInfo zei, void *handle)
 {
-    struct zebDatabaseInfoB *zdi;
-    
-    logf (LOG_DEBUG, "zebraExplain_close wr=%d", writeFlag);
-    if (writeFlag)
+    if (!zei)
+        return;
+    zei->updateHandle = handle;
+    if (zei->write_flag)
     {
+	struct zebDatabaseInfoB *zdi;
 	zebAccessObject o;
+
 	/* write each database info record */
 	for (zdi = zei->databaseInfo; zdi; zdi = zdi->next)
 	{
@@ -310,7 +172,9 @@ void zebraExplain_close (ZebraExplainInfo zei, int writeFlag,
 						zdi->databaseName, 1);
 	}
 	zebraExplain_writeTarget (zei, 1);
-	
+	zebraExplain_writeCategoryList (zei,
+					zei->categoryList,
+					1);
 	assert (zei->accessInfo);
 	for (o = zei->accessInfo->attributeSetIds; o; o = o->next)
 	    if (!o->sysno)
@@ -328,10 +192,18 @@ void zebraExplain_close (ZebraExplainInfo zei, int writeFlag,
 						zdi->databaseName, 0);
 	}
 	zebraExplain_writeTarget (zei, 0);
-	
     }
+}
+
+void zebraExplain_close (ZebraExplainInfo zei)
+{
+#if ZINFO_DEBUG
+    yaz_log (LOG_LOG, "zebraExplain_close");
+#endif
+    if (!zei)
+	return;
+    zebraExplain_flush (zei, zei->updateHandle);
     nmem_destroy (zei->nmem);
-    xfree (zei);
 }
 
 void zebraExplain_mergeOids (ZebraExplainInfo zei, data1_node *n,
@@ -364,7 +236,7 @@ void zebraExplain_mergeOids (ZebraExplainInfo zei, data1_node *n,
 	    }
 	if (!ao)
 	{
-	    ao = nmem_malloc (zei->nmem, sizeof(*ao));
+	    ao = (zebAccessObject) nmem_malloc (zei->nmem, sizeof(*ao));
 	    ao->handle = NULL;
 	    ao->sysno = 1;
 	    ao->oid = oid;
@@ -381,7 +253,8 @@ void zebraExplain_mergeAccessInfo (ZebraExplainInfo zei, data1_node *n,
     
     if (!n)
     {
-	*accessInfo = nmem_malloc (zei->nmem, sizeof(**accessInfo));
+	*accessInfo = (zebAccessInfo)
+	    nmem_malloc (zei->nmem, sizeof(**accessInfo));
 	(*accessInfo)->attributeSetIds = NULL;
 	(*accessInfo)->schemas = NULL;
     }
@@ -398,6 +271,52 @@ void zebraExplain_mergeAccessInfo (ZebraExplainInfo zei, data1_node *n,
     }
 }
 
+/* Explain structure
+    root record
+      of type targetInfo
+      and has sysno = 1
+
+    databaseList (list of databases)
+*/
+/*
+Example root:
+explain:
+  targetInfo: TargetInfo
+    name: Zebra
+    namedResultSets: 1
+    multipleDbSearch: 1
+    nicknames:
+      name: Zebra
+    commonInfo:
+      dateAdded: 20030630190601
+      dateChanged: 20030630190601
+      languageCode: EN
+    accessinfo:
+      unitSystems:
+        string: ISO
+      attributeSetIds:
+        oid: 1.2.840.10003.3.2
+        oid: 1.2.840.10003.3.5
+        oid: 1.2.840.10003.3.1
+      schemas:
+        oid: 1.2.840.10003.13.1000.81.2
+        oid: 1.2.840.10003.13.2
+    zebraInfo:
+      version: 1.3.12
+      databaseList:
+        database:
+          name: Default
+          id: 50
+          attributeDetailsId: 51
+        database:
+          name: IR-Explain-1
+          id: 52
+          attributeDetailsId: 53
+      ordinalSU: 38
+      runNumber: 1
+nextResultSetPosition = 2
+*/
+
 ZebraExplainInfo zebraExplain_open (
     Records records, data1_handle dh,
     Res res,
@@ -410,48 +329,80 @@ ZebraExplainInfo zebraExplain_open (
     struct zebDatabaseInfoB **zdip;
     time_t our_time;
     struct tm *tm;
+    NMEM nmem = nmem_create ();
 
-    logf (LOG_DEBUG, "zebraExplain_open wr=%d", writeFlag);
-    zei = xmalloc (sizeof(*zei));
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_open wr=%d", writeFlag);
+#endif
+    zei = (ZebraExplainInfo) nmem_malloc (nmem, sizeof(*zei));
+    zei->write_flag = writeFlag;
     zei->updateHandle = updateHandle;
     zei->updateFunc = updateFunc;
     zei->dirty = 0;
     zei->curDatabaseInfo = NULL;
     zei->records = records;
-    zei->nmem = nmem_create ();
+    zei->nmem = nmem;
     zei->dh = dh;
     zei->attsets = NULL;
     zei->res = res;
+    zei->categoryList = (struct zebraCategoryListInfo *)
+	nmem_malloc (zei->nmem, sizeof(*zei->categoryList));
+    zei->categoryList->sysno = 0;
+    zei->categoryList->dirty = 0;
+    zei->categoryList->data1_categoryList = NULL;
 
-    time (&our_time);
-    tm = localtime (&our_time);
-    sprintf (zei->date, "%04d%02d%02d%02d%02d%02d",
-	     tm->tm_year+1900, tm->tm_mon+1,  tm->tm_mday,
-	     tm->tm_hour, tm->tm_min, tm->tm_sec);
-
+    if ( atoi (res_get_def (res, "notimestamps", "0") )== 0)
+    {
+        time (&our_time);
+        tm = localtime (&our_time);
+        sprintf (zei->date, "%04d%02d%02d%02d%02d%02d",
+	         tm->tm_year+1900, tm->tm_mon+1,  tm->tm_mday,
+	         tm->tm_hour, tm->tm_min, tm->tm_sec);
+    } else {
+        sprintf (zei->date, "%04d%02d%02d%02d%02d%02d",
+	         0, 0, 0,  0, 0, 0);
+    }
     zdip = &zei->databaseInfo;
     trec = rec_get (records, 1);      /* get "root" record */
 
+    zei->ordinalSU = 1;
+    zei->runNumber = 0;
+
     zebraExplain_mergeAccessInfo (zei, 0, &zei->accessInfo);
     if (trec)    /* targetInfo already exists ... */
     {
 	data1_node *node_tgtinfo, *node_zebra, *node_list, *np;
 
 	zei->data1_target = read_sgml_rec (zei->dh, zei->nmem, trec);
-
+#if 0
+	if (!zei->data1_target || !zei->data1_target->u.root.absyn)
+#else
+	if (!zei->data1_target)
+#endif
+	{
+	    logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+	    nmem_destroy (zei->nmem);
+	    return 0;
+	}
 #if ZINFO_DEBUG
 	data1_pr_tree (zei->dh, zei->data1_target, stderr);
 #endif
-	node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
-					 "targetInfo");
+	node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
+					 "/targetInfo");
 	zebraExplain_mergeAccessInfo (zei, node_tgtinfo,
 				      &zei->accessInfo);
 
 	node_zebra = data1_search_tag (zei->dh, node_tgtinfo->child,
 				       "zebraInfo");
-	node_list = data1_search_tag (zei->dh, node_zebra->child,
-				      "databaseList");
-	for (np = node_list->child; np; np = np->next)
+	np = 0;
+	if (node_zebra)
+	{
+	    node_list = data1_search_tag (zei->dh, node_zebra->child,
+					  "databaseList");
+	    if (node_list)
+		np = node_list->child;
+	}
+	for (; np; np = np->next)
 	{
 	    data1_node *node_name = NULL;
 	    data1_node *node_id = NULL;
@@ -472,8 +423,8 @@ ZebraExplainInfo zebraExplain_open (
 	    }
 	    assert (node_id && node_name && node_aid);
 	    
-	    *zdip = nmem_malloc (zei->nmem, sizeof(**zdip));
-
+	    *zdip = (struct zebDatabaseInfoB *) 
+		nmem_malloc (zei->nmem, sizeof(**zdip));
             (*zdip)->readFlag = 1;
             (*zdip)->dirty = 0;
 	    (*zdip)->data1_database = NULL;
@@ -481,43 +432,46 @@ ZebraExplainInfo zebraExplain_open (
 	    (*zdip)->recordBytes = 0;
 	    zebraExplain_mergeAccessInfo (zei, 0, &(*zdip)->accessInfo);
 
-	    (*zdip)->databaseName = nmem_malloc (zei->nmem,
-						 1+node_name->u.data.len);
+	    (*zdip)->databaseName = (char *)
+		nmem_malloc (zei->nmem, 1+node_name->u.data.len);
 	    memcpy ((*zdip)->databaseName, node_name->u.data.data,
 		    node_name->u.data.len);
 	    (*zdip)->databaseName[node_name->u.data.len] = '\0';
-	    (*zdip)->sysno = atoi_n (node_id->u.data.data,
-				     node_id->u.data.len);
-	    (*zdip)->attributeDetails =
+	    (*zdip)->sysno = atoi_zn (node_id->u.data.data,
+				      node_id->u.data.len);
+	    (*zdip)->attributeDetails = (zebAttributeDetails)
 		nmem_malloc (zei->nmem, sizeof(*(*zdip)->attributeDetails));
-	    (*zdip)->attributeDetails->sysno = atoi_n (node_aid->u.data.data,
-						       node_aid->u.data.len);
+	    (*zdip)->attributeDetails->sysno = atoi_zn (node_aid->u.data.data,
+							node_aid->u.data.len);
 	    (*zdip)->attributeDetails->readFlag = 1;
 	    (*zdip)->attributeDetails->dirty = 0;
 	    (*zdip)->attributeDetails->SUInfo = NULL;
 
 	    zdip = &(*zdip)->next;
 	}
-	np = data1_search_tag (zei->dh, node_zebra->child,
-			       "ordinalSU");
-	np = np->child;
-	assert (np && np->which == DATA1N_data);
-	zei->ordinalSU = atoi_n (np->u.data.data, np->u.data.len);
-
-	np = data1_search_tag (zei->dh, node_zebra->child,
-			       "runNumber");
-	np = np->child;
-	assert (np && np->which == DATA1N_data);
-	zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
-	*zdip = NULL;
+	if (node_zebra)
+	{
+	    np = data1_search_tag (zei->dh, node_zebra->child,
+				   "ordinalSU");
+	    np = np->child;
+	    assert (np && np->which == DATA1N_data);
+	    zei->ordinalSU = atoi_n (np->u.data.data, np->u.data.len);
+	    
+	    np = data1_search_tag (zei->dh, node_zebra->child,
+				   "runNumber");
+	    np = np->child;
+	    assert (np && np->which == DATA1N_data);
+	    zei->runNumber = atoi_zn (np->u.data.data, np->u.data.len);
+            yaz_log (LOG_DEBUG, "read runnumber=" ZINT_FORMAT, zei->runNumber);
+	    *zdip = NULL;
+	}
 	rec_rm (&trec);
     }
     else  /* create initial targetInfo */
     {
 	data1_node *node_tgtinfo;
-        zei->ordinalSU = 1;
-	zei->runNumber = 0;
 
+	*zdip = NULL;
 	if (writeFlag)
 	{
 	    char *sgml_buf;
@@ -531,12 +485,16 @@ ZebraExplainInfo zebraExplain_open (
 				 "<multipleDBSearch>1</>\n"
 				 "<nicknames><name>Zebra</></>\n"
 				 "</></>\n" );
-
-	    node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
-					    "targetInfo");
+	    if (!zei->data1_target)
+	    {
+		logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+		nmem_destroy (zei->nmem);
+		return 0;
+	    }
+	    node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
+                                             "/targetInfo");
 	    assert (node_tgtinfo);
 
-
 	    zebraExplain_initCommonInfo (zei, node_tgtinfo);
 	    zebraExplain_initAccessInfo (zei, node_tgtinfo);
 
@@ -548,15 +506,35 @@ ZebraExplainInfo zebraExplain_open (
 		rec_strdup ("IR-Explain-1", &trec->size[recInfo_databaseName]);
 	    
 	    sgml_buf = data1_nodetoidsgml(dh, zei->data1_target, 0, &sgml_len);
-	    trec->info[recInfo_storeData] = xmalloc (sgml_len);
+	    trec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
 	    memcpy (trec->info[recInfo_storeData], sgml_buf, sgml_len);
 	    trec->size[recInfo_storeData] = sgml_len;
 	    
 	    rec_put (records, &trec);
+	    rec_rm (&trec);
+
+	}
+	zebraExplain_newDatabase (zei, "IR-Explain-1", 0);
+	    
+	if (!zei->categoryList->dirty)
+	{
+	    struct zebraCategoryListInfo *zcl = zei->categoryList;
+	    data1_node *node_cl;
+	    
+	    zcl->dirty = 1;
+	    zcl->data1_categoryList =
+		data1_read_sgml (zei->dh, zei->nmem,
+				 "<explain><categoryList>CategoryList\n"
+				 "</></>\n");
+	
+	    if (zcl->data1_categoryList)
+	    {
+		node_cl = data1_search_tag (zei->dh, zcl->data1_categoryList,
+					    "/categoryList");
+		assert (node_cl);
+		zebraExplain_initCommonInfo (zei, node_cl);
+	    }
 	}
-	*zdip = NULL;
-	rec_rm (&trec);
-	zebraExplain_newDatabase (zei, "IR-Explain-1");
     }
     return zei;
 }
@@ -573,8 +551,8 @@ static void zebraExplain_readAttributeDetails (ZebraExplainInfo zei,
 
     zad->data1_tree = read_sgml_rec (zei->dh, zei->nmem, rec);
 
-    node_adinfo = data1_search_tag (zei->dh, zad->data1_tree->child,
-				    "attributeDetails");
+    node_adinfo = data1_search_tag (zei->dh, zad->data1_tree,
+				    "/attributeDetails");
     node_zebra = data1_search_tag (zei->dh, node_adinfo->child,
 				 "zebraInfo");
     node_list = data1_search_tag (zei->dh, node_zebra->child,
@@ -585,6 +563,9 @@ static void zebraExplain_readAttributeDetails (ZebraExplainInfo zei,
 	data1_node *node_use = NULL;
 	data1_node *node_ordinal = NULL;
 	data1_node *np2;
+	char oid_str[128];
+	int oid_str_len;
+
 	if (np->which != DATA1N_tag || strcmp (np->u.tag.tag, "attr"))
 	    continue;
 	for (np2 = np->child; np2; np2 = np2->next)
@@ -600,10 +581,17 @@ static void zebraExplain_readAttributeDetails (ZebraExplainInfo zei,
 		node_ordinal = np2->child;
 	}
 	assert (node_set && node_use && node_ordinal);
-	
-        *zsuip = nmem_malloc (zei->nmem, sizeof(**zsuip));
-	(*zsuip)->info.set = atoi_n (node_set->u.data.data,
-				     node_set->u.data.len);
+
+	oid_str_len = node_set->u.data.len;
+	if (oid_str_len >= (int) sizeof(oid_str))
+	    oid_str_len = sizeof(oid_str)-1;
+	memcpy (oid_str, node_set->u.data.data, oid_str_len);
+	oid_str[oid_str_len] = '\0';
+
+        *zsuip = (struct zebSUInfoB *)
+	    nmem_malloc (zei->nmem, sizeof(**zsuip));
+	(*zsuip)->info.set = oid_getvalbyname (oid_str);
+
 	(*zsuip)->info.use = atoi_n (node_use->u.data.data,
 				     node_use->u.data.len);
 	(*zsuip)->info.ordinal = atoi_n (node_ordinal->u.data.data,
@@ -628,41 +616,88 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei,
 
     zdi->data1_database = read_sgml_rec (zei->dh, zei->nmem, rec);
     
-    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
-				   "databaseInfo");
+    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database,
+                                    "/databaseInfo");
+    assert (node_dbinfo);
     zebraExplain_mergeAccessInfo (zei, node_dbinfo, &zdi->accessInfo);
 
     node_zebra = data1_search_tag (zei->dh, node_dbinfo->child,
 				 "zebraInfo");
-    np  = data1_search_tag (zei->dh, node_dbinfo->child,
-			    "recordBytes");
-    if (np && np->child && np->child->which == DATA1N_data)
-	zdi->recordBytes = atoi_n (np->child->u.data.data,
-				   np->child->u.data.len);
+    if (node_zebra
+	&& (np = data1_search_tag (zei->dh, node_zebra->child,
+				   "recordBytes")) 
+	&& np->child && np->child->which == DATA1N_data)
+	zdi->recordBytes = atoi_zn (np->child->u.data.data,
+				    np->child->u.data.len);
     if ((np = data1_search_tag (zei->dh, node_dbinfo->child,
 				"recordCount")) &&
 	(np = data1_search_tag (zei->dh, np->child,
 				"recordCountActual")) &&
 	np->child->which == DATA1N_data)
     {
-	zdi->recordCount = atoi_n (np->child->u.data.data,
-				   np->child->u.data.len);
-    }    
+	zdi->recordCount = atoi_zn (np->child->u.data.data,
+				    np->child->u.data.len);
+    }
     zdi->readFlag = 0;
     rec_rm (&rec);
 }
 
+int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle)
+{
+    struct zebDatabaseInfoB **zdip = &zei->databaseInfo;
+
+    while (*zdip)
+    {
+	if (*zdip == zei->curDatabaseInfo)
+	{
+	    struct zebDatabaseInfoB *zdi = *zdip;
+	    Record rec;
+
+	    zei->dirty = 1;
+	    zei->updateHandle = update_handle;
+
+	    if (zdi->attributeDetails)
+	    {
+		/* remove attribute details keys and delete it */
+		zebAttributeDetails zad = zdi->attributeDetails;
+		
+		rec = rec_get(zei->records, zad->sysno);
+		(*zei->updateFunc)(zei->updateHandle, rec, 0);
+		rec_rm(&rec);
+	    }
+	    /* remove database record keys and delete it */
+	    rec = rec_get (zei->records, zdi->sysno);
+	    (*zei->updateFunc)(zei->updateHandle, rec, 0);
+	    rec_rm(&rec);
+
+	    /* remove from list */
+	    *zdip = zdi->next;
+
+	    /* current database is IR-Explain-1 */
+	    return 0;
+	}
+	zdip = &(*zdip)->next;
+    }
+    return -1;
+}
+
 int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database)
 {
     struct zebDatabaseInfoB *zdi;
+    const char *database_n = strrchr (database, '/');
+
+    if (database_n)
+        database_n++;
+    else
+        database_n = database;
     
     assert (zei);
     if (zei->curDatabaseInfo &&
-        !strcmp (zei->curDatabaseInfo->databaseName, database))
+        !STRCASECMP (zei->curDatabaseInfo->databaseName, database))
         return 0;
     for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
     {
-        if (!strcmp (zdi->databaseName, database))
+        if (!STRCASECMP (zdi->databaseName, database_n))
             break;
     }
     if (!zdi)
@@ -690,25 +725,25 @@ int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database)
 
 static void zebraExplain_initCommonInfo (ZebraExplainInfo zei, data1_node *n)
 {
-    data1_node *c = data1_add_tag (zei->dh, n, "commonInfo", zei->nmem);
-
-    data1_add_tagdata_text (zei->dh, c, "dateAdded", zei->date, zei->nmem);
-    data1_add_tagdata_text (zei->dh, c, "dateChanged", zei->date, zei->nmem);
-    data1_add_tagdata_text (zei->dh, c, "languageCode", "EN", zei->nmem);
+    data1_node *c = data1_mk_tag (zei->dh, zei->nmem, "commonInfo", 0, n);
+    data1_mk_tag_data_text (zei->dh, c, "dateAdded", zei->date, zei->nmem);
+    data1_mk_tag_data_text (zei->dh, c, "dateChanged", zei->date, zei->nmem);
+    data1_mk_tag_data_text (zei->dh, c, "languageCode", "EN", zei->nmem);
 }
 
 static void zebraExplain_updateCommonInfo (ZebraExplainInfo zei, data1_node *n)
 {
     data1_node *c = data1_search_tag (zei->dh, n->child, "commonInfo");
     assert (c);
-    data1_make_tagdata_text (zei->dh, c, "dateChanged", zei->date, zei->nmem);
+    data1_mk_tag_data_text_uni (zei->dh, c, "dateChanged", zei->date,
+                                zei->nmem);
 }
 
 static void zebraExplain_initAccessInfo (ZebraExplainInfo zei, data1_node *n)
 {
-    data1_node *c = data1_add_tag (zei->dh, n, "accessInfo", zei->nmem);
-    data1_node *d = data1_add_tag (zei->dh, c, "unitSystems", zei->nmem);
-    data1_add_tagdata_text (zei->dh, d, "string", "ISO", zei->nmem);
+    data1_node *c = data1_mk_tag (zei->dh, zei->nmem, "accessInfo", 0, n);
+    data1_node *d = data1_mk_tag (zei->dh, zei->nmem, "unitSystems", 0, c);
+    data1_mk_tag_data_text (zei->dh, d, "string", "ISO", zei->nmem);
 }
 
 static void zebraExplain_updateAccessInfo (ZebraExplainInfo zei, data1_node *n,
@@ -718,26 +753,38 @@ static void zebraExplain_updateAccessInfo (ZebraExplainInfo zei, data1_node *n,
     data1_node *d;
     zebAccessObject p;
     
-    assert (c);
+    if (!c)
+    {
+        data1_pr_tree (zei->dh, n, stdout);
+        exit (0);
+        assert (c);
+    }
 
     if ((p = accessInfo->attributeSetIds))
     {
-	d = data1_make_tag (zei->dh, c, "attributeSetIds", zei->nmem);
+	d = data1_mk_tag_uni (zei->dh, zei->nmem, "attributeSetIds", c);
 	for (; p; p = p->next)
-	    data1_add_tagdata_oid (zei->dh, d, "oid", p->oid, zei->nmem);
+	    data1_mk_tag_data_oid (zei->dh, d, "oid", p->oid, zei->nmem);
     }
     if ((p = accessInfo->schemas))
     {
-	d = data1_make_tag (zei->dh, c, "schemas", zei->nmem);
+	d = data1_mk_tag_uni (zei->dh, zei->nmem, "schemas", c);
 	for (; p; p = p->next)
-	    data1_add_tagdata_oid (zei->dh, d, "oid", p->oid, zei->nmem);
+	    data1_mk_tag_data_oid (zei->dh, d, "oid", p->oid, zei->nmem);
     }
 }
 
-int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
+int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database,
+			      int explain_database)
 {
     struct zebDatabaseInfoB *zdi;
     data1_node *node_dbinfo, *node_adinfo;
+    const char *database_n = strrchr (database, '/');
+
+    if (database_n)
+        database_n++;
+    else
+        database_n = database;
 
 #if ZINFO_DEBUG
     logf (LOG_LOG, "zebraExplain_newDatabase: %s", database);
@@ -745,20 +792,20 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
     assert (zei);
     for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
     {
-        if (!strcmp (zdi->databaseName, database))
+        if (!STRCASECMP (zdi->databaseName, database_n))
             break;
     }
     if (zdi)
         return -1;
     /* it's new really. make it */
-    zdi = nmem_malloc (zei->nmem, sizeof(*zdi));
+    zdi = (struct zebDatabaseInfoB *) nmem_malloc (zei->nmem, sizeof(*zdi));
     zdi->next = zei->databaseInfo;
     zei->databaseInfo = zdi;
     zdi->sysno = 0;
     zdi->recordCount = 0;
     zdi->recordBytes = 0;
     zdi->readFlag = 0;
-    zdi->databaseName = nmem_strdup (zei->nmem, database);
+    zdi->databaseName = nmem_strdup (zei->nmem, database_n);
 
     zebraExplain_mergeAccessInfo (zei, 0, &zdi->accessInfo);
     
@@ -769,23 +816,29 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
 	data1_read_sgml (zei->dh, zei->nmem, 
 			 "<explain><databaseInfo>DatabaseInfo\n"
 			 "</></>\n");
-    
-    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
-				   "databaseInfo");
+    if (!zdi->data1_database)
+	return -2;
+
+    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database,
+                                    "/databaseInfo");
     assert (node_dbinfo);
 
     zebraExplain_initCommonInfo (zei, node_dbinfo);
     zebraExplain_initAccessInfo (zei, node_dbinfo);
 
-    data1_add_tagdata_text (zei->dh, node_dbinfo, "name",
+    data1_mk_tag_data_text (zei->dh, node_dbinfo, "name",
 			       database, zei->nmem);
-
-    data1_add_tagdata_text (zei->dh, node_dbinfo, "userFee",
-			       "0", zei->nmem);
-
-    data1_add_tagdata_text (zei->dh, node_dbinfo, "available",
-			       "1", zei->nmem);
-
+    
+    if (explain_database)
+	data1_mk_tag_data_text (zei->dh, node_dbinfo, "explainDatabase",
+				"", zei->nmem);
+    
+    data1_mk_tag_data_text (zei->dh, node_dbinfo, "userFee",
+			    "0", zei->nmem);
+    
+    data1_mk_tag_data_text (zei->dh, node_dbinfo, "available",
+			    "1", zei->nmem);
+    
 #if ZINFO_DEBUG
     data1_pr_tree (zei->dh, zdi->data1_database, stderr);
 #endif
@@ -793,7 +846,7 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
     zei->dirty = 1;
     zei->curDatabaseInfo = zdi;
 
-    zdi->attributeDetails =
+    zdi->attributeDetails = (zebAttributeDetails)
 	nmem_malloc (zei->nmem, sizeof(*zdi->attributeDetails));
     zdi->attributeDetails->readFlag = 0;
     zdi->attributeDetails->sysno = 0;
@@ -804,9 +857,8 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
 			 "<explain><attributeDetails>AttributeDetails\n"
 			 "</></>\n");
 
-    node_adinfo =
-	data1_search_tag (zei->dh, zdi->attributeDetails->data1_tree->child,
-			  "attributeDetails");
+    node_adinfo = data1_search_tag (zei->dh, zdi->attributeDetails->data1_tree,
+                                    "/attributeDetails");
     assert (node_adinfo);
 
     zebraExplain_initCommonInfo (zei, node_adinfo);
@@ -830,15 +882,77 @@ static void writeAttributeValueDetails (ZebraExplainInfo zei,
 	data1_node *node_attvalue, *node_value;
 	if (set_ordinal != zsui->info.set)
 	    continue;
-	node_attvalue = data1_add_tag (zei->dh, node_atvs, "attributeValue",
-				       zei->nmem);
-	node_value = data1_add_tag (zei->dh, node_attvalue, "value",
-				    zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_value, "numeric",
+	node_attvalue = data1_mk_tag (zei->dh, zei->nmem, "attributeValue",
+                                      0 /* attr */, node_atvs);
+	node_value = data1_mk_tag (zei->dh, zei->nmem, "value",
+                                   0 /* attr */, node_attvalue);
+	data1_mk_tag_data_int (zei->dh, node_value, "numeric",
 			       zsui->info.use, zei->nmem);
     }
 }
 
+static void zebraExplain_writeCategoryList (ZebraExplainInfo zei,
+					    struct zebraCategoryListInfo *zcl,
+					    int key_flush)
+{
+    char *sgml_buf;
+    int sgml_len;
+    int i;
+    Record drec;
+    data1_node *node_ci, *node_categoryList;
+    SYSNO sysno = 0;
+    static char *category[] = {
+	"CategoryList",
+	"TargetInfo",
+	"DatabaseInfo",
+	"AttributeDetails",
+	NULL
+    };
+
+    assert (zcl);
+    if (!zcl->dirty)
+	return ;
+    zcl->dirty = 1;
+    node_categoryList = zcl->data1_categoryList;
+
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_writeCategoryList");
+#endif
+
+    drec = createRecord (zei->records, &sysno);
+    
+    node_ci = data1_search_tag (zei->dh, node_categoryList,
+				"/categoryList");
+    assert (node_ci);
+    node_ci = data1_mk_tag (zei->dh, zei->nmem, "categories", 0 /* attr */,
+                            node_ci);
+    assert (node_ci);
+    
+    for (i = 0; category[i]; i++)
+    {
+	data1_node *node_cat = data1_mk_tag (zei->dh, zei->nmem,  "category",
+                                             0 /* attr */, node_ci);
+
+	data1_mk_tag_data_text (zei->dh, node_cat, "name",
+				category[i], zei->nmem);
+    }
+    /* extract *searchable* keys from it. We do this here, because
+       record count, etc. is affected */
+    if (key_flush)
+	(*zei->updateFunc)(zei->updateHandle, drec, node_categoryList);
+
+    /* convert to "SGML" and write it */
+#if ZINFO_DEBUG
+    data1_pr_tree (zei->dh, node_categoryList, stderr);
+#endif
+    sgml_buf = data1_nodetoidsgml(zei->dh, node_categoryList, 0, &sgml_len);
+    drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
+    memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
+    drec->size[recInfo_storeData] = sgml_len;
+    
+    rec_put (zei->records, &drec);
+}
+
 static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 						zebAttributeDetails zad,
 						const char *databaseName,
@@ -861,11 +975,12 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 
     drec = createRecord (zei->records, &zad->sysno);
     assert (zad->data1_tree);
-    node_adinfo = data1_search_tag (zei->dh, zad->data1_tree->child,
-				   "attributeDetails");
+
+    node_adinfo = data1_search_tag (zei->dh, zad->data1_tree,
+				   "/attributeDetails");
     zebraExplain_updateCommonInfo (zei, node_adinfo);
 
-    data1_add_tagdata_text (zei->dh, node_adinfo, "name",
+    data1_mk_tag_data_text (zei->dh, node_adinfo, "name",
 			    databaseName, zei->nmem);
 
     /* extract *searchable* keys from it. We do this here, because
@@ -873,8 +988,8 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
     if (key_flush)
 	(*zei->updateFunc)(zei->updateHandle, drec, zad->data1_tree);
 
-    node_attributesBySet = data1_make_tag (zei->dh, node_adinfo,
-					   "attributesBySet", zei->nmem);
+    node_attributesBySet = data1_mk_tag_uni (zei->dh, zei->nmem,
+					   "attributesBySet", node_adinfo);
     set_min = -1;
     while (1)
     {
@@ -890,8 +1005,9 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 	if (set_ordinal < 0)
 	    break;
 	set_min = set_ordinal;
-	node_asd = data1_add_tag (zei->dh, node_attributesBySet,
-				  "attributeSetDetails", zei->nmem);
+	node_asd = data1_mk_tag (zei->dh, zei->nmem,
+                                 "attributeSetDetails",
+                                 0 /* attr */, node_attributesBySet);
 
 	attset = data1_attset_search_id (zei->dh, set_ordinal);
 	if (!attset)
@@ -906,42 +1022,54 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 	    
 	    oe.proto = PROTO_Z3950;
 	    oe.oclass = CLASS_ATTSET;
-	    oe.value = set_ordinal;
+	    oe.value = (enum oid_value) set_ordinal;
 	    
 	    if (oid_ent_to_oid (&oe, oid))
 	    {
 		data1_node *node_abt, *node_atd, *node_atvs;
-		data1_add_tagdata_oid (zei->dh, node_asd, "oid",
+		data1_mk_tag_data_oid (zei->dh, node_asd, "oid",
 				       oid, zei->nmem);
-
-		node_abt = data1_add_tag (zei->dh, node_asd,
-					  "attributesByType", zei->nmem);
-		node_atd = data1_add_tag (zei->dh, node_abt,
-					  "attributeTypeDetails", zei->nmem);
-		data1_add_tagdata_int (zei->dh, node_atd,
-					"type", 1, zei->nmem);
-		node_atvs = data1_add_tag (zei->dh, node_atd, 
-					  "attributeValues", zei->nmem);
+		
+		node_abt = data1_mk_tag (zei->dh, zei->nmem,
+                                         "attributesByType",
+                                         0 /*attr */, node_asd);
+		node_atd = data1_mk_tag (zei->dh, zei->nmem,
+                                         "attributeTypeDetails", 
+                                         0 /* attr */, node_abt);
+		data1_mk_tag_data_int (zei->dh, node_atd,
+				       "type", 1, zei->nmem);
+		node_atvs = data1_mk_tag (zei->dh, zei->nmem, 
+                                          "attributeValues",
+                                          0 /* attr */, node_atd);
 		writeAttributeValueDetails (zei, zad, node_atvs, attset);
 	    }
 	}
     }
     /* zebra info (private) */
-    node_zebra = data1_make_tag (zei->dh, node_adinfo,
-				 "zebraInfo", zei->nmem);
-    node_list = data1_make_tag (zei->dh, node_zebra,
-				 "attrlist", zei->nmem);
+    node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "zebraInfo", node_adinfo);
+    node_list = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "attrlist", node_zebra);
     for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
     {
+	struct oident oident;
+	int oid[OID_SIZE];
 	data1_node *node_attr;
-	node_attr = data1_add_tag (zei->dh, node_list,
-				      "attr", zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_attr, "set",
-				  zsui->info.set, zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_attr, "use",
-				  zsui->info.use, zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_attr, "ordinal",
-				  zsui->info.ordinal, zei->nmem);
+	
+	node_attr = data1_mk_tag (zei->dh, zei->nmem, "attr", 0 /* attr */,
+                                  node_list);
+	
+	oident.proto = PROTO_Z3950;
+	oident.oclass = CLASS_ATTSET;
+	oident.value = (enum oid_value) zsui->info.set;
+	oid_ent_to_oid (&oident, oid);
+	
+	data1_mk_tag_data_text (zei->dh, node_attr, "set",
+				oident.desc, zei->nmem);
+	data1_mk_tag_data_int (zei->dh, node_attr, "use",
+			       zsui->info.use, zei->nmem);
+	data1_mk_tag_data_int (zei->dh, node_attr, "ordinal",
+			       zsui->info.ordinal, zei->nmem);
     }
     /* convert to "SGML" and write it */
 #if ZINFO_DEBUG
@@ -949,7 +1077,7 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 #endif
     sgml_buf = data1_nodetoidsgml(zei->dh, zad->data1_tree,
 				  0, &sgml_len);
-    drec->info[recInfo_storeData] = xmalloc (sgml_len);
+    drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
     memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
     drec->size[recInfo_storeData] = sgml_len;
     
@@ -974,9 +1102,11 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
 #endif
     drec = createRecord (zei->records, &zdi->sysno);
     assert (zdi->data1_database);
-    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
-				   "databaseInfo");
 
+    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database,
+                                    "/databaseInfo");
+
+    assert (node_dbinfo);
     zebraExplain_updateCommonInfo (zei, node_dbinfo);
     zebraExplain_updateAccessInfo (zei, node_dbinfo, zdi->accessInfo);
 
@@ -985,15 +1115,15 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
     if (key_flush)
 	(*zei->updateFunc)(zei->updateHandle, drec, zdi->data1_database);
     /* record count */
-    node_count = data1_make_tag (zei->dh, node_dbinfo,
-				 "recordCount", zei->nmem);
-    data1_add_tagdata_int (zei->dh, node_count, "recordCountActual",
-			      zdi->recordCount, zei->nmem);
+    node_count = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "recordCount", node_dbinfo);
+    data1_mk_tag_data_zint (zei->dh, node_count, "recordCountActual",
+			    zdi->recordCount, zei->nmem);
 
     /* zebra info (private) */
-    node_zebra = data1_make_tag (zei->dh, node_dbinfo,
-				 "zebraInfo", zei->nmem);
-    data1_add_tagdata_int (zei->dh, node_zebra,
+    node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "zebraInfo", node_dbinfo);
+    data1_mk_tag_data_zint (zei->dh, node_zebra,
 			   "recordBytes", zdi->recordBytes, zei->nmem);
     /* convert to "SGML" and write it */
 #if ZINFO_DEBUG
@@ -1001,7 +1131,7 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
 #endif
     sgml_buf = data1_nodetoidsgml(zei->dh, zdi->data1_database,
 				  0, &sgml_len);
-    drec->info[recInfo_storeData] = xmalloc (sgml_len);
+    drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
     memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
     drec->size[recInfo_storeData] = sgml_len;
     
@@ -1024,12 +1154,13 @@ static void writeAttributeValues (ZebraExplainInfo zei,
     {
 	data1_node *node_value;
 	
-	node_value = data1_add_tag (zei->dh, node_values, "attributeValue",
-				    zei->nmem);
-	data1_add_tagdata_text (zei->dh, node_value, "name",
+	node_value = data1_mk_tag (zei->dh, zei->nmem, "attributeValue",
+                                   0 /* attr */, node_values);
+	data1_mk_tag_data_text (zei->dh, node_value, "name",
 				atts->name, zei->nmem);
-        node_value = data1_add_tag (zei->dh, node_value, "value", zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_value, "numeric",
+        node_value = data1_mk_tag (zei->dh, zei->nmem, "value",
+                                   0 /* attr */, node_value);
+	data1_mk_tag_data_int (zei->dh, node_value, "numeric",
 			       atts->value, zei->nmem);
     }
 }
@@ -1061,30 +1192,31 @@ static void zebraExplain_writeAttributeSet (ZebraExplainInfo zei,
 			 "<explain><attributeSetInfo>AttributeSetInfo\n"
 			 "</></>\n" );
 
-    node_attinfo = data1_search_tag (zei->dh, node_root->child,
-				   "attributeSetInfo");
+    node_attinfo = data1_search_tag (zei->dh, node_root,
+				   "/attributeSetInfo");
 
+    assert (node_attinfo);
     zebraExplain_initCommonInfo (zei, node_attinfo);
     zebraExplain_updateCommonInfo (zei, node_attinfo);
 
-    data1_add_tagdata_oid (zei->dh, node_attinfo,
+    data1_mk_tag_data_oid (zei->dh, node_attinfo,
 			    "oid", o->oid, zei->nmem);
     if (attset && attset->name)
-	data1_add_tagdata_text (zei->dh, node_attinfo,
+	data1_mk_tag_data_text (zei->dh, node_attinfo,
 				"name", attset->name, zei->nmem);
     
-    node_attributes = data1_make_tag (zei->dh, node_attinfo,
-				      "attributes", zei->nmem);
-    node_atttype = data1_make_tag (zei->dh, node_attributes,
-				   "attributeType", zei->nmem);
-    data1_add_tagdata_text (zei->dh, node_atttype,
+    node_attributes = data1_mk_tag_uni (zei->dh, zei->nmem,
+				      "attributes", node_attinfo);
+    node_atttype = data1_mk_tag_uni (zei->dh, zei->nmem,
+				   "attributeType", node_attributes);
+    data1_mk_tag_data_text (zei->dh, node_atttype,
 			    "name", "Use", zei->nmem);
-    data1_add_tagdata_text (zei->dh, node_atttype,
+    data1_mk_tag_data_text (zei->dh, node_atttype,
 			    "description", "Use Attribute", zei->nmem);
-    data1_add_tagdata_int (zei->dh, node_atttype,
+    data1_mk_tag_data_int (zei->dh, node_atttype,
 			   "type", 1, zei->nmem);
-    node_values = data1_add_tag (zei->dh, node_atttype,
-				 "attributeValues", zei->nmem);
+    node_values = data1_mk_tag (zei->dh, zei->nmem,
+                                "attributeValues", 0 /* attr */, node_atttype);
     if (attset)
 	writeAttributeValues (zei, node_values, attset);
 
@@ -1097,7 +1229,7 @@ static void zebraExplain_writeAttributeSet (ZebraExplainInfo zei,
     data1_pr_tree (zei->dh, node_root, stderr);
 #endif
     sgml_buf = data1_nodetoidsgml(zei->dh, node_root, 0, &sgml_len);
-    drec->info[recInfo_storeData] = xmalloc (sgml_len);
+    drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
     memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
     drec->size[recInfo_storeData] = sgml_len;
     
@@ -1119,8 +1251,8 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
     trec = rec_get (zei->records, 1);
     xfree (trec->info[recInfo_storeData]);
 
-    node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
-				   "targetInfo");
+    node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
+                                     "/targetInfo");
     assert (node_tgtinfo);
 
     zebraExplain_updateCommonInfo (zei, node_tgtinfo);
@@ -1130,36 +1262,36 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
     if (key_flush)
 	(*zei->updateFunc)(zei->updateHandle, trec, zei->data1_target);
 
-    node_zebra = data1_make_tag (zei->dh, node_tgtinfo,
-				 "zebraInfo", zei->nmem);
-    data1_add_tagdata_text (zei->dh, node_zebra, "version",
+    node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "zebraInfo", node_tgtinfo);
+    data1_mk_tag_data_text (zei->dh, node_zebra, "version",
 			       ZEBRAVER, zei->nmem);
-    node_list = data1_add_tag (zei->dh, node_zebra,
-				  "databaseList", zei->nmem);
+    node_list = data1_mk_tag (zei->dh, zei->nmem,
+                              "databaseList", 0 /* attr */, node_zebra);
     for (zdi = zei->databaseInfo; zdi; zdi = zdi->next)
     {
 	data1_node *node_db;
-	node_db = data1_add_tag (zei->dh, node_list,
-				    "database", zei->nmem);
-	data1_add_tagdata_text (zei->dh, node_db, "name",
-				   zdi->databaseName, zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_db, "id",
-				  zdi->sysno, zei->nmem);
-	data1_add_tagdata_int (zei->dh, node_db, "attributeDetailsId",
-				  zdi->attributeDetails->sysno, zei->nmem);
+	node_db = data1_mk_tag (zei->dh, zei->nmem,
+                                "database", 0 /* attr */, node_list);
+	data1_mk_tag_data_text (zei->dh, node_db, "name",
+                                zdi->databaseName, zei->nmem);
+	data1_mk_tag_data_zint (zei->dh, node_db, "id",
+				zdi->sysno, zei->nmem);
+	data1_mk_tag_data_zint (zei->dh, node_db, "attributeDetailsId",
+				zdi->attributeDetails->sysno, zei->nmem);
     }
-    data1_add_tagdata_int (zei->dh, node_zebra, "ordinalSU",
-			      zei->ordinalSU, zei->nmem);
+    data1_mk_tag_data_int (zei->dh, node_zebra, "ordinalSU",
+                           zei->ordinalSU, zei->nmem);
 
-    data1_add_tagdata_int (zei->dh, node_zebra, "runNumber",
-			      zei->runNumber, zei->nmem);
+    data1_mk_tag_data_zint (zei->dh, node_zebra, "runNumber",
+			    zei->runNumber, zei->nmem);
 
 #if ZINFO_DEBUG
     data1_pr_tree (zei->dh, zei->data1_target, stderr);
 #endif
     sgml_buf = data1_nodetoidsgml(zei->dh, zei->data1_target,
 				  0, &sgml_len);
-    trec->info[recInfo_storeData] = xmalloc (sgml_len);
+    trec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
     memcpy (trec->info[recInfo_storeData], sgml_buf, sgml_len);
     trec->size[recInfo_storeData] = sgml_len;
     
@@ -1178,6 +1310,38 @@ int zebraExplain_lookupSU (ZebraExplainInfo zei, int set, int use)
     return -1;
 }
 
+int zebraExplain_trav_ord(ZebraExplainInfo zei, void *handle,
+			  int (*f)(void *handle, int ord))
+{
+    struct zebDatabaseInfoB *zdb = zei->curDatabaseInfo;
+    if (zdb)
+    {
+	struct zebSUInfoB *zsui = zdb->attributeDetails->SUInfo;
+	for ( ;zsui; zsui = zsui->next)
+	    (*f)(handle,  zsui->info.ordinal);
+    }
+    return 0;
+}
+			  
+int zebraExplain_lookup_ord (ZebraExplainInfo zei, int ord,
+			     const char **db, int *set, int *use)
+{
+    struct zebDatabaseInfoB *zdb;
+    for (zdb = zei->databaseInfo; zdb; zdb = zdb->next)
+    {
+	struct zebSUInfoB *zsui = zdb->attributeDetails->SUInfo;
+	for ( ;zsui; zsui = zsui->next)
+	    if (zsui->info.ordinal == ord)
+	    {
+		*db = zdb->databaseName;
+		*set = zsui->info.set;
+		*use = zsui->info.use;
+		return 0;
+	    }
+    }
+    return -1;
+}
+
 zebAccessObject zebraExplain_announceOid (ZebraExplainInfo zei,
 					  zebAccessObject *op,
 					  Odr_oid *oid)
@@ -1189,7 +1353,7 @@ zebAccessObject zebraExplain_announceOid (ZebraExplainInfo zei,
 	    break;
     if (!ao)
     {
-	ao = nmem_malloc (zei->nmem, sizeof(*ao));
+	ao = (zebAccessObject) nmem_malloc (zei->nmem, sizeof(*ao));
 	ao->handle = NULL;
 	ao->sysno = 0;
 	ao->oid = odr_oiddup_nmem (zei->nmem, oid);
@@ -1206,7 +1370,7 @@ void zebraExplain_addAttributeSet (ZebraExplainInfo zei, int set)
 
     oe.proto = PROTO_Z3950;
     oe.oclass = CLASS_ATTSET;
-    oe.value = set;
+    oe.value = (enum oid_value) set;
 
     if (oid_ent_to_oid (&oe, oid))
     {
@@ -1226,7 +1390,7 @@ int zebraExplain_addSU (ZebraExplainInfo zei, int set, int use)
         if (zsui->info.use == use && zsui->info.set == set)
             return -1;
     zebraExplain_addAttributeSet (zei, set);
-    zsui = nmem_malloc (zei->nmem, sizeof(*zsui));
+    zsui = (struct zebSUInfoB *) nmem_malloc (zei->nmem, sizeof(*zsui));
     zsui->next = zei->curDatabaseInfo->attributeDetails->SUInfo;
     zei->curDatabaseInfo->attributeDetails->SUInfo = zsui;
     zei->curDatabaseInfo->attributeDetails->dirty = 1;
@@ -1266,10 +1430,12 @@ void zebraExplain_recordCountIncrement (ZebraExplainInfo zei, int adjust_num)
     }
 }
 
-int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
+zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
 {
     if (adjust_num)
+    {
 	zei->dirty = 1;
+    }
     return zei->runNumber += adjust_num;
 }
 
@@ -1279,7 +1445,7 @@ RecordAttr *rec_init_attr (ZebraExplainInfo zei, Record rec)
 
     if (rec->info[recInfo_attr])
 	return (RecordAttr *) rec->info[recInfo_attr];
-    recordAttr = xmalloc (sizeof(*recordAttr));
+    recordAttr = (RecordAttr *) xmalloc (sizeof(*recordAttr));
     rec->info[recInfo_attr] = (char *) recordAttr;
     rec->size[recInfo_attr] = sizeof(*recordAttr);
     
@@ -1291,9 +1457,9 @@ RecordAttr *rec_init_attr (ZebraExplainInfo zei, Record rec)
 
 static void att_loadset(void *p, const char *n, const char *name)
 {
-    data1_handle dh = p;
+    data1_handle dh = (data1_handle) p;
     if (!data1_get_attset (dh, name))
-	logf (LOG_WARN, "Couldn't load attribute set %s", name);
+	logf (LOG_WARN, "Directive attset failed for %s", name);
 }
 
 void zebraExplain_loadAttsets (data1_handle dh, Res res)