X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzinfo.c;h=9086b6c42191f7b05a2093431e6e5ddcb9f318ab;hb=9040d4abe6fe0fc2820f224baf8c538716b02ea0;hp=3d2aee8aa95095c18bf19f54c802f1945261eaf1;hpb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;p=idzebra-moved-to-github.git

diff --git a/index/zinfo.c b/index/zinfo.c
index 3d2aee8..9086b6c 100644
--- a/index/zinfo.c
+++ b/index/zinfo.c
@@ -1,5 +1,5 @@
-/* $Id: zinfo.c,v 1.64 2006-05-19 13:49:34 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: zinfo.c,v 1.77 2007-02-24 16:47:16 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <sys/types.h>
@@ -33,15 +33,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 struct zebSUInfo {
     int index_type;
+    zinfo_index_category_t cat;
 #define ZEB_SU_SET_USE 1
 #define ZEB_SU_STR 2
     int which;
     union {
 	char *str;
-	struct {
-	    int set;
-	    int use;
-	} su;
     } u;
     int ordinal;
     zint doc_occurrences;
@@ -56,7 +53,7 @@ struct zebSUInfoB {
 typedef struct zebAccessObjectB *zebAccessObject;
 struct zebAccessObjectB {
     void *handle;
-    SYSNO sysno;
+    zint sysno;
     Odr_oid *oid;
     zebAccessObject next;
 };
@@ -69,7 +66,7 @@ struct zebAccessInfoB {
 
 typedef struct {
     struct zebSUInfoB *SUInfo;
-    SYSNO sysno;
+    zint sysno;
     int dirty;
     int readFlag;
     data1_node *data1_tree;
@@ -82,7 +79,7 @@ struct zebDatabaseInfoB {
     data1_node *data1_database;
     zint recordCount;    /* records in db */
     zint recordBytes;    /* size of records */
-    SYSNO sysno;         /* sysno of database info */
+    zint 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;
@@ -97,7 +94,7 @@ struct zebraExplainAttset {
 
 struct zebraCategoryListInfo {
     int dirty;
-    SYSNO sysno;
+    zint sysno;
     data1_node *data1_categoryList;
 };
 
@@ -118,7 +115,7 @@ struct zebraExplainInfo {
     struct zebDatabaseInfoB *curDatabaseInfo;
     zebAccessInfo accessInfo;
     char date[15]; /* YYYY MMDD HH MM SS */
-    int (*updateFunc)(void *handle, Record drec, data1_node *n);
+    ZebraExplainUpdateFunc *updateFunc;
     void *updateHandle;
 };
 
@@ -146,7 +143,7 @@ static void zebraExplain_writeCategoryList(ZebraExplainInfo zei,
 					    int key_flush);
 
 
-static Record createRecord(Records records, SYSNO *sysno)
+static Record createRecord(Records records, zint *sysno)
 {
     Record rec;
     if (*sysno)
@@ -340,7 +337,7 @@ ZebraExplainInfo zebraExplain_open(
     Res res,
     int writeFlag,
     void *updateHandle,
-    int (*updateFunc)(void *handle, Record drec, data1_node *n))
+    ZebraExplainUpdateFunc *updateFunc)
 {
     Record trec;
     ZebraExplainInfo zei;
@@ -363,6 +360,9 @@ ZebraExplainInfo zebraExplain_open(
     zei->records = records;
     zei->nmem = nmem;
     zei->dh = dh;
+    
+    data1_get_absyn (zei->dh, "explain", DATA1_XPATH_INDEXING_DISABLE);
+
     zei->attsets = NULL;
     zei->res = res;
     zei->categoryList = (struct zebraCategoryListInfo *)
@@ -409,11 +409,23 @@ ZebraExplainInfo zebraExplain_open(
 #endif
 	node_tgtinfo = data1_search_tag(zei->dh, zei->data1_target,
 					 "/targetInfo");
+        if (!node_tgtinfo)
+        {
+	    yaz_log(YLOG_FATAL, "Node node_tgtinfo missing");
+	    nmem_destroy(zei->nmem);
+	    return 0;
+        }
 	zebraExplain_mergeAccessInfo(zei, node_tgtinfo,
 				      &zei->accessInfo);
 
 	node_zebra = data1_search_tag(zei->dh, node_tgtinfo->child,
 				       "zebraInfo");
+        if (!node_zebra)
+        {
+	    yaz_log(YLOG_FATAL, "Node node_zebra missing");
+	    nmem_destroy(zei->nmem);
+	    return 0;
+        }
 	np = 0;
 	if (node_zebra)
 	{
@@ -491,7 +503,7 @@ ZebraExplainInfo zebraExplain_open(
             yaz_log(YLOG_DEBUG, "read runnumber=" ZINT_FORMAT, zei->runNumber);
 	    *zdip = NULL;
 	}
-	rec_rm(&trec);
+	rec_free(&trec);
     }
     else  /* create initial targetInfo */
     {
@@ -543,7 +555,7 @@ ZebraExplainInfo zebraExplain_open(
 	    trec->size[recInfo_storeData] = sgml_len;
 		
 	    rec_put(records, &trec);
-	    rec_rm(&trec);
+	    rec_free(&trec);
 	}
 	
 	zebraExplain_newDatabase(zei, "IR-Explain-1", 0);
@@ -591,16 +603,13 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei,
 				  "attrlist");
     for (np = node_list->child; np; np = np->next)
     {
-	data1_node *node_set = NULL;
-	data1_node *node_use = NULL;
 	data1_node *node_str = NULL;
 	data1_node *node_ordinal = NULL;
 	data1_node *node_type = NULL;
+	data1_node *node_cat = NULL;
         data1_node *node_doc_occurrences = NULL;
         data1_node *node_term_occurrences = NULL;
 	data1_node *np2;
-	char oid_str[128];
-	int oid_str_len;
 
 	if (np->which != DATA1N_tag || strcmp(np->u.tag.tag, "attr"))
 	    continue;
@@ -609,16 +618,14 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei,
 	    if (np2->which != DATA1N_tag || !np2->child ||
 		np2->child->which != DATA1N_data)
 		continue;
-	    if (!strcmp(np2->u.tag.tag, "set"))
-		node_set = np2->child;
-	    else if (!strcmp(np2->u.tag.tag, "use"))
-		node_use = np2->child;
-	    else if (!strcmp(np2->u.tag.tag, "str"))
+	    if (!strcmp(np2->u.tag.tag, "str"))
 		node_str = np2->child;
 	    else if (!strcmp(np2->u.tag.tag, "ordinal"))
 		node_ordinal = np2->child;
 	    else if (!strcmp(np2->u.tag.tag, "type"))
 		node_type = np2->child;
+	    else if (!strcmp(np2->u.tag.tag, "cat"))
+		node_cat = np2->child;
 	    else if (!strcmp(np2->u.tag.tag, "dococcurrences"))
 		node_doc_occurrences = np2->child;
 	    else if (!strcmp(np2->u.tag.tag, "termoccurrences"))
@@ -641,6 +648,31 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei,
 	    yaz_log(YLOG_WARN, "Missing attribute 'type' in attribute info");
 	    (*zsuip)->info.index_type = 'w';
 	}
+        if (node_cat && node_cat->u.data.len > 0)
+        {
+            zinfo_index_category_t cat;
+
+            data1_node *np = node_cat;
+            if (!strncmp(np->u.data.data, "index", np->u.data.len))
+                cat = zinfo_index_category_index;
+            else if (!strncmp(np->u.data.data, "sort", np->u.data.len))
+                cat = zinfo_index_category_sort;
+            else if (!strncmp(np->u.data.data, "alwaysmatches", 
+                              np->u.data.len))
+                cat = zinfo_index_category_alwaysmatches;
+            else if (!strncmp(np->u.data.data, "anchor", 
+                              np->u.data.len))
+                cat = zinfo_index_category_anchor;
+            else
+            {
+                yaz_log(YLOG_WARN, "Bad index cateogry '%.*s'",
+                        np->u.data.len, np->u.data.data);
+                cat = zinfo_index_category_index;
+            }
+            (*zsuip)->info.cat = cat;
+        }
+        else
+            (*zsuip)->info.cat = zinfo_index_category_index;
 
         if (node_doc_occurrences)
         {
@@ -654,25 +686,7 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei,
             (*zsuip)->info.term_occurrences = atoi_zn(np->u.data.data,
                                                       np->u.data.len);
         }
-	if (node_set && node_use)
-	{
-	    (*zsuip)->info.which = ZEB_SU_SET_USE;
-	    
-	    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)->info.u.su.set = oid_getvalbyname(oid_str);
-	    
-	    (*zsuip)->info.u.su.use = atoi_n(node_use->u.data.data,
-					 node_use->u.data.len);
-	    yaz_log(YLOG_DEBUG, "set=%d use=%d ordinal=%d",
-		     (*zsuip)->info.u.su.set, (*zsuip)->info.u.su.use,
-		     (*zsuip)->info.ordinal);
-	}
-	else if (node_str)
+	if (node_str)
 	{
 	    (*zsuip)->info.which = ZEB_SU_STR;
 	    
@@ -691,7 +705,7 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei,
     }
     *zsuip = NULL;
     zad->readFlag = 0;
-    rec_rm (&rec);
+    rec_free(&rec);
 }
 
 static void zebraExplain_readDatabase (ZebraExplainInfo zei,
@@ -736,7 +750,7 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei,
 				    np->child->u.data.len);
     }
     zdi->readFlag = 0;
-    rec_rm (&rec);
+    rec_free(&rec);
 }
 
 int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle)
@@ -760,12 +774,12 @@ int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle)
 		
 		rec = rec_get(zei->records, zad->sysno);
 		(*zei->updateFunc)(zei->updateHandle, rec, 0);
-		rec_rm(&rec);
+		rec_free(&rec);
 	    }
 	    /* remove database record keys and delete it */
 	    rec = rec_get (zei->records, zdi->sysno);
 	    (*zei->updateFunc)(zei->updateHandle, rec, 0);
-	    rec_rm(&rec);
+	    rec_free(&rec);
 
 	    /* remove from list */
 	    *zdip = zdi->next;
@@ -853,8 +867,7 @@ static void zebraExplain_updateAccessInfo (ZebraExplainInfo zei, data1_node *n,
     if (!c)
     {
         data1_pr_tree (zei->dh, n, stdout);
-        exit (0);
-        assert (c);
+        zebra_exit("zebraExplain_updateAccessInfo");
     }
 
     if ((p = accessInfo->attributeSetIds))
@@ -962,35 +975,11 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database,
 
     zebraExplain_initCommonInfo (zei, node_adinfo);
 
+    data1_mk_tag_data_text(zei->dh, node_adinfo, "name", database, zei->nmem);
+
     return 0;
 }
 
-static void writeAttributeValueDetails (ZebraExplainInfo zei,
-				  zebAttributeDetails zad,
-				  data1_node *node_atvs, data1_attset *attset)
-
-{
-    struct zebSUInfoB *zsui;
-    int set_ordinal = attset->reference;
-    data1_attset_child *c;
-
-    for (c = attset->children; c; c = c->next)
-	writeAttributeValueDetails (zei, zad, node_atvs, c->child);
-    for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
-    {
-	if (zsui->info.which == ZEB_SU_SET_USE && 
-	    set_ordinal == zsui->info.u.su.set)
-	{
-	    data1_node *node_attvalue, *node_value;
-	    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.u.su.use, zei->nmem);
-	}
-    }
-}
 
 static void zebraExplain_writeCategoryList (ZebraExplainInfo zei,
 					    struct zebraCategoryListInfo *zcl,
@@ -1001,7 +990,7 @@ static void zebraExplain_writeCategoryList (ZebraExplainInfo zei,
     int i;
     Record drec;
     data1_node *node_ci, *node_categoryList;
-    SYSNO sysno = 0;
+    zint sysno = 0;
     static char *category[] = {
 	"CategoryList",
 	"TargetInfo",
@@ -1064,9 +1053,8 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
     char *sgml_buf;
     int sgml_len;
     Record drec;
-    data1_node *node_adinfo, *node_list, *node_zebra, *node_attributesBySet;
+    data1_node *node_adinfo, *node_list, *node_zebra;
     struct zebSUInfoB *zsui;
-    int set_min;
     
     if (!zad->dirty)
 	return;
@@ -1074,6 +1062,7 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
     zad->dirty = 0;
 #if ZINFO_DEBUG
     yaz_log(YLOG_LOG, "zebraExplain_writeAttributeDetails");    
+    data1_pr_tree(zei->dh, zad->data1_tree, stderr);
 #endif
 
     drec = createRecord (zei->records, &zad->sysno);
@@ -1085,84 +1074,20 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 				   "/attributeDetails");
     zebraExplain_updateCommonInfo (zei, node_adinfo);
 
-    data1_mk_tag_data_text (zei->dh, node_adinfo, "name",
-			    databaseName, zei->nmem);
+    /* zebra info (private) .. no children yet.. so se don't index zebraInfo */
+    node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "zebraInfo", node_adinfo);
 
     /* extract *searchable* keys from it. We do this here, because
        record count, etc. is affected */
     if (key_flush)
 	(*zei->updateFunc)(zei->updateHandle, drec, zad->data1_tree);
-
-    node_attributesBySet = data1_mk_tag_uni (zei->dh, zei->nmem,
-					   "attributesBySet", node_adinfo);
-    set_min = -1;
-    while (1)
-    {
-	data1_node *node_asd;
-	data1_attset *attset;
-	int set_ordinal = -1;
-	for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
-	{
-	    if (zsui->info.which == ZEB_SU_SET_USE &&
-		(set_ordinal < 0 || set_ordinal > zsui->info.u.su.set)
-		&& zsui->info.u.su.set > set_min)
-		set_ordinal = zsui->info.u.su.set;
-	}
-	if (set_ordinal < 0)
-	    break;
-	set_min = set_ordinal;
-	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)
-	{
-	    zebraExplain_loadAttsets (zei->dh, zei->res);
-	    attset = data1_attset_search_id (zei->dh, set_ordinal);
-	}
-	if (attset)
-	{
-	    int oid[OID_SIZE];
-	    oident oe;
-	    
-	    oe.proto = PROTO_Z3950;
-	    oe.oclass = CLASS_ATTSET;
-	    oe.value = (enum oid_value) set_ordinal;
-	    
-	    if (oid_ent_to_oid (&oe, oid))
-	    {
-		data1_node *node_abt, *node_atd, *node_atvs;
-		data1_mk_tag_data_oid (zei->dh, node_asd, "oid",
-				       oid, 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_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;
 	char index_type_str[2];
-
 	
 	node_attr = data1_mk_tag (zei->dh, zei->nmem, "attr", 0 /* attr */,
                                   node_list);
@@ -1171,19 +1096,7 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
 	index_type_str[1] = '\0';
 	data1_mk_tag_data_text (zei->dh, node_attr, "type",
 				index_type_str, zei->nmem);
-	if (zsui->info.which == ZEB_SU_SET_USE)
-	{
-	    oident.proto = PROTO_Z3950;
-	    oident.oclass = CLASS_ATTSET;
-	    oident.value = (enum oid_value) zsui->info.u.su.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.u.su.use, zei->nmem);
-	}
-	else if (zsui->info.which == ZEB_SU_STR)
+	if (zsui->info.which == ZEB_SU_STR)
 	{
 	    data1_mk_tag_data_text (zei->dh, node_attr, "str",
 				    zsui->info.u.str, zei->nmem);
@@ -1195,6 +1108,21 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
                                 zsui->info.doc_occurrences, zei->nmem);
         data1_mk_tag_data_zint (zei->dh, node_attr, "termoccurrences",
                                 zsui->info.term_occurrences, zei->nmem);
+        switch(zsui->info.cat)
+        {
+        case zinfo_index_category_index:
+	    data1_mk_tag_data_text (zei->dh, node_attr, "cat",
+				    "index", zei->nmem); break;
+        case zinfo_index_category_sort:
+	    data1_mk_tag_data_text (zei->dh, node_attr, "cat",
+				    "sort", zei->nmem); break;
+        case zinfo_index_category_alwaysmatches:
+	    data1_mk_tag_data_text (zei->dh, node_attr, "cat",
+				    "alwaysmatches", zei->nmem); break;
+        case zinfo_index_category_anchor:
+	    data1_mk_tag_data_text (zei->dh, node_attr, "cat",
+				    "anchor", zei->nmem); break;
+        }
     }
     /* convert to "SGML" and write it */
 #if ZINFO_DEBUG
@@ -1237,10 +1165,6 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
     zebraExplain_updateCommonInfo (zei, node_dbinfo);
     zebraExplain_updateAccessInfo (zei, node_dbinfo, zdi->accessInfo);
 
-    /* extract *searchable* keys from it. We do this here, because
-       record count, etc. is affected */
-    if (key_flush)
-	(*zei->updateFunc)(zei->updateHandle, drec, zdi->data1_database);
     /* record count */
     node_count = data1_mk_tag_uni (zei->dh, zei->nmem,
 				 "recordCount", node_dbinfo);
@@ -1250,6 +1174,11 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
     /* zebra info (private) */
     node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
 				 "zebraInfo", node_dbinfo);
+
+    /* extract *searchable* keys from it. We do this here, because
+       record count, etc. is affected */
+    if (key_flush)
+	(*zei->updateFunc)(zei->updateHandle, drec, zdi->data1_database);
     data1_mk_tag_data_zint (zei->dh, node_zebra,
 			   "recordBytes", zdi->recordBytes, zei->nmem);
 
@@ -1391,12 +1320,12 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
     zebraExplain_updateCommonInfo (zei, node_tgtinfo);
     zebraExplain_updateAccessInfo (zei, node_tgtinfo, zei->accessInfo);
 
+    node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+				 "zebraInfo", node_tgtinfo);
     /* convert to "SGML" and write it */
     if (key_flush)
 	(*zei->updateFunc)(zei->updateHandle, trec, zei->data1_target);
 
-    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_mk_tag (zei->dh, zei->nmem,
@@ -1434,54 +1363,9 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
     rec_put (zei->records, &trec);
 }
 
-int zebraExplain_lookup_attr_su_any_index(ZebraExplainInfo zei,
-					  int set, int use)
-{
-    struct zebSUInfoB *zsui;
-    int ord;
-
-    assert (zei->curDatabaseInfo);
-
-    ord = zebraExplain_lookup_attr_su(zei, 'w', set, use);
-    if (ord != -1)
-        return ord;
-    for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
-	 zsui; zsui=zsui->next)
-        if (zsui->info.which == ZEB_SU_SET_USE &&
-	    zsui->info.u.su.use == use && zsui->info.u.su.set == set)
-            return zsui->info.ordinal;
-    return -1;
-}
-
-int zebraExplain_lookup_attr_su(ZebraExplainInfo zei, int index_type,
-				int set, int use)
-{
-    struct zebSUInfoB **zsui;
-
-#if 0
-    yaz_log(YLOG_LOG, "lookup_attr_su index_type=%d set=%d use=%d",
-            index_type, set, use);
-#endif
-    assert (zei->curDatabaseInfo);
-    for (zsui = &zei->curDatabaseInfo->attributeDetails->SUInfo;
-	 *zsui; zsui = &(*zsui)->next)
-        if ((*zsui)->info.index_type == index_type &&
-	    (*zsui)->info.which == ZEB_SU_SET_USE &&
-	    (*zsui)->info.u.su.use == use && (*zsui)->info.u.su.set == set)
-        {
-            struct zebSUInfoB *zsui_this = *zsui;
-
-            /* take it out of the list and move to front */
-            *zsui = (*zsui)->next;
-            zsui_this->next = zei->curDatabaseInfo->attributeDetails->SUInfo;
-            zei->curDatabaseInfo->attributeDetails->SUInfo = zsui_this;
-
-            return zsui_this->info.ordinal;
-        }
-    return -1;
-}
-
-int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type,
+int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, 
+                                 zinfo_index_category_t cat,
+                                 int index_type,
 				 const char *str)
 {
     struct zebSUInfoB **zsui;
@@ -1489,9 +1373,10 @@ int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type,
     assert (zei->curDatabaseInfo);
     for (zsui = &zei->curDatabaseInfo->attributeDetails->SUInfo;
 	 *zsui; zsui = &(*zsui)->next)
-        if ((*zsui)->info.index_type == index_type
-            && (*zsui)->info.which == ZEB_SU_STR 
-            && !yaz_matchstr((*zsui)->info.u.str, str))
+        if ( (index_type == -1 || (*zsui)->info.index_type == index_type)
+             && (*zsui)->info.cat == cat
+             && (*zsui)->info.which == ZEB_SU_STR 
+             && !yaz_matchstr((*zsui)->info.u.str, str))
         {
             struct zebSUInfoB *zsui_this = *zsui;
 
@@ -1601,15 +1486,10 @@ zint zebraExplain_ord_get_term_occurrences(ZebraExplainInfo zei, int ord)
 int zebraExplain_lookup_ord(ZebraExplainInfo zei, int ord,
 			    int *index_type, 
 			    const char **db,
-			    int *set, int *use,
 			    const char **string_index)
 {
     struct zebSUInfoB *zsui;
 
-    if (set)
-	*set = -1;
-    if (use)
-	*use = -1;
     if (index_type)
 	*index_type = 0;
     if (string_index)
@@ -1618,18 +1498,9 @@ int zebraExplain_lookup_ord(ZebraExplainInfo zei, int ord,
     zsui = zebraExplain_get_sui_info(zei, ord, 0, db);
     if (zsui)
     {
-        if (zsui->info.which == ZEB_SU_SET_USE)
-        {
-            if (set)
-                *set = zsui->info.u.su.set;
-            if (use)
-                *use = zsui->info.u.su.use;
-        }
-        
         if (zsui->info.which == ZEB_SU_STR)
             if (string_index)
                 *string_index = zsui->info.u.str;
-        
         if (index_type)
             *index_type = zsui->info.index_type;
         return 0;
@@ -1678,6 +1549,7 @@ void zebraExplain_addAttributeSet (ZebraExplainInfo zei, int set)
 }
 
 struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei,
+                                             zinfo_index_category_t cat,
                                              int index_type)
 {
     struct zebSUInfoB *zsui;
@@ -1689,29 +1561,19 @@ struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei,
     zei->curDatabaseInfo->attributeDetails->dirty = 1;
     zei->dirty = 1;
     zsui->info.index_type = index_type;
+    zsui->info.cat = cat;
     zsui->info.doc_occurrences = 0;
     zsui->info.term_occurrences = 0;
     zsui->info.ordinal = (zei->ordinalSU)++;
     return zsui;
 }
 
-int zebraExplain_add_attr_su(ZebraExplainInfo zei, int index_type,
-			     int set, int use)
-{
-    struct zebSUInfoB *zsui = zebraExplain_add_sui_info(zei, index_type);
-
-    yaz_log(YLOG_WARN, "add_attr_su");
-    zebraExplain_addAttributeSet (zei, set);
-    zsui->info.which = ZEB_SU_SET_USE;
-    zsui->info.u.su.set = set;
-    zsui->info.u.su.use = use;
-    return zsui->info.ordinal;
-}
-
-int zebraExplain_add_attr_str(ZebraExplainInfo zei, int index_type,
+int zebraExplain_add_attr_str(ZebraExplainInfo zei, 
+                              zinfo_index_category_t cat,
+                              int index_type,
 			      const char *index_name)
 {
-    struct zebSUInfoB *zsui = zebraExplain_add_sui_info(zei, index_type);
+    struct zebSUInfoB *zsui = zebraExplain_add_sui_info(zei, cat, index_type);
 
     zsui->info.which = ZEB_SU_STR;
     zsui->info.u.str = nmem_strdup(zei->nmem, index_name);
@@ -1763,6 +1625,8 @@ RecordAttr *rec_init_attr (ZebraExplainInfo zei, Record rec)
     if (rec->info[recInfo_attr])
 	return (RecordAttr *) rec->info[recInfo_attr];
     recordAttr = (RecordAttr *) xmalloc (sizeof(*recordAttr));
+
+    memset(recordAttr, '\0', sizeof(*recordAttr));
     rec->info[recInfo_attr] = (char *) recordAttr;
     rec->size[recInfo_attr] = sizeof(*recordAttr);