From: Adam Dickmeiss Date: Thu, 11 Jul 2002 10:40:34 +0000 (+0000) Subject: GRS-1 producer handles XML better X-Git-Tag: YAZ.1.8.8~20 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=0a39dcf0b6b38833a59e3deae198ef204cfee003 GRS-1 producer handles XML better --- diff --git a/retrieval/d1_grs.c b/retrieval/d1_grs.c index 746413f..cea1dba 100644 --- a/retrieval/d1_grs.c +++ b/retrieval/d1_grs.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: d1_grs.c,v 1.22 2002-07-03 14:09:34 adam Exp $ + * $Id: d1_grs.c,v 1.23 2002-07-11 10:40:34 adam Exp $ * */ @@ -229,7 +229,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n, else if (tag) tagstr = tag->value.string; /* no take from well-known */ else - tagstr = "???"; /* no tag at all! */ + return 0; res->tagValue->which = Z_StringOrNumeric_string; res->tagValue->u.string = odr_strdup(o, tagstr); } @@ -286,9 +286,9 @@ Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n, { if (c->which == DATA1N_tag && select && !c->u.tag.node_selected) continue; - if (!(res->elements[res->num_elements++] = - nodetotaggedelement (dh, c, select, o, len))) - return 0; + if ((res->elements[res->num_elements] = + nodetotaggedelement (dh, c, select, o, len))) + res->num_elements++; } return res; }