/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_grs.c,v $
- * Revision 1.5 1996-06-03 09:46:42 quinn
+ * Revision 1.11 1997-11-18 09:51:09 adam
+ * Removed element num_children from data1_node. Minor changes in
+ * data1 to Explain.
+ *
+ * Revision 1.10 1997/09/17 12:10:36 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.9 1997/05/14 06:54:03 adam
+ * C++ support.
+ *
+ * Revision 1.8 1996/12/05 13:17:49 quinn
+ * Fixed GRS-1 null-ref
+ *
+ * Revision 1.7 1996/10/11 11:57:23 quinn
+ * Smallish
+ *
+ * Revision 1.6 1996/07/06 19:58:34 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.5 1996/06/03 09:46:42 quinn
* Added OID data type.
*
* Revision 1.4 1996/05/01 12:45:30 quinn
#define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */
-Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o);
-
static Z_ElementMetaData *get_ElementMetaData(ODR o)
{
Z_ElementMetaData *r = odr_malloc(o, sizeof(*r));
assert(p->which == DATA1N_variant);
t = v->triples[num] = odr_malloc(o, sizeof(*t));
t->variantSetId = 0;
- t->class = odr_malloc(o, sizeof(int));
- *t->class = p->u.variant.type->class->class;
+ t->zclass = odr_malloc(o, sizeof(int));
+ *t->zclass = p->u.variant.type->zclass->zclass;
t->type = odr_malloc(o, sizeof(int));
*t->type = p->u.variant.type->type;
return 0;
}
-static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf,
- ODR o)
+static Z_ElementData *nodetoelementdata(data1_handle dh, data1_node *n,
+ int select, int leaf,
+ ODR o, int *len)
{
Z_ElementData *res = odr_malloc(o, sizeof(*res));
res->which = Z_ElementData_elementNotThere;
res->u.elementNotThere = ODR_NULLVAL;
}
- else if (n->which == DATA1N_data && (leaf || n->parent->num_children == 1))
+ else if (n->which == DATA1N_data && (leaf || n->next == NULL))
{
char str[512];
+ int toget;
+ data1_node *p;
+
+ for (p = n->parent; p && p->which != DATA1N_tag; p = p->parent)
+ ;
switch (n->u.data.what)
{
res->which = Z_ElementData_numeric;
res->u.numeric = odr_malloc(o, sizeof(int));
*res->u.numeric = atoi(n->u.data.data);
+ *len += 4;
break;
case DATA1I_text:
+ toget = n->u.data.len;
+ if (p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget)
+ toget = p->u.tag.get_bytes;
res->which = Z_ElementData_string;
- res->u.string = odr_malloc(o, n->u.data.len+1);
- memcpy(res->u.string, n->u.data.data, n->u.data.len);
- res->u.string[n->u.data.len] = '\0';
+ res->u.string = odr_malloc(o, toget+1);
+ memcpy(res->u.string, n->u.data.data, toget);
+ res->u.string[toget] = '\0';
+ *len += toget;
break;
case DATA1I_oid:
res->which = Z_ElementData_oid;
strncpy(str, n->u.data.data, n->u.data.len);
str[n->u.data.len] = '\0';
res->u.oid = odr_getoidbystr(o, str);
+ *len += n->u.data.len;
break;
default:
logf(LOG_WARN, "Can't handle datatype.");
else
{
res->which = Z_ElementData_subtree;
- if (!(res->u.subtree = data1_nodetogr(n->parent, select, o)))
+ if (!(res->u.subtree = data1_nodetogr (dh, n->parent, select, o, len)))
return 0;
}
return res;
}
-static Z_TaggedElement *nodetotaggedelement(data1_node *n, int select, ODR o)
+static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n,
+ int select, ODR o,
+ int *len)
{
Z_TaggedElement *res = odr_malloc(o, sizeof(*res));
data1_tag *tag = 0;
*/
else if (n->which == DATA1N_data || n->which == DATA1N_variant)
{
- if (!(tag = data1_gettagbyname(n->root->u.root.absyn->tagset,
- "wellKnown")))
+ if (!(tag = data1_gettagbyname (dh, n->root->u.root.absyn->tagset,
+ "wellKnown")))
{
logf(LOG_WARN, "Unable to locate tag for 'wellKnown'");
return 0;
res->appliedVariant = 0;
res->metaData = 0;
if (n->which == DATA1N_variant || (data && data->which ==
- DATA1N_variant && data->parent->num_children == 1))
+ DATA1N_variant && data->next == NULL))
{
int nvars = 0;
res->content->which = Z_ElementData_noDataRequested;
res->content->u.noDataRequested = ODR_NULLVAL;
}
- else if (!(res->content = nodetoelementdata(data, select, leaf, o)))
+ else if (!(res->content = nodetoelementdata (dh, data, select, leaf,
+ o, len)))
return 0;
+ *len += 10;
return res;
}
-Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o)
+Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
+ int select, ODR o, int *len)
{
Z_GenericRecord *res = odr_malloc(o, sizeof(*res));
data1_node *c;
+ int num_children = 0;
+
+ for (c = n->child; c; c = c->next)
+ num_children++;
- res->elements = odr_malloc(o, sizeof(Z_TaggedElement *) * n->num_children);
+ res->elements = odr_malloc(o, sizeof(Z_TaggedElement *) * num_children);
res->num_elements = 0;
for (c = n->child; c; c = c->next)
{
if (c->which == DATA1N_tag && select && !c->u.tag.node_selected)
continue;
if (!(res->elements[res->num_elements++] =
- nodetotaggedelement(c, select, o)))
+ nodetotaggedelement (dh, c, select, o, len)))
return 0;
}
return res;
projects / yaz-moved-to-github.git / blobdiff