From 85a2a0b28cb516d28ac70b7824f2b7d4b07e56ae Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 20 May 1998 10:12:10 +0000
Subject: [PATCH] Implemented automatic EXPLAIN database maintenance. Modified
 Zebra to work with ASN.1 compiled version of YAZ.

---
 CHANGELOG             |   10 +
 Makefile              |    3 +-
 include/recctrl.h     |   11 +-
 index/attribute.c     |   54 ++-
 index/extract.c       |  150 ++++++---
 index/index.h         |   12 +-
 index/kdump.c         |    7 +-
 index/main.c          |   21 +-
 index/zebraapi.c      |   13 +-
 index/zinfo.c         |  865 +++++++++++++++++++++++++++++++++++++++++--------
 index/zinfo.h         |   20 +-
 index/zrpn.c          |   10 +-
 index/zserver.h       |    9 +-
 index/zsets.c         |   16 +-
 isamc/isamc.c         |    7 +-
 recctrl/recgrs.c      |   34 +-
 recctrl/rectext.c     |    8 +-
 test/gils/zebra.cfg   |    3 +-
 test/usmarc/zebra.cfg |    3 +-
 19 files changed, 1005 insertions(+), 251 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 449a947..73b7c05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+Modified Zebra so that it works with ASN.1 compiled code for YAZ.
+
+Implemented EXPLAIN database maintenance. Zebra automatically
+generate - and update TargetInfo, DatabaseInfo, AttributeSetInfo
+and AttributeDetails records at this stage. The records may
+be transferred as GRS-1, SUTRS and Explain.
+
+Fixed register spec so that colon isn't treated as size separator
+unless followed by [0-9+-] in order to allow DOS drive specifications.
+
 Fixed two bugs in ISAMC system.
 
 Changed the way Zebra keeps its maintenance information. Records
diff --git a/Makefile b/Makefile
index a47ab32..38a3c40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994-1998, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.61 1998-03-05 08:45:11 adam Exp $
+# $Id: Makefile,v 1.62 1998-05-20 10:12:11 adam Exp $
 
 SHELL=/bin/sh
 MAKE=make
@@ -11,6 +11,7 @@ RANLIB=ranlib
 YAZLIB=../../yaz/lib/libyaz.a
 # Where are Yaz header files located?
 YAZINC=-I../../yaz/include
+#YAZINC=-I../../yaz/z39.50 -I../../yaz/include
 # If Yaz is compiled with mosi support uncomment and specify.
 #OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 
diff --git a/include/recctrl.h b/include/recctrl.h
index 30b85e8..4736bd8 100644
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.25  1998-03-11 11:19:04  adam
+ * Revision 1.26  1998-05-20 10:12:12  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.25  1998/03/11 11:19:04  adam
  * Changed the way sequence numbers are generated.
  *
  * Revision 1.24  1998/03/05 08:38:46  adam
@@ -127,10 +131,11 @@ struct recExtractCtrl {
     off_t     offset;                            /* start offset           */
     char      *subType;
     void      (*init)(struct recExtractCtrl *p, RecWord *w);
-    void      (*add)(RecWord *p);
+    void      (*addWord)(RecWord *p);
     ZebraMaps zebra_maps;
     int       flagShowRecords;
     int       seqno[256];
+    void      (*addSchema)(struct recExtractCtrl *p, Odr_oid *oid);
     data1_handle dh;
 };
 
@@ -168,6 +173,8 @@ typedef struct recType
 
 RecType recType_byName (const char *name, char *subType);
 
+int grs_extract_tree(struct recExtractCtrl *p, data1_node *n);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/index/attribute.c b/index/attribute.c
index 3548f3a..2f7d894 100644
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: attribute.c,v $
- * Revision 1.8  1998-03-05 08:45:11  adam
+ * Revision 1.9  1998-05-20 10:12:14  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.8  1998/03/05 08:45:11  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -40,39 +44,19 @@
 #include <zebrautl.h>
 #include "zserver.h"
 
-static void att_loadset(void *p, const char *n, const char *name)
-{
-    data1_attset *cnew;
-    ZebraHandle zi = p;
-
-    if (!(cnew = data1_read_attset(zi->dh, (char*) name)))
-    {
-	logf(LOG_WARN|LOG_ERRNO, "%s", name);
-	return;
-    }
-    cnew->next = zi->registered_sets;
-    zi->registered_sets = cnew;
-}
-
-static void load_atts(ZebraHandle zi)
-{
-    res_trav(zi->res, "attset", zi, att_loadset);
-}
-
 static data1_att *getatt(data1_attset *p, int att)
 {
     data1_att *a;
+    data1_attset_child *c;
 
-    for (; p; p = p->next)
-    {
-	/* scan local set */
-	for (a = p->atts; a; a = a->next)
-	    if (a->value == att)
-		return a;
-	/* scan included sets */
-	if (p->children && (a = getatt(p->children, att)))
+    /* scan local set */
+    for (a = p->atts; a; a = a->next)
+	if (a->value == att)
+	    return a;
+    /* scan included sets */
+    for (c = p->children; c; c = c->next)
+	if ((a = getatt(c->child, att)))
 	    return a;
-    }
     return 0;
 }
 
@@ -81,16 +65,16 @@ int att_getentbyatt(ZebraHandle zi, attent *res, oid_value set, int att)
     data1_att *r;
     data1_attset *p;
 
-    if (!zi->registered_sets)
-	load_atts(zi);
-    for (p = zi->registered_sets; p; p = p->next)
-	if (p->reference == set)
-	    break;
+    if (!(p = data1_attset_search_id (zi->dh, set)))
+    {
+	zebraExplain_loadAttsets (zi->dh, zi->res);
+	p = data1_attset_search_id (zi->dh, set);
+    }
     if (!p)
 	return -2;
     if (!(r = getatt(p, att)))
 	return -1;
-    res->attset_ordinal = r->parent->ordinal;
+    res->attset_ordinal = r->parent->reference;
     res->local_attributes = r->locals;
     return 0;
 }
diff --git a/index/extract.c b/index/extract.c
index 013784c..f3bceae 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.81  1998-03-11 11:19:04  adam
+ * Revision 1.82  1998-05-20 10:12:15  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.81  1998/03/11 11:19:04  adam
  * Changed the way sequence numbers are generated.
  *
  * Revision 1.80  1998/03/05 08:45:11  adam
@@ -339,8 +343,13 @@ static void logRecord (int showFlag)
     }
 }
 
-int key_open (BFiles bfs, int mem, int rw, data1_handle dh)
+static int explain_extract (void *handle, Record drec, data1_node *n);
+
+int key_open (struct recordGroup *rGroup, int mem)
 {
+    BFiles bfs = rGroup->bfs;
+    int rw = rGroup->flagRw;
+    data1_handle dh = rGroup->dh;
     if (!mem)
         mem = atoi(res_get_def (common_resource, "memMax", "4"))*1024*1024;
     if (mem < 50000)
@@ -364,7 +373,8 @@ int key_open (BFiles bfs, int mem, int rw, data1_handle dh)
 	dict_close (matchDict);
 	return -1;
     }
-    zti = zebraExplain_open (records, dh, rw);
+    zti = zebraExplain_open (records, dh, common_resource,
+			     rw, rGroup, explain_extract);
     if (!zti)
     {
 	rec_close (&records);
@@ -543,13 +553,14 @@ void key_flush (void)
     key_buf_used = 0;
 }
 
-int key_close (int rw)
+int key_close (struct recordGroup *rGroup)
 {
-    key_flush ();
-    xfree (key_buf);
+    int rw = rGroup->flagRw;
     if (rw)
 	zebraExplain_runNumberIncrement (zti, 1);
-    zebraExplain_close (zti, rw);
+    zebraExplain_close (zti, rw, 0);
+    key_flush ();
+    xfree (key_buf);
     rec_close (&records);
     dict_close (matchDict);
     sortIdx_close (sortIdx);
@@ -562,7 +573,7 @@ static void wordInit (struct recExtractCtrl *p, RecWord *w)
 {
     w->zebra_maps = p->zebra_maps;
     w->seqnos = p->seqno;
-    w->attrSet = 1;
+    w->attrSet = VAL_BIB1;
     w->attrUse = 1016;
     w->reg_type = 'w';
 }
@@ -793,19 +804,13 @@ static void flushSortKeys (SYSNO sysno, int cmd)
     sortKeys = NULL;
 }
 
-static void flushRecordKeys (SYSNO sysno, int cmd, struct recKeys *reckeys, 
-                             const char *databaseName)
+static void flushRecordKeys (SYSNO sysno, int cmd, struct recKeys *reckeys)
 {
     char attrSet = -1;
     short attrUse = -1;
     int seqno = 0;
     int off = 0;
 
-    if (zebraExplain_curDatabase (zti, databaseName))
-    {
-        if (zebraExplain_newDatabase (zti, databaseName))
-            abort ();
-    }
     zebraExplain_recordCountIncrement (zti, cmd ? 1 : -1);
     while (off < reckeys->buf_used)
     {
@@ -938,7 +943,6 @@ static struct file_read_info *file_read_start (int fd)
 
 static void file_read_stop (struct file_read_info *fi)
 {
-    assert (fi);
     xfree (fi);
 }
 
@@ -1151,45 +1155,53 @@ static void recordLogPreamble (int level, const char *msg, void *info)
     log_event_start (NULL, NULL);
 }
 
+void addSchema (struct recExtractCtrl *p, Odr_oid *oid)
+{
+    zebraExplain_addSchema (zti, oid);
+}
+
 static int recordExtract (SYSNO *sysno, const char *fname,
                           struct recordGroup *rGroup, int deleteFlag,
-                          struct file_read_info *fi, RecType recType,
-                          char *subType)
+                          struct file_read_info *fi,
+			  RecType recType, char *subType)
 {
-    struct recExtractCtrl extractCtrl;
     RecordAttr *recordAttr;
     int r;
     char *matchStr;
     SYSNO sysnotmp;
-    off_t recordOffset = 0;
     Record rec;
     struct recordLogInfo logInfo;
+    off_t recordOffset = 0;
 
     if (fi->fd != -1)
     {
-	int i;
-        /* we are going to read from a file, so prepare the extraction */
-        extractCtrl.fh = fi;
-        extractCtrl.subType = subType;
-        extractCtrl.init = wordInit;
-        extractCtrl.add = addRecordKey;
-	extractCtrl.dh = rGroup->dh;
+	struct recExtractCtrl extractCtrl;
 
-        reckeys.buf_used = 0;
-        reckeys.prevAttrUse = -1;
-        reckeys.prevAttrSet = -1;
-        reckeys.prevSeqNo = 0;
+        /* we are going to read from a file, so prepare the extraction */
+	int i;
 
+	reckeys.buf_used = 0;
+	reckeys.prevAttrUse = -1;
+	reckeys.prevAttrSet = -1;
+	reckeys.prevSeqNo = 0;
+	
+	recordOffset = fi->file_moffset;
+	extractCtrl.offset = fi->file_moffset;
+	extractCtrl.readf = file_read;
+	extractCtrl.seekf = file_seek;
+	extractCtrl.tellf = file_tell;
+	extractCtrl.endf = file_end;
+	extractCtrl.fh = fi;
+	extractCtrl.subType = subType;
+	extractCtrl.init = wordInit;
+	extractCtrl.addWord = addRecordKey;
+	extractCtrl.addSchema = addSchema;
+	extractCtrl.dh = rGroup->dh;
 	for (i = 0; i<256; i++)
 	    extractCtrl.seqno[i] = 0;
-        recordOffset = fi->file_moffset;
-        extractCtrl.offset = recordOffset;
-        extractCtrl.readf = file_read;
-        extractCtrl.seekf = file_seek;
-        extractCtrl.tellf = file_tell;
-        extractCtrl.endf = file_end;
 	extractCtrl.zebra_maps = rGroup->zebra_maps;
-        extractCtrl.flagShowRecords = !rGroup->flagRw;
+	extractCtrl.flagShowRecords = !rGroup->flagRw;
+
         if (!rGroup->flagRw)
             printf ("File: %s %ld\n", fname, (long) recordOffset);
 
@@ -1275,7 +1287,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         {
             dict_insert (matchDict, matchStr, sizeof(*sysno), sysno);
         }
-        flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
+        flushRecordKeys (*sysno, 1, &reckeys);
 	flushSortKeys (*sysno, 1);
 
         records_inserted++;
@@ -1301,7 +1313,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         delkeys.buf_used = rec->size[recInfo_delKeys];
 	delkeys.buf = rec->info[recInfo_delKeys];
 	flushSortKeys (*sysno, 0);
-        flushRecordKeys (*sysno, 0, &delkeys, rec->info[recInfo_databaseName]);
+        flushRecordKeys (*sysno, 0, &delkeys);
         if (deleteFlag)
         {
             /* record going to be deleted */
@@ -1339,7 +1351,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
                 if (records_processed < rGroup->fileVerboseLimit)
                     logf (LOG_LOG, "update %s %s %ld", rGroup->recordType,
                           fname, (long) recordOffset);
-                flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName); 
+                flushRecordKeys (*sysno, 1, &reckeys);
                 records_updated++;
             }
         }
@@ -1506,6 +1518,12 @@ int fileExtract (SYSNO *sysno, const char *fname,
     if (!rGroup->databaseName)
         rGroup->databaseName = "Default";
 
+    if (zebraExplain_curDatabase (zti, rGroup->databaseName))
+    {
+        if (zebraExplain_newDatabase (zti, rGroup->databaseName))
+            abort ();
+    }
+
     if (rGroup->flagStoreData == -1)
     {
         const char *sval;
@@ -1560,3 +1578,53 @@ int fileExtract (SYSNO *sysno, const char *fname,
     return r;
 }
 
+static int explain_extract (void *handle, Record rec, data1_node *n)
+{
+    struct recordGroup *rGroup = (struct recordGroup*) handle;
+    struct recExtractCtrl extractCtrl;
+    int i;
+
+    if (zebraExplain_curDatabase (zti, rec->info[recInfo_databaseName]))
+    {
+        if (zebraExplain_newDatabase (zti, rec->info[recInfo_databaseName]))
+            abort ();
+    }
+
+    reckeys.buf_used = 0;
+    reckeys.prevAttrUse = -1;
+    reckeys.prevAttrSet = -1;
+    reckeys.prevSeqNo = 0;
+    
+    extractCtrl.init = wordInit;
+    extractCtrl.addWord = addRecordKey;
+    extractCtrl.addSchema = addSchema;
+    extractCtrl.dh = rGroup->dh;
+    for (i = 0; i<256; i++)
+	extractCtrl.seqno[i] = 0;
+    extractCtrl.zebra_maps = rGroup->zebra_maps;
+    extractCtrl.flagShowRecords = !rGroup->flagRw;
+    
+    grs_extract_tree(&extractCtrl, n);
+
+    logf (LOG_DEBUG, "flush explain record, sysno=%d", rec->sysno);
+
+    if (rec->size[recInfo_delKeys])
+    {
+	struct recKeys delkeys;
+
+	delkeys.buf_used = rec->size[recInfo_delKeys];
+	delkeys.buf = rec->info[recInfo_delKeys];
+	flushSortKeys (rec->sysno, 0);
+	flushRecordKeys (rec->sysno, 0, &delkeys);
+    }
+    flushRecordKeys (rec->sysno, 1, &reckeys);
+    flushSortKeys (rec->sysno, 1);
+
+    xfree (rec->info[recInfo_delKeys]);
+    rec->size[recInfo_delKeys] = reckeys.buf_used;
+    rec->info[recInfo_delKeys] = reckeys.buf;
+    reckeys.buf = NULL;
+    reckeys.buf_max = 0;
+
+    return 0;
+}
diff --git a/index/index.h b/index/index.h
index bfd6923..688f792 100644
--- a/index/index.h
+++ b/index/index.h
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: index.h,v $
- * Revision 1.57  1998-03-05 08:45:12  adam
+ * Revision 1.58  1998-05-20 10:12:16  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.57  1998/03/05 08:45:12  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -278,8 +282,8 @@ void repositoryAdd (struct recordGroup *rGroup);
 void repositoryDelete (struct recordGroup *rGroup);
 void repositoryShow (struct recordGroup *rGroup);
 
-int key_open (BFiles bfs, int mem, int rw, data1_handle);
-int key_close (int rw);
+int key_open (struct recordGroup *rGroup, int mem);
+int key_close (struct recordGroup *group);
 int key_compare (const void *p1, const void *p2);
 int key_get_pos (const void *p);
 int key_compare_it (const void *p1, const void *p2);
@@ -329,4 +333,6 @@ int zebra_unlock (ZebraLockHandle h);
 int zebra_lock_fd (ZebraLockHandle h);
 void zebra_lock_prefix (Res res, char *dst);
 
+void zebra_load_atts (data1_handle dh, Res res);
+
 extern Res common_resource;
diff --git a/index/kdump.c b/index/kdump.c
index 3cff3d4..4f78ddd 100644
--- a/index/kdump.c
+++ b/index/kdump.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kdump.c,v $
- * Revision 1.15  1998-03-05 08:45:12  adam
+ * Revision 1.16  1998-05-20 10:12:17  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.15  1998/03/05 08:45:12  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -182,6 +186,7 @@ int main (int argc, char **argv)
         logf (LOG_FATAL|LOG_ERRNO, "fopen %s", key_fname);
         exit (1);
     }
+    printf ("t  rg op  sysno seqno txt\n");
     while (read_one (inf, key_string, key_info, &prevk))
     {
         struct it_key k;
diff --git a/index/main.c b/index/main.c
index f622834..bda4eab 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.56  1998-03-05 08:45:12  adam
+ * Revision 1.57  1998-05-20 10:12:18  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.56  1998/03/05 08:45:12  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -403,31 +407,28 @@ int main (int argc, char **argv)
                 switch (cmd)
                 {
                 case 'u':
-                    if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw,
-				   rGroup.dh))
+                    if (!key_open (&rGroup, mem_max))
 		    {
 			logf (LOG_LOG, "updating %s", rGroup.path);
 			repositoryUpdate (&rGroup);
-			nsections = key_close (rGroup.flagRw);
+			nsections = key_close (&rGroup);
 		    }
                     break;
                 case 'U':
-                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw,
-				   rGroup.dh))
+                    if (!key_open (&rGroup, mem_max))
 		    {
 			logf (LOG_LOG, "updating (pass 1) %s", rGroup.path);
 			repositoryUpdate (&rGroup);
-			key_close (rGroup.flagRw);
+			key_close (&rGroup);
 		    }
                     nsections = 0;
                     break;
                 case 'd':
-                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw,
-				   rGroup.dh))
+                    if (!key_open (&rGroup,mem_max))
 		    {
 			logf (LOG_LOG, "deleting %s", rGroup.path);
 			repositoryDelete (&rGroup);
-			nsections = key_close (rGroup.flagRw);
+			nsections = key_close (&rGroup);
 		    }
                     break;
                 case 's':
diff --git a/index/zebraapi.c b/index/zebraapi.c
index ce2a017..10a7ef7 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.1  1998-03-05 08:45:13  adam
+ * Revision 1.2  1998-05-20 10:12:19  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.1  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.
  *
@@ -52,7 +56,7 @@ static int zebra_register_lock (ZebraHandle zh)
     zh->registerChange = lastChange;
     if (zh->records)
     {
-        zebraExplain_close (zh->zei, 0);
+        zebraExplain_close (zh->zei, 0, 0);
         dict_close (zh->dict);
 	sortIdx_close (zh->sortIdx);
         if (zh->isam)
@@ -83,7 +87,7 @@ static int zebra_register_lock (ZebraHandle zh)
                                   sizeof (struct it_key), zh->res)))
             return -1;
     }
-    zh->zei = zebraExplain_open (zh->records, zh->dh, 0);
+    zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0);
 
     return 0;
 }
@@ -134,7 +138,6 @@ ZebraHandle zebra_open (const char *host, const char *configName)
     zh->registerChange = 0;
     
     zh->records = NULL;
-    zh->registered_sets = NULL;
     zh->zebra_maps = zebra_maps_open (zh->res);
     zh->rank_classes = NULL;
     
@@ -147,7 +150,7 @@ void zebra_close (ZebraHandle zh)
     if (zh->records)
     {
         resultSetDestroy (zh);
-        zebraExplain_close (zh->zei, 0);
+        zebraExplain_close (zh->zei, 0, 0);
         dict_close (zh->dict);
 	sortIdx_close (zh->sortIdx);
         if (zh->isam)
diff --git a/index/zinfo.c b/index/zinfo.c
index c57e52b..11fb059 100644
--- a/index/zinfo.c
+++ b/index/zinfo.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zinfo.c,v $
- * Revision 1.7  1998-03-05 08:45:13  adam
+ * 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.
  *
@@ -34,6 +38,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <time.h>
 
 #include <zebraver.h>
 #include "zinfo.h"
@@ -51,8 +56,30 @@ struct zebSUInfoB {
     struct zebSUInfoB *next;
 };
 
-struct zebDatabaseInfoB {
+typedef struct zebAccessObjectB *zebAccessObject;
+struct zebAccessObjectB {
+    void *handle;
+    int sysno;
+    Odr_oid *oid;
+    zebAccessObject next;
+};
+
+typedef struct zebAccessInfoB *zebAccessInfo;
+struct zebAccessInfoB {
+    zebAccessObject attributeSetIds;
+    zebAccessObject schemas;
+};
+
+typedef struct {
     struct zebSUInfoB *SUInfo;
+    int sysno;
+    int dirty;
+    int readFlag;
+    data1_node *data1_tree;
+} *zebAttributeDetails;
+
+struct zebDatabaseInfoB {
+    zebAttributeDetails attributeDetails;
     char *databaseName;
     data1_node *data1_database;
     int recordCount;     /* records in db */
@@ -61,6 +88,7 @@ struct zebDatabaseInfoB {
     int readFlag;        /* 1: read is needed when referenced; 0 if not */
     int dirty;           /* 1: database is dirty: write is needed */
     struct zebDatabaseInfoB *next;
+    zebAccessInfo accessInfo;
 };
 
 struct zebraExplainAttset {
@@ -75,13 +103,21 @@ struct zebraExplainInfo {
     int  dirty;
     Records records;
     data1_handle dh;
+    Res res;
     struct zebraExplainAttset *attsets;
     NMEM nmem;
     data1_node *data1_target;
     struct zebDatabaseInfoB *databaseInfo;
     struct zebDatabaseInfoB *curDatabaseInfo;
+    zebAccessInfo accessInfo;
+    char date[15]; /* YYYY MMDD HH MM SS */
+    int (*updateFunc)(void *handle, Record drec, data1_node *n);
+    void *updateHandle;
 };
 
+static void zebraExplain_initCommonInfo (ZebraExplainInfo zei, data1_node *n);
+static void zebraExplain_initAccessInfo (ZebraExplainInfo zei, data1_node *n);
+
 static data1_node *read_sgml_rec (data1_handle dh, NMEM nmem, Record rec)
 {
     return data1_read_sgml (dh, nmem, rec->info[recInfo_storeData]);
@@ -103,7 +139,7 @@ static data1_node *data1_search_tag (data1_handle dh, data1_node *n,
 }
 
 static data1_node *data1_add_tag (data1_handle dh, data1_node *at,
-				     const char *tag, NMEM nmem)
+				  const char *tag, NMEM nmem)
 {
     data1_node *partag = get_parent_tag(dh, at);
     data1_node *res = data1_mk_node (dh, nmem);
@@ -137,9 +173,7 @@ static data1_node *data1_add_tag (data1_handle dh, data1_node *at,
 static data1_node *data1_make_tag (data1_handle dh, data1_node *at,
 				   const char *tag, NMEM nmem)
 {
-    data1_node *node;
-
-    node = data1_search_tag (dh, at->child, tag);
+    data1_node *node = data1_search_tag (dh, at->child, tag);
     if (!node)
 	node = data1_add_tag (dh, at, tag, nmem);
     else
@@ -163,6 +197,32 @@ static data1_node *data1_add_tagdata_int (data1_handle dh, data1_node *at,
     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)
@@ -173,64 +233,204 @@ static data1_node *data1_add_tagdata_text (data1_handle dh, data1_node *at,
     if (!node_data)
 	return 0;
     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);
+    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);
-static void zebraExplain_writeTarget (ZebraExplainInfo zei);
+                                        struct zebDatabaseInfoB *zdi,
+					int key_flush);
+static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
+						zebAttributeDetails zad,
+						const char *databaseName,
+						int key_flush);
+static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush);
+static void zebraExplain_writeAttributeSet (ZebraExplainInfo zei,
+					    zebAccessObject o,
+					    int key_flush);
+
+static Record createRecord (Records records, int *sysno)
+{
+    Record rec;
+    if (*sysno)
+    {
+	rec = rec_get (records, *sysno);
+	xfree (rec->info[recInfo_storeData]);
+    }
+    else
+    {
+	rec = rec_new (records);
+	*sysno = rec->sysno;
+	
+	rec->info[recInfo_fileType] =
+	    rec_strdup ("grs.sgml", &rec->size[recInfo_fileType]);
+	rec->info[recInfo_databaseName] =
+	    rec_strdup ("IR-Explain-1",
+			&rec->size[recInfo_databaseName]); 
+    }
+    return rec;
+}
 
-void zebraExplain_close (ZebraExplainInfo zei, int writeFlag)
+void zebraExplain_close (ZebraExplainInfo zei, int writeFlag,
+			 int (*updateH)(Record drec, data1_node *n))
 {
-    struct zebDatabaseInfoB *zdi, *zdi_next;
+    struct zebDatabaseInfoB *zdi;
     
     logf (LOG_DEBUG, "zebraExplain_close wr=%d", writeFlag);
     if (writeFlag)
     {
+	zebAccessObject o;
 	/* write each database info record */
 	for (zdi = zei->databaseInfo; zdi; zdi = zdi->next)
-	    zebraExplain_writeDatabase (zei, zdi);
-	zebraExplain_writeTarget (zei);
-    }
-    for (zdi = zei->databaseInfo; zdi; zdi = zdi_next)
-    {
-        struct zebSUInfoB *zsui, *zsui_next;
-
-        zdi_next = zdi->next;
-        for (zsui = zdi->SUInfo; zsui; zsui = zsui_next)
-        {
-            zsui_next = zsui->next;
-            xfree (zsui);
-        }
-        xfree (zdi);
+	{
+	    zebraExplain_writeDatabase (zei, zdi, 1);
+	    zebraExplain_writeAttributeDetails (zei, zdi->attributeDetails,
+						zdi->databaseName, 1);
+	}
+	zebraExplain_writeTarget (zei, 1);
+	
+	assert (zei->accessInfo);
+	for (o = zei->accessInfo->attributeSetIds; o; o = o->next)
+	    if (!o->sysno)
+		zebraExplain_writeAttributeSet (zei, o, 1);
+	for (o = zei->accessInfo->schemas; o; o = o->next)
+	    if (!o->sysno)
+	    {
+/* 		zebraExplain_writeSchema (zei, o, 1); */
+	    }
+
+	for (zdi = zei->databaseInfo; zdi; zdi = zdi->next)
+	{
+	    zebraExplain_writeDatabase (zei, zdi, 0);
+	    zebraExplain_writeAttributeDetails (zei, zdi->attributeDetails,
+						zdi->databaseName, 0);
+	}
+	zebraExplain_writeTarget (zei, 0);
+	
     }
     nmem_destroy (zei->nmem);
     xfree (zei);
 }
 
+void zebraExplain_mergeOids (ZebraExplainInfo zei, data1_node *n,
+			     zebAccessObject *op)
+{
+    data1_node *np;
+
+    for (np = n->child; np; np = np->next)
+    {
+	char str[64];
+	int len;
+	Odr_oid *oid;
+	zebAccessObject ao;
+
+	if (np->which != DATA1N_tag || strcmp (np->u.tag.tag, "oid"))
+	    continue;
+	len = np->child->u.data.len;
+	if (len > 63)
+	    len = 63;
+	memcpy (str, np->child->u.data.data, len);
+	str[len] = '\0';
+	
+	oid = odr_getoidbystr_nmem (zei->nmem, str);
+
+	for (ao = *op; ao; ao = ao->next)
+	    if (!oid_oidcmp (oid, ao->oid))
+	    {
+		ao->sysno = 1;
+		break;
+	    }
+	if (!ao)
+	{
+	    ao = nmem_malloc (zei->nmem, sizeof(*ao));
+	    ao->handle = NULL;
+	    ao->sysno = 1;
+	    ao->oid = oid;
+	    ao->next = *op;
+	    *op = ao;
+	}
+    }
+}
+
+void zebraExplain_mergeAccessInfo (ZebraExplainInfo zei, data1_node *n,
+				   zebAccessInfo *accessInfo)
+{
+    data1_node *np;
+    
+    if (!n)
+    {
+	*accessInfo = nmem_malloc (zei->nmem, sizeof(**accessInfo));
+	(*accessInfo)->attributeSetIds = NULL;
+	(*accessInfo)->schemas = NULL;
+    }
+    else
+    {
+	if (!(n = data1_search_tag (zei->dh, n->child, "accessInfo")))
+	    return;
+	if ((np = data1_search_tag (zei->dh, n->child, "attributeSetIds")))
+	    zebraExplain_mergeOids (zei, np,
+				    &(*accessInfo)->attributeSetIds);
+	if ((np = data1_search_tag (zei->dh, n->child, "schemas")))
+	    zebraExplain_mergeOids (zei, np,
+				    &(*accessInfo)->schemas);
+    }
+}
 
-ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
-				    int writeFlag)
+ZebraExplainInfo zebraExplain_open (
+    Records records, data1_handle dh,
+    Res res,
+    int writeFlag,
+    void *updateHandle,
+    int (*updateFunc)(void *handle, Record drec, data1_node *n))
 {
     Record trec;
     ZebraExplainInfo zei;
     struct zebDatabaseInfoB **zdip;
+    time_t our_time;
+    struct tm *tm;
 
     logf (LOG_DEBUG, "zebraExplain_open wr=%d", writeFlag);
     zei = xmalloc (sizeof(*zei));
+    zei->updateHandle = updateHandle;
+    zei->updateFunc = updateFunc;
     zei->dirty = 0;
     zei->curDatabaseInfo = NULL;
     zei->records = records;
     zei->nmem = nmem_create ();
     zei->dh = dh;
     zei->attsets = NULL;
+    zei->res = res;
+
+    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);
+
     zdip = &zei->databaseInfo;
-    trec = rec_get (records, 1);
+    trec = rec_get (records, 1);      /* get "root" record */
 
-    if (trec)
+    zebraExplain_mergeAccessInfo (zei, 0, &zei->accessInfo);
+    if (trec)    /* targetInfo already exists ... */
     {
 	data1_node *node_tgtinfo, *node_zebra, *node_list, *np;
 
@@ -241,6 +441,9 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 #endif
 	node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
 					 "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,
@@ -249,6 +452,7 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 	{
 	    data1_node *node_name = NULL;
 	    data1_node *node_id = NULL;
+	    data1_node *node_aid = NULL;
 	    data1_node *np2;
 	    if (np->which != DATA1N_tag || strcmp (np->u.tag.tag, "database"))
 		continue;
@@ -260,17 +464,19 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 		    node_name = np2->child;
 		else if (!strcmp (np2->u.tag.tag, "id"))
 		    node_id = np2->child;
+		else if (!strcmp (np2->u.tag.tag, "attributeDetailsId"))
+		    node_aid = np2->child;
 	    }
-	    assert (node_id && node_name);
+	    assert (node_id && node_name && node_aid);
 	    
-	    *zdip = xmalloc (sizeof(**zdip));
+	    *zdip = nmem_malloc (zei->nmem, sizeof(**zdip));
 
             (*zdip)->readFlag = 1;
             (*zdip)->dirty = 0;
 	    (*zdip)->data1_database = NULL;
 	    (*zdip)->recordCount = 0;
 	    (*zdip)->recordBytes = 0;
-	    (*zdip)->SUInfo = NULL;
+	    zebraExplain_mergeAccessInfo (zei, 0, &(*zdip)->accessInfo);
 
 	    (*zdip)->databaseName = nmem_malloc (zei->nmem,
 						 1+node_name->u.data.len);
@@ -279,6 +485,14 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 	    (*zdip)->databaseName[node_name->u.data.len] = '\0';
 	    (*zdip)->sysno = atoi_n (node_id->u.data.data,
 				     node_id->u.data.len);
+	    (*zdip)->attributeDetails =
+		nmem_malloc (zei->nmem, sizeof(*(*zdip)->attributeDetails));
+	    (*zdip)->attributeDetails->sysno = atoi_n (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,
@@ -292,11 +506,15 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 	np = np->child;
 	assert (np && np->which == DATA1N_data);
 	zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
+	*zdip = NULL;
+	rec_rm (&trec);
     }
-    else
+    else  /* create initial targetInfo */
     {
+	data1_node *node_tgtinfo;
         zei->ordinalSU = 1;
 	zei->runNumber = 0;
+
 	if (writeFlag)
 	{
 	    char *sgml_buf;
@@ -304,12 +522,21 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 
 	    zei->data1_target =
 		data1_read_sgml (zei->dh, zei->nmem,
-				 "<explain><targetInfo>targetInfo\n"
+				 "<explain><targetInfo>TargetInfo\n"
 				 "<name>Zebra</>\n"
 				 "<namedResultSets>1</>\n"
 				 "<multipleDBSearch>1</>\n"
 				 "<nicknames><name>Zebra</></>\n"
 				 "</></>\n" );
+
+	    node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
+					    "targetInfo");
+	    assert (node_tgtinfo);
+
+
+	    zebraExplain_initCommonInfo (zei, node_tgtinfo);
+	    zebraExplain_initAccessInfo (zei, node_tgtinfo);
+
 	    /* write now because we want to be sure about the sysno */
 	    trec = rec_new (records);
 	    trec->info[recInfo_fileType] =
@@ -324,40 +551,31 @@ ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
 	    
 	    rec_put (records, &trec);
 	}
+	*zdip = NULL;
+	rec_rm (&trec);
+	zebraExplain_newDatabase (zei, "IR-Explain-1");
     }
-    *zdip = NULL;
-    rec_rm (&trec);
-    zebraExplain_newDatabase (zei, "IR-Explain-1");
     return zei;
 }
 
-
-static void zebraExplain_readDatabase (ZebraExplainInfo zei,
-				       struct zebDatabaseInfoB *zdi)
+static void zebraExplain_readAttributeDetails (ZebraExplainInfo zei,
+					       zebAttributeDetails zad)
 {
     Record rec;
-    data1_node *node_dbinfo, *node_zebra, *node_list, *np;
-    struct zebSUInfoB **zsuip = &zdi->SUInfo;
+    struct zebSUInfoB **zsuip = &zad->SUInfo;
+    data1_node *node_adinfo, *node_zebra, *node_list, *np;
 
-    assert (zdi->sysno);
-    rec = rec_get (zei->records, zdi->sysno);
+    assert (zad->sysno);
+    rec = rec_get (zei->records, zad->sysno);
 
-    zdi->data1_database = read_sgml_rec (zei->dh, zei->nmem, rec);
-    
-    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
-				   "databaseInfo");
+    zad->data1_tree = read_sgml_rec (zei->dh, zei->nmem, rec);
 
-    node_zebra = data1_search_tag (zei->dh, node_dbinfo->child,
+    node_adinfo = data1_search_tag (zei->dh, zad->data1_tree->child,
+				    "attributeDetails");
+    node_zebra = data1_search_tag (zei->dh, node_adinfo->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);
-    }
     node_list = data1_search_tag (zei->dh, node_zebra->child,
-				 "attrlist");
+				  "attrlist");
     for (np = node_list->child; np; np = np->next)
     {
 	data1_node *node_set = NULL;
@@ -380,7 +598,7 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei,
 	}
 	assert (node_set && node_use && node_ordinal);
 	
-        *zsuip = xmalloc (sizeof(**zsuip));
+        *zsuip = nmem_malloc (zei->nmem, sizeof(**zsuip));
 	(*zsuip)->info.set = atoi_n (node_set->u.data.data,
 				     node_set->u.data.len);
 	(*zsuip)->info.use = atoi_n (node_use->u.data.data,
@@ -392,7 +610,32 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei,
         zsuip = &(*zsuip)->next;
     }
     *zsuip = NULL;
+    zad->readFlag = 0;
+    rec_rm (&rec);
+}
+
+static void zebraExplain_readDatabase (ZebraExplainInfo zei,
+				       struct zebDatabaseInfoB *zdi)
+{
+    Record rec;
+    data1_node *node_dbinfo, *node_zebra, *np;
+
+    assert (zdi->sysno);
+    rec = rec_get (zei->records, zdi->sysno);
+
+    zdi->data1_database = read_sgml_rec (zei->dh, zei->nmem, rec);
+    
+    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
+				   "databaseInfo");
+    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 ((np = data1_search_tag (zei->dh, node_dbinfo->child,
 				"recordCount")) &&
 	(np = data1_search_tag (zei->dh, np->child,
@@ -421,17 +664,81 @@ int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database)
     }
     if (!zdi)
         return -1;
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_curDatabase: %s", database);
+#endif
     if (zdi->readFlag)
+    {
+#if ZINFO_DEBUG
+	logf (LOG_LOG, "zebraExplain_readDatabase: %s", database);
+#endif
         zebraExplain_readDatabase (zei, zdi);
+    }
+    if (zdi->attributeDetails->readFlag)
+    {
+#if ZINFO_DEBUG
+	logf (LOG_LOG, "zebraExplain_readAttributeDetails: %s", database);
+#endif
+        zebraExplain_readAttributeDetails (zei, zdi->attributeDetails);
+    }
     zei->curDatabaseInfo = zdi;
     return 0;
 }
 
+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);
+}
+
+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);
+}
+
+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);
+}
+
+static void zebraExplain_updateAccessInfo (ZebraExplainInfo zei, data1_node *n,
+					   zebAccessInfo accessInfo)
+{
+    data1_node *c = data1_search_tag (zei->dh, n->child, "accessInfo");
+    data1_node *d;
+    zebAccessObject p;
+    
+    assert (c);
+
+    if ((p = accessInfo->attributeSetIds))
+    {
+	d = data1_make_tag (zei->dh, c, "attributeSetIds", zei->nmem);
+	for (; p; p = p->next)
+	    data1_add_tagdata_oid (zei->dh, d, "oid", p->oid, zei->nmem);
+    }
+    if ((p = accessInfo->schemas))
+    {
+	d = data1_make_tag (zei->dh, c, "schemas", zei->nmem);
+	for (; p; p = p->next)
+	    data1_add_tagdata_oid (zei->dh, d, "oid", p->oid, zei->nmem);
+    }
+}
+
 int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
 {
     struct zebDatabaseInfoB *zdi;
-    data1_node *node_dbinfo;
+    data1_node *node_dbinfo, *node_adinfo;
 
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_newDatabase: %s", database);
+#endif
     assert (zei);
     for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
     {
@@ -441,7 +748,7 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
     if (zdi)
         return -1;
     /* it's new really. make it */
-    zdi = xmalloc (sizeof(*zdi));
+    zdi = nmem_malloc (zei->nmem, sizeof(*zdi));
     zdi->next = zei->databaseInfo;
     zei->databaseInfo = zdi;
     zdi->sysno = 0;
@@ -449,77 +756,178 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database)
     zdi->recordBytes = 0;
     zdi->readFlag = 0;
     zdi->databaseName = nmem_strdup (zei->nmem, database);
-    zdi->SUInfo = NULL;
+
+    zebraExplain_mergeAccessInfo (zei, 0, &zdi->accessInfo);
     
     assert (zei->dh);
     assert (zei->nmem);
 
     zdi->data1_database =
 	data1_read_sgml (zei->dh, zei->nmem, 
-			 "<explain><databaseInfo>databaseInfo\n"
-			 "<userFee>0</>\n"
-			 "<available>1</>\n"
+			 "<explain><databaseInfo>DatabaseInfo\n"
 			 "</></>\n");
     
     node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
 				   "databaseInfo");
     assert (node_dbinfo);
 
+    zebraExplain_initCommonInfo (zei, node_dbinfo);
+    zebraExplain_initAccessInfo (zei, node_dbinfo);
+
     data1_add_tagdata_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 ZINFO_DEBUG
     data1_pr_tree (zei->dh, zdi->data1_database, stderr);
 #endif
     zdi->dirty = 1;
     zei->dirty = 1;
     zei->curDatabaseInfo = zdi;
+
+    zdi->attributeDetails =
+	nmem_malloc (zei->nmem, sizeof(*zdi->attributeDetails));
+    zdi->attributeDetails->readFlag = 0;
+    zdi->attributeDetails->sysno = 0;
+    zdi->attributeDetails->dirty = 1;
+    zdi->attributeDetails->data1_tree =
+	data1_read_sgml (zei->dh, zei->nmem,
+			 "<explain><attributeDetails>AttributeDetails\n"
+			 "</></>\n");
+
+    node_adinfo =
+	data1_search_tag (zei->dh, zdi->attributeDetails->data1_tree->child,
+			  "attributeDetails");
+    assert (node_adinfo);
+
+    zebraExplain_initCommonInfo (zei, node_adinfo);
+
     return 0;
 }
 
-static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
-                                        struct zebDatabaseInfoB *zdi)
+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)
+    {
+	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",
+			       zsui->info.use, zei->nmem);
+    }
+}
+
+static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei,
+						zebAttributeDetails zad,
+						const char *databaseName,
+						int key_flush)
 {
     char *sgml_buf;
     int sgml_len;
     Record drec;
-    data1_node *node_dbinfo, *node_list, *node_count, *node_zebra;
+    data1_node *node_adinfo, *node_list, *node_zebra, *node_attributesBySet;
     struct zebSUInfoB *zsui;
+    int set_min;
     
-    if (!zdi->dirty)
+    if (!zad->dirty)
 	return;
     
-    if (zdi->sysno)
-    {
-	drec = rec_get (zei->records, zdi->sysno);
-	xfree (drec->info[recInfo_storeData]);
-    }
-    else
+    zad->dirty = 0;
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_writeAttributeDetails");    
+#endif
+
+    drec = createRecord (zei->records, &zad->sysno);
+    assert (zad->data1_tree);
+    node_adinfo = data1_search_tag (zei->dh, zad->data1_tree->child,
+				   "attributeDetails");
+    zebraExplain_updateCommonInfo (zei, node_adinfo);
+
+    data1_add_tagdata_text (zei->dh, node_adinfo, "name",
+			    databaseName, 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, zad->data1_tree);
+
+    node_attributesBySet = data1_make_tag (zei->dh, node_adinfo,
+					   "attributesBySet", zei->nmem);
+    set_min = -1;
+    while (1)
     {
-	drec = rec_new (zei->records);
-	zdi->sysno = drec->sysno;
-	
-	drec->info[recInfo_fileType] =
-	    rec_strdup ("grs.sgml", &drec->size[recInfo_fileType]);
-	drec->info[recInfo_databaseName] =
-	    rec_strdup ("IR-Explain-1",
-			&drec->size[recInfo_databaseName]); 
-    }
-    assert (zdi->data1_database);
-    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
-				   "databaseInfo");
-    /* 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);
+	data1_node *node_asd;
+	data1_attset *attset;
+	int set_ordinal = -1;
+	for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
+	{
+	    if ((set_ordinal < 0 || set_ordinal > zsui->info.set)
+		&& zsui->info.set > set_min)
+		set_ordinal = zsui->info.set;
+	}
+	if (set_ordinal < 0)
+	    break;
+	set_min = set_ordinal;
+	node_asd = data1_add_tag (zei->dh, node_attributesBySet,
+				  "attributeSetDetails", zei->nmem);
 
+	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 = 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",
+				       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);
+		writeAttributeValueDetails (zei, zad, node_atvs, attset);
+	    }
+	}
+    }
     /* zebra info (private) */
-    node_zebra = data1_make_tag (zei->dh, node_dbinfo,
+    node_zebra = data1_make_tag (zei->dh, node_adinfo,
 				 "zebraInfo", zei->nmem);
     node_list = data1_make_tag (zei->dh, node_zebra,
 				 "attrlist", zei->nmem);
-    for (zsui = zdi->SUInfo; zsui; zsui = zsui->next)
+    for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
     {
 	data1_node *node_attr;
 	node_attr = data1_add_tag (zei->dh, node_list,
@@ -531,6 +939,56 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
 	data1_add_tagdata_int (zei->dh, node_attr, "ordinal",
 				  zsui->info.ordinal, zei->nmem);
     }
+    /* convert to "SGML" and write it */
+#if ZINFO_DEBUG
+    data1_pr_tree (zei->dh, zad->data1_tree, stderr);
+#endif
+    sgml_buf = data1_nodetoidsgml(zei->dh, zad->data1_tree,
+				  0, &sgml_len);
+    drec->info[recInfo_storeData] = 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_writeDatabase (ZebraExplainInfo zei,
+                                        struct zebDatabaseInfoB *zdi,
+					int key_flush)
+{
+    char *sgml_buf;
+    int sgml_len;
+    Record drec;
+    data1_node *node_dbinfo, *node_count, *node_zebra;
+    
+    if (!zdi->dirty)
+	return;
+
+    zdi->dirty = 0;
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_writeDatabase %s", zdi->databaseName);
+#endif
+    drec = createRecord (zei->records, &zdi->sysno);
+    assert (zdi->data1_database);
+    node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
+				   "databaseInfo");
+
+    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_make_tag (zei->dh, node_dbinfo,
+				 "recordCount", zei->nmem);
+    data1_add_tagdata_int (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,
 			   "recordBytes", zdi->recordBytes, zei->nmem);
     /* convert to "SGML" and write it */
@@ -546,37 +1004,103 @@ static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
     rec_put (zei->records, &drec);
 }
 
-static void trav_attset (data1_handle dh, ZebraExplainInfo zei,
-			 data1_attset *p_this)
+static void writeAttributeValues (ZebraExplainInfo zei,
+				  data1_node *node_values,
+				  data1_attset *attset)
 {
-    struct zebraExplainAttset *p_reg = zei->attsets;
+    data1_att *atts;
+    data1_attset_child *c;
 
-    if (!p_this)
-	return ;
-    while (p_reg)
-    {
-	if (!strcmp (p_this->name, p_reg->name))
-	    break;
-	p_reg = p_reg->next;
-    }
-    if (!p_this)
+    if (!attset)
+	return;
+
+    for (c = attset->children; c; c = c->next)
+	writeAttributeValues (zei, node_values, c->child);
+    for (atts = attset->atts; atts; atts = atts->next)
     {
-	p_reg = nmem_malloc (zei->nmem, sizeof (*p_reg));
-	p_reg->name = nmem_strdup (zei->nmem, p_this->name);
-	p_reg->ordinal = p_this->ordinal;
-	p_reg->next = zei->attsets;
-	zei->attsets = p_reg;
+	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",
+				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",
+			       atts->value, zei->nmem);
     }
-    trav_attset (dh, zei, p_this->children);
 }
 
-static void trav_absyn (data1_handle dh, void *h, data1_absyn *a)
+
+static void zebraExplain_writeAttributeSet (ZebraExplainInfo zei,
+					    zebAccessObject o,
+					    int key_flush)
 {
-    logf (LOG_LOG, "absyn %s", a->name);
-    trav_attset (dh, (ZebraExplainInfo) h, a->attset);
+    char *sgml_buf;
+    int sgml_len;
+    Record drec;
+    data1_node *node_root, *node_attinfo, *node_attributes, *node_atttype;
+    data1_node *node_values;
+    struct oident *entp;
+    struct data1_attset *attset = NULL;
+    
+    if ((entp = oid_getentbyoid (o->oid)))
+	attset = data1_attset_search_id (zei->dh, entp->value);
+	    
+#if ZINFO_DEBUG
+    logf (LOG_LOG, "zebraExplain_writeAttributeSet %s",
+	  attset ? attset->name : "<unknown>");    
+#endif
+
+    drec = createRecord (zei->records, &o->sysno);
+    node_root =
+	data1_read_sgml (zei->dh, zei->nmem,
+			 "<explain><attributeSetInfo>AttributeSetInfo\n"
+			 "</></>\n" );
+
+    node_attinfo = data1_search_tag (zei->dh, node_root->child,
+				   "attributeSetInfo");
+
+    zebraExplain_initCommonInfo (zei, node_attinfo);
+    zebraExplain_updateCommonInfo (zei, node_attinfo);
+
+    data1_add_tagdata_oid (zei->dh, node_attinfo,
+			    "oid", o->oid, zei->nmem);
+    if (attset && attset->name)
+	data1_add_tagdata_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,
+			    "name", "Use", zei->nmem);
+    data1_add_tagdata_text (zei->dh, node_atttype,
+			    "description", "Use Attribute", zei->nmem);
+    data1_add_tagdata_int (zei->dh, node_atttype,
+			   "type", 1, zei->nmem);
+    node_values = data1_add_tag (zei->dh, node_atttype,
+				 "attributeValues", zei->nmem);
+    if (attset)
+	writeAttributeValues (zei, node_values, attset);
+
+    /* extract *searchable* keys from it. We do this here, because
+       record count, etc. is affected */
+    if (key_flush)
+	(*zei->updateFunc)(zei->updateHandle, drec, node_root);
+    /* convert to "SGML" and write it */
+#if ZINFO_DEBUG
+    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);
+    memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
+    drec->size[recInfo_storeData] = sgml_len;
+    
+    rec_put (zei->records, &drec);
 }
 
-static void zebraExplain_writeTarget (ZebraExplainInfo zei)
+static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
 {
     struct zebDatabaseInfoB *zdi;
     data1_node *node_tgtinfo, *node_list, *node_zebra;
@@ -586,6 +1110,7 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei)
 
     if (!zei->dirty)
 	return;
+    zei->dirty = 0;
 
     trec = rec_get (zei->records, 1);
     xfree (trec->info[recInfo_storeData]);
@@ -594,6 +1119,13 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei)
 				   "targetInfo");
     assert (node_tgtinfo);
 
+    zebraExplain_updateCommonInfo (zei, node_tgtinfo);
+    zebraExplain_updateAccessInfo (zei, node_tgtinfo, zei->accessInfo);
+
+    /* convert to "SGML" and write it */
+    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",
@@ -609,6 +1141,8 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei)
 				   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);
     }
     data1_add_tagdata_int (zei->dh, node_zebra, "ordinalSU",
 			      zei->ordinalSU, zei->nmem);
@@ -616,9 +1150,6 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei)
     data1_add_tagdata_int (zei->dh, node_zebra, "runNumber",
 			      zei->runNumber, zei->nmem);
 
-    node_list = data1_add_tag (zei->dh, node_zebra,
-			       "attsetList", zei->nmem);
-    /* convert to "SGML" and write it */
 #if ZINFO_DEBUG
     data1_pr_tree (zei->dh, zei->data1_target, stderr);
 #endif
@@ -636,24 +1167,65 @@ int zebraExplain_lookupSU (ZebraExplainInfo zei, int set, int use)
     struct zebSUInfoB *zsui;
 
     assert (zei->curDatabaseInfo);
-    for (zsui = zei->curDatabaseInfo->SUInfo; zsui; zsui=zsui->next)
+    for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
+	 zsui; zsui=zsui->next)
         if (zsui->info.use == use && zsui->info.set == set)
             return zsui->info.ordinal;
     return -1;
 }
 
+zebAccessObject zebraExplain_announceOid (ZebraExplainInfo zei,
+					  zebAccessObject *op,
+					  Odr_oid *oid)
+{
+    zebAccessObject ao;
+    
+    for (ao = *op; ao; ao = ao->next)
+	if (!oid_oidcmp (oid, ao->oid))
+	    break;
+    if (!ao)
+    {
+	ao = nmem_malloc (zei->nmem, sizeof(*ao));
+	ao->handle = NULL;
+	ao->sysno = 0;
+	ao->oid = odr_oiddup_nmem (zei->nmem, oid);
+	ao->next = *op;
+	*op = ao;
+    }
+    return ao;
+}
+
+void zebraExplain_addAttributeSet (ZebraExplainInfo zei, int set)
+{
+    oident oe;
+    int oid[OID_SIZE];
+
+    oe.proto = PROTO_Z3950;
+    oe.oclass = CLASS_ATTSET;
+    oe.value = set;
+
+    if (oid_ent_to_oid (&oe, oid))
+    {
+	zebraExplain_announceOid (zei, &zei->accessInfo->attributeSetIds, oid);
+	zebraExplain_announceOid (zei, &zei->curDatabaseInfo->
+				  accessInfo->attributeSetIds, oid);
+    }
+}
+
 int zebraExplain_addSU (ZebraExplainInfo zei, int set, int use)
 {
     struct zebSUInfoB *zsui;
 
     assert (zei->curDatabaseInfo);
-    for (zsui = zei->curDatabaseInfo->SUInfo; zsui; zsui=zsui->next)
+    for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
+	 zsui; zsui=zsui->next)
         if (zsui->info.use == use && zsui->info.set == set)
             return -1;
-    zsui = xmalloc (sizeof(*zsui));
-    zsui->next = zei->curDatabaseInfo->SUInfo;
-    zei->curDatabaseInfo->SUInfo = zsui;
-    zei->curDatabaseInfo->dirty = 1;
+    zebraExplain_addAttributeSet (zei, set);
+    zsui = nmem_malloc (zei->nmem, sizeof(*zsui));
+    zsui->next = zei->curDatabaseInfo->attributeDetails->SUInfo;
+    zei->curDatabaseInfo->attributeDetails->SUInfo = zsui;
+    zei->curDatabaseInfo->attributeDetails->dirty = 1;
     zei->dirty = 1;
     zsui->info.set = set;
     zsui->info.use = use;
@@ -661,20 +1233,33 @@ int zebraExplain_addSU (ZebraExplainInfo zei, int set, int use)
     return zsui->info.ordinal;
 }
 
+void zebraExplain_addSchema (ZebraExplainInfo zei, Odr_oid *oid)
+{
+    zebraExplain_announceOid (zei, &zei->accessInfo->schemas, oid);
+    zebraExplain_announceOid (zei, &zei->curDatabaseInfo->
+			      accessInfo->schemas, oid);
+}
+
 void zebraExplain_recordBytesIncrement (ZebraExplainInfo zei, int adjust_num)
 {
     assert (zei->curDatabaseInfo);
 
-    zei->curDatabaseInfo->recordBytes += adjust_num;
-    zei->curDatabaseInfo->dirty = 1;
+    if (adjust_num)
+    {
+	zei->curDatabaseInfo->recordBytes += adjust_num;
+	zei->curDatabaseInfo->dirty = 1;
+    }
 }
 
 void zebraExplain_recordCountIncrement (ZebraExplainInfo zei, int adjust_num)
 {
     assert (zei->curDatabaseInfo);
 
-    zei->curDatabaseInfo->recordCount += adjust_num;
-    zei->curDatabaseInfo->dirty = 1;
+    if (adjust_num)
+    {
+	zei->curDatabaseInfo->recordCount += adjust_num;
+	zei->curDatabaseInfo->dirty = 1;
+    }
 }
 
 int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
@@ -700,3 +1285,23 @@ RecordAttr *rec_init_attr (ZebraExplainInfo zei, Record rec)
     return recordAttr;
 }
 
+static void att_loadset(void *p, const char *n, const char *name)
+{
+    data1_handle dh = p;
+    if (!data1_get_attset (dh, name))
+	logf (LOG_WARN, "Couldn't load attribute set %s", name);
+}
+
+void zebraExplain_loadAttsets (data1_handle dh, Res res)
+{
+    res_trav(res, "attset", dh, att_loadset);
+}
+
+/*
+     zebraExplain_addSU adds to AttributeDetails for a database and
+     adds attributeSet (in AccessInfo area) to DatabaseInfo if it doesn't
+     exist for the database.
+
+     If the database doesn't exist globally (in TargetInfo) an 
+     AttributeSetInfo must be added (globally).
+ */
diff --git a/index/zinfo.h b/index/zinfo.h
index 991488b..f50d7a1 100644
--- a/index/zinfo.h
+++ b/index/zinfo.h
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zinfo.h,v $
- * Revision 1.3  1998-03-05 08:45:13  adam
+ * Revision 1.4  1998-05-20 10:12:21  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.3  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.
  *
@@ -23,16 +27,24 @@
 
 typedef struct zebraExplainInfo *ZebraExplainInfo;
 typedef struct zebDatabaseInfo ZebDatabaseInfo;
-ZebraExplainInfo zebraExplain_open (Records records, data1_handle,
-				    int writeFlag);
-void zebraExplain_close (ZebraExplainInfo zei, int writeFlag);
+ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
+				    Res res,
+				    int writeFlag,
+				    void *updateHandle,
+				    int (*updateFunc)(void *handle,
+						      Record drec,
+						      data1_node *n));
+void zebraExplain_close (ZebraExplainInfo zei, int writeFlag,
+			 int (*updateH)(Record drec, data1_node *n));
 int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database);
 int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database);
 int zebraExplain_lookupSU (ZebraExplainInfo zei, int set, int use);
 int zebraExplain_addSU (ZebraExplainInfo zei, int set, int use);
+void zebraExplain_addSchema (ZebraExplainInfo zei, Odr_oid *oid);
 void zebraExplain_recordCountIncrement (ZebraExplainInfo zei, int adjust_num);
 void zebraExplain_recordBytesIncrement (ZebraExplainInfo zei, int adjust_num);
 int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num);
+void zebraExplain_loadAttsets (data1_handle dh, Res res);
 
 typedef struct {
     int recordSize;
diff --git a/index/zrpn.c b/index/zrpn.c
index d954939..4c6641e 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.76  1998-04-02 14:35:29  adam
+ * Revision 1.77  1998-05-20 10:12:22  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.76  1998/04/02 14:35:29  adam
  * First version of Zebra that works with compiled ASN.1.
  *
  * Revision 1.75  1998/03/05 08:45:13  adam
@@ -1613,9 +1617,9 @@ static int scan_handle (char *name, const char *info, int pos, void *client)
 }
 
 static void scan_term_untrans (ZebraHandle zh, ODR stream, int reg_type,
-			       char **dstp, const char *src)
+			       char **dst, const char *src)
 {
-    char term_dst[1024], **dst;
+    char term_dst[1024];
     
     term_untrans (zh, reg_type, term_dst, src);
     
diff --git a/index/zserver.h b/index/zserver.h
index dd93352..31ef9c7 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.30  1998-03-05 08:45:13  adam
+ * Revision 1.31  1998-05-20 10:12:23  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.30  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.
  *
@@ -139,7 +143,7 @@ typedef struct zebra_rank_class {
     void *class_handle;
     struct zebra_rank_class *next;
 } *ZebraRankClass;
-   
+
 struct zebra_info {
     int registerState; /* 0 (no commit pages), 1 (use commit pages) */
     time_t registerChange;
@@ -154,7 +158,6 @@ struct zebra_info {
     char *errString;
     ZebraExplainInfo zei;
     data1_handle dh;
-    data1_attset *registered_sets;
     BFiles bfs;
     Res res;
 
diff --git a/index/zsets.c b/index/zsets.c
index 974e2de..13fa218 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zsets.c,v $
- * Revision 1.15  1998-03-05 08:45:14  adam
+ * Revision 1.16  1998-05-20 10:12:24  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.15  1998/03/05 08:45:14  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -88,6 +92,7 @@ struct zset_sort_entry {
 struct zset_sort_info {
     int max_entries;
     int num_entries;
+    struct zset_sort_entry *all_entries;
     struct zset_sort_entry **entries;
 };
 
@@ -123,8 +128,10 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov,
     s->sort_info->max_entries = 1000;
     s->sort_info->entries = xmalloc (sizeof(*s->sort_info->entries) *
 				     s->sort_info->max_entries);
+    s->sort_info->all_entries = xmalloc (sizeof(*s->sort_info->all_entries) *
+					 s->sort_info->max_entries);
     for (i = 0; i < s->sort_info->max_entries; i++)
-	s->sort_info->entries[i] = xmalloc (sizeof(**s->sort_info->entries));
+	s->sort_info->entries[i] = s->sort_info->all_entries + i;
     resultSetRank (zh, s->sort_info, rset, hits);
     return s;
 }
@@ -146,11 +153,10 @@ void resultSetDestroy (ZebraHandle zh)
 
     for (s = zh->sets; s; s = s1)
     {
-	int i;
         s1 = s->next;
 
-	for (i = 0; i < s->sort_info->max_entries; i++)
-	    xfree (s->sort_info->entries[i]);
+	xfree (s->sort_info->all_entries);
+	xfree (s->sort_info->entries);
 	xfree (s->sort_info);
 
         rset_delete (s->rset);
diff --git a/isamc/isamc.c b/isamc/isamc.c
index 56739df..10bfc52 100644
--- a/isamc/isamc.c
+++ b/isamc/isamc.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: isamc.c,v $
- * Revision 1.14  1998-03-19 10:04:35  adam
+ * Revision 1.15  1998-05-20 10:12:25  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.14  1998/03/19 10:04:35  adam
  * Minor changes.
  *
  * Revision 1.13  1998/03/18 09:23:55  adam
@@ -248,6 +252,7 @@ int isc_close (ISAMC is)
     }
     xfree (is->files);
     xfree (is->merge_buf);
+    xfree (is->method);
     xfree (is);
     return 0;
 }
diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index b831663..4ebbe6f 100644
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recgrs.c,v $
- * Revision 1.19  1998-03-11 11:19:05  adam
+ * Revision 1.20  1998-05-20 10:12:26  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.19  1998/03/11 11:19:05  adam
  * Changed the way sequence numbers are generated.
  *
  * Revision 1.18  1998/03/05 08:41:31  adam
@@ -294,9 +298,9 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level)
 		    wrd.reg_type = *tlist->structure;
 		    wrd.string = n->u.data.data;
 		    wrd.length = n->u.data.len;
-		    wrd.attrSet = tlist->att->parent->ordinal;
+		    wrd.attrSet = (int) (tlist->att->parent->reference);
 		    wrd.attrUse = tlist->att->locals->local;
-		    (*p->add)(&wrd);
+		    (*p->addWord)(&wrd);
 		}
 	    }
 	}
@@ -308,11 +312,28 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level)
     return 0;
 }
 
+int grs_extract_tree(struct recExtractCtrl *p, data1_node *n)
+{
+    oident oe;
+    int oidtmp[OID_SIZE];
+
+    oe.proto = PROTO_Z3950;
+    oe.oclass = CLASS_SCHEMA;
+    oe.value = n->u.root.absyn->reference;
+
+    if ((oid_ent_to_oid (&oe, oidtmp)))
+	(*p->addSchema)(p, oidtmp);
+
+    return dumpkeys(n, p, 0);
+}
+
 static int grs_extract(struct recExtractCtrl *p)
 {
     data1_node *n;
     NMEM mem;
     struct grs_read_info gri;
+    oident oe;
+    int oidtmp[OID_SIZE];
 
     mem = nmem_create (); 
     gri.readf = p->readf;
@@ -327,6 +348,13 @@ static int grs_extract(struct recExtractCtrl *p)
     n = read_grs_type (&gri, p->subType);
     if (!n)
         return -1;
+
+    oe.proto = PROTO_Z3950;
+    oe.oclass = CLASS_SCHEMA;
+    oe.value = n->u.root.absyn->reference;
+    if ((oid_ent_to_oid (&oe, oidtmp)))
+	(*p->addSchema)(p, oidtmp);
+
     if (dumpkeys(n, p, 0) < 0)
     {
 	data1_free_tree(p->dh, n);
diff --git a/recctrl/rectext.c b/recctrl/rectext.c
index 1b5ab74..cd78a76 100644
--- a/recctrl/rectext.c
+++ b/recctrl/rectext.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rectext.c,v $
- * Revision 1.7  1998-03-11 11:19:05  adam
+ * Revision 1.8  1998-05-20 10:12:27  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.7  1998/03/11 11:19:05  adam
  * Changed the way sequence numbers are generated.
  *
  * Revision 1.6  1998/02/10 12:03:06  adam
@@ -126,7 +130,7 @@ static int text_extract (struct recExtractCtrl *p)
         {
             recWord.string = w;
 	    recWord.length = i;
-            (*p->add)(&recWord);
+            (*p->addWord)(&recWord);
         }
     } while (r > 0);
     buf_close (fi);
diff --git a/test/gils/zebra.cfg b/test/gils/zebra.cfg
index 4d0b0a5..5c6ace5 100644
--- a/test/gils/zebra.cfg
+++ b/test/gils/zebra.cfg
@@ -1,5 +1,5 @@
 # Simple Zebra configuration file
-# $Id: zebra.cfg,v 1.1 1998-01-29 13:32:43 adam Exp $
+# $Id: zebra.cfg,v 1.2 1998-05-20 10:12:28 adam Exp $
 #
 # Where are the YAZ / Zebra tables located?
 profilePath: .:../../tab:../../../yaz/tab
@@ -7,3 +7,4 @@ profilePath: .:../../tab:../../../yaz/tab
 # Files that describe the attribute sets supported.
 attset: bib1.att
 attset: gils.att
+attset: explain.att
diff --git a/test/usmarc/zebra.cfg b/test/usmarc/zebra.cfg
index 7b4e445..897085c 100644
--- a/test/usmarc/zebra.cfg
+++ b/test/usmarc/zebra.cfg
@@ -1,12 +1,13 @@
 # Simple Zebra configuration file that defines
 # a database with USMARC records.
-# $Id: zebra.cfg,v 1.1 1998-01-29 13:32:46 adam Exp $
+# $Id: zebra.cfg,v 1.2 1998-05-20 10:12:30 adam Exp $
 #
 # Where are the YAZ / Zebra tables located?
 profilePath: .:../../tab:../../../yaz/tab
 
 # Files that describe the attribute sets supported.
 attset: bib1.att
+attset: explain.att
 
 # Specify record type
 recordType: grs.marc.usmarc
-- 
1.7.10.4