X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_expout.c;h=1e6d587b8517bc4652f100643bc4ac4d7d884bb0;hb=237dda955eb78cb6339c5dc3fc7be1246dafa4fb;hp=1b1bfdc34a4b672ffeab8da24ce19994d51cb25a;hpb=dd307c65deac044b20c13e99aad2de0d8608a8b7;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_expout.c b/retrieval/d1_expout.c
index 1b1bfdc..1e6d587 100644
--- a/retrieval/d1_expout.c
+++ b/retrieval/d1_expout.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_expout.c,v $
- * Revision 1.4  1997-11-18 09:51:08  adam
+ * Revision 1.6  1997-11-24 11:33:56  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.5  1997/11/19 10:30:06  adam
+ * More explain work.
+ *
+ * Revision 1.4  1997/11/18 09:51:08  adam
  * Removed element num_children from data1_node. Minor changes in
  * data1 to Explain.
  *
@@ -28,92 +35,109 @@
 #include <proto.h>
 #include <data1.h>
 
-static int *f_integer(data1_handle dh, data1_node *c, ODR o)
+typedef struct {
+    data1_handle dh;
+    ODR o;
+    int select;
+} ExpHandle;
+
+static int is_numeric_tag (ExpHandle *eh, data1_node *c)
+{
+    if (!c || c->which != DATA1N_tag)
+	return 0;
+    if (!c->u.tag.element)
+    {
+	logf(LOG_WARN, "Tag %s is local", c->u.tag.tag);
+	return 0;
+    }
+    if (c->u.tag.element->tag->which != DATA1T_numeric)
+    {
+	logf(LOG_WARN, "Tag %s is not numeric", c->u.tag.tag);
+	return 0;
+    }
+    if (eh->select && !c->u.tag.node_selected)
+	return 0;
+    return 1;
+}
+
+static int is_data_tag (ExpHandle *eh, data1_node *c)
+{
+    if (!c || c->which != DATA1N_data)
+	return 0;
+    if (select && !c->u.tag.node_selected)
+	return 0;
+    return 1;
+}
+
+static int *f_integer(ExpHandle *eh, data1_node *c)
 {
     int *r;
     char intbuf[64];
 
-    if (!c->child || c->child->which != DATA1N_data ||
-	c->child->u.data.len > 63)
+    c = c->child;
+    if (!is_data_tag (eh, c) || c->u.data.len > 63)
 	return 0;
-    r = odr_malloc(o, sizeof(*r));
-    sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
+    r = odr_malloc(eh->o, sizeof(*r));
+    sprintf(intbuf, "%.*s", 63, c->u.data.data);
     *r = atoi(intbuf);
     return r;
 }
 
-static char *f_string(data1_handle dh, data1_node *c, ODR o)
+static char *f_string(ExpHandle *eh, data1_node *c)
 {
     char *r;
 
-    if (!c->child || c->child->which != DATA1N_data)
+    c = c->child;
+    if (!is_data_tag (eh, c))
 	return 0;
-    r = odr_malloc(o, c->child->u.data.len+1);
-    memcpy(r, c->child->u.data.data, c->child->u.data.len);
-    r[c->child->u.data.len] = '\0';
+    r = odr_malloc(eh->o, c->u.data.len+1);
+    memcpy(r, c->u.data.data, c->u.data.len);
+    r[c->u.data.len] = '\0';
     return r;
 }
 
-static bool_t *f_bool(data1_handle dh, data1_node *c, ODR o)
+static bool_t *f_bool(ExpHandle *eh, data1_node *c)
 {
     bool_t *tf;
     char intbuf[64];
 
-    if (!c->child || c->child->which != DATA1N_data ||
-	c->child->u.data.len > 63)
+    c = c->child;
+    if (!is_data_tag (eh, c) || c->u.data.len > 63)
 	return 0;
-    tf = odr_malloc (o, sizeof(*tf));
-    sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
+    tf = odr_malloc (eh->o, sizeof(*tf));
+    sprintf(intbuf, "%.*s", 63, c->u.data.data);
     *tf = atoi(intbuf);
-    return 0;
+    return tf;
 }
 
-static Z_IntUnit *f_intunit(data1_handle dh, data1_node *c, ODR o)
+static Z_IntUnit *f_intunit(ExpHandle *eh, data1_node *c)
 {
+    /* fix */
     return 0;
 }
 
-static int numeric_tag (data1_handle dh, data1_node *c, ODR o, int select)
-{
-    if (c->which != DATA1N_tag)
-	return 0;
-    if (!c->u.tag.element)
-    {
-	logf(LOG_WARN, "Malformed tag (no element)");
-	return 0;
-    }
-    if (c->u.tag.element->tag->which != DATA1T_numeric)
-    {
-	logf(LOG_WARN, "Malformed tag (must be numeric)");
-	return 0;
-    }
-    if (select && !c->u.tag.node_selected)
-	return 0;
-    return 1;
-}
-
-static Z_HumanString *f_humstring(data1_handle dh, data1_node *c, ODR o)
+static Z_HumanString *f_humstring(ExpHandle *eh, data1_node *c)
 {
     Z_HumanString *r;
     Z_HumanStringUnit *u;
 
-    if (!c->child || c->child->which != DATA1N_data)
+    c = c->child;
+    if (!is_data_tag (eh, c))
 	return 0;
-    r = odr_malloc(o, sizeof(*r));
+    r = odr_malloc(eh->o, sizeof(*r));
     r->num_strings = 1;
-    r->strings = odr_malloc(o, sizeof(Z_HumanStringUnit*));
-    r->strings[0] = u = odr_malloc(o, sizeof(*u));
+    r->strings = odr_malloc(eh->o, sizeof(Z_HumanStringUnit*));
+    r->strings[0] = u = odr_malloc(eh->o, sizeof(*u));
     u->language = 0;
-    u->text = odr_malloc(o, c->child->u.data.len+1);
-    memcpy(u->text, c->child->u.data.data, c->child->u.data.len);
-    u->text[c->child->u.data.len] = '\0';
+    u->text = odr_malloc(eh->o, c->u.data.len+1);
+    memcpy(u->text, c->u.data.data, c->u.data.len);
+    u->text[c->u.data.len] = '\0';
     return r;
 }
 
-static Z_CommonInfo *f_commonInfo(data1_handle dh, data1_node *n,
-				  int select, ODR o)
+static Z_CommonInfo *f_commonInfo(ExpHandle *eh, data1_node *n)
 {
-    Z_CommonInfo *res = odr_malloc(o, sizeof(*res));
+    Z_CommonInfo *res = odr_malloc(eh->o, sizeof(*res));
     data1_node *c;
 
     res->dateAdded = 0;
@@ -124,19 +148,14 @@ static Z_CommonInfo *f_commonInfo(data1_handle dh, data1_node *n,
 
     for (c = n->child; c; c = c->next)
     {
-	if (c->which != DATA1N_tag || !c->u.tag.element)
-	{
-	    logf(LOG_WARN, "Malformed explain record");
-	    return 0;
-	}
-	if (select && !c->u.tag.node_selected)
+	if (!is_numeric_tag (eh, c))
 	    continue;
 	switch (c->u.tag.element->tag->value.numeric)
 	{
-	    case 601: res->dateAdded = f_string(dh, c, o); break;
-	    case 602: res->dateChanged = f_string(dh, c, o); break;
-	    case 603: res->expiry = f_string(dh, c, o); break;
-	    case 604: res->humanStringLanguage = f_string(dh, c, o); break;
+	    case 601: res->dateAdded = f_string(eh, c); break;
+	    case 602: res->dateChanged = f_string(eh, c); break;
+	    case 603: res->expiry = f_string(eh, c); break;
+	    case 604: res->humanStringLanguage = f_string(eh, c); break;
 	    /* otherInfo? */
 	    default:
 	        logf(LOG_WARN, "Bad child in commonInfo");
@@ -146,10 +165,49 @@ static Z_CommonInfo *f_commonInfo(data1_handle dh, data1_node *n,
     return res;
 }
 
-static Z_AccessInfo *f_accessInfo(data1_handle dh, data1_node *n,
-				  int select, ODR o)
+Z_QueryTypeDetails *f_queryTypeDetails (ExpHandle *eh, data1_node *n)
 {
-    Z_AccessInfo *res = odr_malloc(o, sizeof(*res));
+    /* fix */
+    return NULL;
+}
+
+Odr_oid **f_oid_seq (ExpHandle *eh, data1_node *n, int *num)
+{
+    /* fix */
+    return NULL;
+}
+
+char **f_string_seq (ExpHandle *eh, data1_node *n, int *num)
+{
+    char **res;
+    data1_node *c;
+    int i;
+
+    *num = 0;
+    for (c = n->child ; c; c = c->next)
+    {
+	if (!is_numeric_tag (eh, c))
+	    break;
+	if (n->u.tag.element->tag->value.numeric != 1001)
+	    break;
+	++(*num);
+    }
+    if (*num)
+	res = odr_malloc (eh->o, sizeof(*res) * (*num));
+    for (c = n->child, i = 0 ; i < *num; c = c->next, i++)
+	res[i] = f_string (eh, c);
+    return res;
+}
+
+char **f_humstring_seq (ExpHandle *eh, data1_node *n, int *num)
+{
+    /* fix */
+    return NULL;
+}
+
+static Z_AccessInfo *f_accessInfo(ExpHandle *eh, data1_node *n)
+{
+    Z_AccessInfo *res = odr_malloc(eh->o, sizeof(*res));
     data1_node *c;
 
     res->num_queryTypesSupported = 0;
@@ -175,25 +233,72 @@ static Z_AccessInfo *f_accessInfo(data1_handle dh, data1_node *n,
 
     for (c = n->child; c; c = c->next)
     {
-	if (c->which != DATA1N_tag || !c->u.tag.element)
+	int i;
+	if (!is_numeric_tag (eh, c))
+	    continue;
+	switch (c->u.tag.element->tag->value.numeric)
 	{
-	    logf(LOG_WARN, "Malformed explain record");
+	case 501:
+	    res->num_queryTypesSupported = 0;
+	    for (n = c->child; n; n = n->next)
+	    {
+		if (!is_numeric_tag(eh, n))
+		    break;
+		(res->num_queryTypesSupported)++;
+	    }
+	    if (res->num_queryTypesSupported)
+		res->queryTypesSupported =
+		    odr_malloc (eh->o, res->num_queryTypesSupported
+				* sizeof(*res->queryTypesSupported));
+	    i = 0;
+	    for (n = c->child; i < res->num_queryTypesSupported; n = n->next)
+		res->queryTypesSupported[i++] = f_queryTypeDetails (eh, n);
+	    break;
+	case 503:
+	    res->diagnosticsSets = f_oid_seq(eh, c, &res->num_diagnosticsSets);
+	    break;
+	case 505:
+	    res->attributeSetIds = f_oid_seq(eh, c, &res->num_attributeSetIds);
+	    break;
+	case 507:
+	    res->schemas = f_oid_seq(eh, c, &res->num_schemas);
+	    break;
+	case 509:
+	    res->recordSyntaxes = f_oid_seq (eh, c, &res->num_recordSyntaxes);
+	    break;
+	case 511:
+	    res->resourceChallenges = f_oid_seq (eh, c,
+						 &res->num_resourceChallenges);
+	    break;
+	case 513: res->restrictedAccess = NULL; break; /* fix */
+	case 514: res->costInfo = NULL; break; /* fix */
+	case 515:
+	    res->variantSets = f_oid_seq (eh, c, 
+					  &res->num_variantSets);
+	    break;
+	case 516:
+	    res->elementSetNames =
+		f_string_seq (eh, c, &res->num_elementSetNames);
+	    break;
+	case 517:
+	    res->unitSystems = f_string_seq (eh, c, &res->num_unitSystems);
+	    break;
+	default:
+	    logf(LOG_WARN, "Bad child in accessInfo");
 	    return 0;
 	}
-	if (select && !c->u.tag.node_selected)
-	    continue;
-	/* switch-statement here */
     }
     return res;
 }
 
-static int *f_recordCount(data1_handle dh, data1_node *c, ODR o, void *which)
+static int *f_recordCount(ExpHandle *eh, data1_node *c, int *which)
 {
-    int *r= odr_malloc(o, sizeof(*r));
+    int *r= odr_malloc(eh->o, sizeof(*r));
     int *wp = which;
     char intbuf[64];
 
-    if (!c->child || c->child->which != DATA1N_tag || !c->child->u.tag.element)
+    c = c->child;
+    if (!is_numeric_tag (eh, c))
 	return 0;
     if (c->u.tag.element->tag->value.numeric == 210)
 	*wp = Z_Exp_RecordCount_actualNumber;
@@ -201,7 +306,6 @@ static int *f_recordCount(data1_handle dh, data1_node *c, ODR o, void *which)
 	*wp = Z_Exp_RecordCount_approxNumber;
     else
 	return 0;
-    c = c->child;
     if (!c->child || c->child->which != DATA1N_data)
 	return 0;
     sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
@@ -209,17 +313,42 @@ static int *f_recordCount(data1_handle dh, data1_node *c, ODR o, void *which)
     return r;
 }
 
-static Z_ContactInfo *f_contactInfo(data1_handle dh, data1_node *n, ODR o)
+static Z_ContactInfo *f_contactInfo(ExpHandle *eh, data1_node *n)
 {
+    /* fix */
     return 0;
 }
 
-static Z_TargetInfo *f_targetInfo(data1_handle dh, data1_node *n,
-				  int select, ODR o)
+static Z_DatabaseList *f_databaseList(ExpHandle *eh, data1_node *n)
 {
-    Z_TargetInfo *res = odr_malloc(o, sizeof(*res));
     data1_node *c;
-    bool_t *fl = odr_malloc(o,sizeof(*fl));
+    Z_DatabaseList *res = odr_malloc (eh->o, sizeof(*res));
+    int i;
+
+    res->num_databases = 0;
+    res->databases = NULL;
+    for (c = n->child ; c; c = c->next)
+    {
+	if (!is_numeric_tag (eh, c))
+	    break;
+	if (n->u.tag.element->tag->value.numeric != 102)
+	    break;
+	++(res->num_databases);
+    }
+    if (res->num_databases)
+	res->databases =
+	    odr_malloc (eh->o, sizeof(*res->databases)*res->num_databases);
+    for (c = n->child, i = 0 ; i < res->num_databases; c = c->next, i++)
+	res->databases[i] = f_string (eh, c);
+    return res;
+}
+
+static Z_TargetInfo *f_targetInfo(ExpHandle *eh, data1_node *n)
+{
+    Z_TargetInfo *res = odr_malloc(eh->o, sizeof(*res));
+    data1_node *c;
+    bool_t *fl = odr_malloc(eh->o,sizeof(*fl));
+    int i;
 
     *fl = 0;
     res->commonInfo = 0;
@@ -245,36 +374,69 @@ static Z_TargetInfo *f_targetInfo(data1_handle dh, data1_node *n,
     res->num_addresses = 0;
     res->addresses = 0;
     res->commonAccessInfo = 0;
-
+    
     for (c = n->child; c; c = c->next)
     {
-	if (!numeric_tag (dh, c, o, select))
+	if (!is_numeric_tag (eh, c))
 	    continue;
 	switch (c->u.tag.element->tag->value.numeric)
 	{
-	    case 600: res->commonInfo = f_commonInfo(dh, c, select, o);break;
-	    case 102: res->name = f_string(dh, c, o); break;
-	    case 103: res->recentNews = f_humstring(dh, c, o); break;
-	    case 104: break; /* icon */
-	    case 105: res->namedResultSets = f_bool(dh, c, o); break;
-	    case 106: res->multipleDbSearch = f_bool(dh, c, o); break;
-	    case 107: res->maxResultSets = f_integer(dh, c, o); break;
-	    case 108: res->maxResultSize = f_integer(dh, c, o); break;
-	    case 109: res->maxTerms = f_integer(dh, c, o); break;
-	    case 110: res->timeoutInterval = f_intunit(dh, c, o); break;
-	    case 111: res->welcomeMessage = f_humstring(dh, c, o); break;
-	    case 112: res->contactInfo = f_contactInfo(dh, c, o); break;
-	    case 113: res->description = f_humstring(dh, c, o); break;
-	    case 114: break; /* nicknames */
-	    case 115: res->usageRest = f_humstring(dh, c, o); break;
-	    case 116: res->paymentAddr = f_humstring(dh, c, o); break;
-	    case 117: res->hours = f_humstring(dh, c, o); break;
-	    case 118: break; /* dbcombinations */
-	    case 119: break; /* addresses */
-	    case 500: res->commonAccessInfo = f_accessInfo(dh, c,
-							   select, o); break;
-	    default:
-	        logf(LOG_WARN, "Unknown target-info element");
+	case 600: res->commonInfo = f_commonInfo(eh, c); break;
+	case 102: res->name = f_string(eh, c); break;
+	case 103: res->recentNews = f_humstring(eh, c); break;
+	case 104: res->icon = NULL; break; /* fix */
+	case 105: res->namedResultSets = f_bool(eh, c); break;
+	case 106: res->multipleDbSearch = f_bool(eh, c); break;
+	case 107: res->maxResultSets = f_integer(eh, c); break;
+	case 108: res->maxResultSize = f_integer(eh, c); break;
+	case 109: res->maxTerms = f_integer(eh, c); break;
+	case 110: res->timeoutInterval = f_intunit(eh, c); break;
+	case 111: res->welcomeMessage = f_humstring(eh, c); break;
+	case 112: res->contactInfo = f_contactInfo(eh, c); break;
+	case 113: res->description = f_humstring(eh, c); break;
+	case 114: 
+	    res->num_nicknames = 0;
+	    for (n = c->child; n; n = n->next)
+	    {
+		if (!is_numeric_tag(eh, n))
+		    break;
+		if (n->u.tag.element->tag->value.numeric != 102)
+		    break;
+		(res->num_nicknames)++;
+	    }
+	    if (res->num_nicknames)
+		res->nicknames =
+		    odr_malloc (eh->o, res->num_nicknames 
+				* sizeof(*res->nicknames));
+	    i = 0;
+	    for (n = c->child; i < res->num_nicknames; n = n->next)
+		res->nicknames[i++] = f_string (eh, n);
+	    break;
+	case 115: res->usageRest = f_humstring(eh, c); break;
+	case 116: res->paymentAddr = f_humstring(eh, c); break;
+	case 117: res->hours = f_humstring(eh, c); break;
+	case 118:
+	    res->num_dbCombinations = 0;
+	    for (n = c->child; n; n = n->next)
+	    {
+		if (!is_numeric_tag(eh, n))
+		    break;
+		if (n->u.tag.element->tag->value.numeric != 605)
+		    break;
+		(res->num_dbCombinations)++;
+	    }
+	    if (res->num_dbCombinations)
+		res->dbCombinations =
+		    odr_malloc (eh->o, res->num_dbCombinations
+				* sizeof(*res->dbCombinations));
+	    i = 0;
+	    for (n = c->child; i < res->num_dbCombinations; n = n->next)
+		res->dbCombinations[i++] = f_databaseList (eh, n);
+	    break;
+	case 119: break; /* addresses */
+	case 500: res->commonAccessInfo = f_accessInfo(eh, c); break;
+	default:
+	    logf(LOG_WARN, "Unknown target-info element");
 	}
     }
     if (!res->namedResultSets)
@@ -284,13 +446,13 @@ static Z_TargetInfo *f_targetInfo(data1_handle dh, data1_node *n,
     return res;
 }
 
-static Z_DatabaseInfo *f_databaseInfo(data1_handle dh, data1_node *n,
-				      int select, ODR o)
+static Z_DatabaseInfo *f_databaseInfo(ExpHandle *eh, data1_node *n)
 {
-    Z_DatabaseInfo *res = odr_malloc(o, sizeof(*res));
+    Z_DatabaseInfo *res = odr_malloc(eh->o, sizeof(*res));
     data1_node *c;
-    bool_t *fl = odr_malloc(o,sizeof(*fl));
-    bool_t *tr = odr_malloc(o,sizeof(*tr));
+    bool_t *fl = odr_malloc(eh->o,sizeof(*fl));
+    bool_t *tr = odr_malloc(eh->o,sizeof(*tr));
+    int i;
 
     *fl = 0;
     *tr = 1;
@@ -329,41 +491,81 @@ static Z_DatabaseInfo *f_databaseInfo(data1_handle dh, data1_node *n,
     
     for (c = n->child; c; c = c->next)
     {
-	if (!numeric_tag (dh, c, o, select))
+	Z_DatabaseList *zdb;
+
+	if (!is_numeric_tag (eh, c))
 	    continue;
 	switch (c->u.tag.element->tag->value.numeric)
 	{
-	case 600: res->commonInfo = f_commonInfo(dh, c, select, o); break;
-	case 102: res->name = f_string(dh, c, o); break;
-	case 226: res->explainDatabase = ODR_NULLVAL; break;
-	case 114: res->num_nicknames = 0; res->nicknames = 0; break; /* fix */
+	case 600: res->commonInfo = f_commonInfo(eh, c); break;
+	case 102: res->name = f_string(eh, c); break;
+	case 226: res->explainDatabase = odr_nullval(); break;
+	case 114:
+	    res->num_nicknames = 0;
+	    for (n = c->child; n; n = n->next)
+	    {
+		if (!is_numeric_tag(eh, n))
+		    break;
+		if (n->u.tag.element->tag->value.numeric != 102)
+		    break;
+		(res->num_nicknames)++;
+	    }
+	    if (res->num_nicknames)
+		res->nicknames =
+		    odr_malloc (eh->o, res->num_nicknames 
+				* sizeof(*res->nicknames));
+	    i = 0;
+	    for (n = c->child; i < res->num_nicknames; n = n->next)
+		res->nicknames[i++] = f_string (eh, n);
+	    break;
 	case 104: res->icon = 0; break;      /* fix */
-	case 201: res->userFee = f_bool(dh, c, o); break;
-	case 202: res->available = f_bool(dh, c, o); break;
-	case 203: res->titleString = f_humstring(dh, c, o); break;
-	case 227: res->num_keywords = 0; res->keywords = 0; break; /* fix */
-	case 113: res->description = f_humstring(dh, c, o); break;
-	case 205: res->associatedDbs = 0; break; /* fix */
-	case 206: res->subDbs = 0; break; /* fix */
-	case 207: res->disclaimers = f_humstring(dh, c, o); break;
-	case 103: res->news = f_humstring(dh, c, o); break;
+	case 201: res->userFee = f_bool(eh, c); break;
+	case 202: res->available = f_bool(eh, c); break;
+	case 203: res->titleString = f_humstring(eh, c); break;
+	case 227:
+	    res->num_keywords = 0;
+	    for (n = c->child; n; n = n->next)
+	    {
+		if (!is_numeric_tag(eh, n))
+		    break;
+		if (n->u.tag.element->tag->value.numeric != 1000)
+		    break;
+		(res->num_keywords)++;
+	    }
+	    if (res->num_keywords)
+		res->keywords =
+		    odr_malloc (eh->o, res->num_keywords 
+				* sizeof(*res->keywords));
+	    i = 0;
+	    for (n = c->child; i < res->num_keywords; n = n->next)
+		res->keywords[i++] = f_humstring (eh, n);
+	    break;
+	case 113: res->description = f_humstring(eh, c); break;
+	case 205:
+	    res->associatedDbs = f_databaseList (eh, c);
+	    break;
+	case 206:
+	    res->subDbs = f_databaseList (eh, c);
+	    break;
+	case 207: res->disclaimers = f_humstring(eh, c); break;
+	case 103: res->news = f_humstring(eh, c); break;
 	case 209: res->recordCount =
-		      f_recordCount(dh, c, o, &res->recordCount_which); break;
-	case 212: res->defaultOrder = f_humstring(dh, c, o); break;
-	case 213: res->avRecordSize = f_integer(dh, c, o); break;
-	case 214: res->maxRecordSize = f_integer(dh, c, o); break;
-	case 215: res->hours = f_humstring(dh, c, o); break;
-	case 216: res->bestTime = f_humstring(dh, c, o); break;
-	case 217: res->lastUpdate = f_string(dh, c, o); break;
-	case 218: res->updateInterval = f_intunit(dh, c, o); break;
-	case 219: res->coverage = f_humstring(dh, c, o); break;
-	case 220: res->proprietary = f_bool(dh, c, o); break;
-	case 221: res->copyrightText = f_humstring(dh, c, o); break;
-	case 222: res->copyrightNotice = f_humstring(dh, c, o); break;
-	case 223: res->producerContactInfo = f_contactInfo(dh, c, o); break;
-	case 224: res->supplierContactInfo = f_contactInfo(dh, c, o); break;
-	case 225: res->submissionContactInfo = f_contactInfo(dh, c, o); break;
-	case 500: res->accessInfo = f_accessInfo(dh, c, select, o); break;
+		      f_recordCount(eh, c, &res->recordCount_which); break;
+	case 212: res->defaultOrder = f_humstring(eh, c); break;
+	case 213: res->avRecordSize = f_integer(eh, c); break;
+	case 214: res->maxRecordSize = f_integer(eh, c); break;
+	case 215: res->hours = f_humstring(eh, c); break;
+	case 216: res->bestTime = f_humstring(eh, c); break;
+	case 217: res->lastUpdate = f_string(eh, c); break;
+	case 218: res->updateInterval = f_intunit(eh, c); break;
+	case 219: res->coverage = f_humstring(eh, c); break;
+	case 220: res->proprietary = f_bool(eh, c); break;
+	case 221: res->copyrightText = f_humstring(eh, c); break;
+	case 222: res->copyrightNotice = f_humstring(eh, c); break;
+	case 223: res->producerContactInfo = f_contactInfo(eh, c); break;
+	case 224: res->supplierContactInfo = f_contactInfo(eh, c); break;
+	case 225: res->submissionContactInfo = f_contactInfo(eh, c); break;
+	case 500: res->accessInfo = f_accessInfo(eh, c); break;
 	default:
 	    logf(LOG_WARN, "Unknown element in databaseInfo");
 	}
@@ -378,8 +580,13 @@ static Z_DatabaseInfo *f_databaseInfo(data1_handle dh, data1_node *n,
 Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
 				      int select, ODR o)
 {
+    ExpHandle eh;
     Z_ExplainRecord *res = odr_malloc(o, sizeof(*res));
 
+    eh.dh = dh;
+    eh.select = select;
+    eh.o = o;
+
     assert(n->which == DATA1N_root);
     if (strcmp(n->u.root.type, "explain"))
     {
@@ -392,23 +599,23 @@ Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
 	logf(LOG_WARN, "Explain record should have one exactly one child");
 	return 0;
     }
-    if (!numeric_tag (dh, n, o, select))
+    if (!is_numeric_tag (&eh, n))
 	return 0;
     switch (n->u.tag.element->tag->value.numeric)
     {
-	case 0:
-	    res->which = Z_Explain_targetInfo;
-	    if (!(res->u.targetInfo = f_targetInfo(dh, n, select, o)))
-		return 0;
-	    break;
-	case 1:
-	    res->which = Z_Explain_databaseInfo;
-	    if (!(res->u.databaseInfo = f_databaseInfo(dh, n, select, o)))
-		return 0;
-	    break;
-	default:
-	    logf(LOG_WARN, "Unknown explain category");
+    case 0:
+	res->which = Z_Explain_targetInfo;
+	if (!(res->u.targetInfo = f_targetInfo(&eh, n)))
+	    return 0;
+	break;
+    case 1:
+	res->which = Z_Explain_databaseInfo;
+	if (!(res->u.databaseInfo = f_databaseInfo(&eh, n)))
 	    return 0;
+	break;
+    default:
+	logf(LOG_WARN, "Unknown explain category");
+	return 0;
     }
     return res;
 }