* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_grs.c,v $
- * Revision 1.2 1995-11-01 13:54:46 quinn
+ * 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
+ * Support use of local tag names in abs file.
+ *
+ * Revision 1.3 1995/11/13 09:27:35 quinn
+ * Fiddling with the variant stuff.
+ *
+ * Revision 1.2 1995/11/01 13:54:46 quinn
* Minor adjustments
*
* Revision 1.1 1995/11/01 11:56:07 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);
+Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o, int *len);
static Z_ElementMetaData *get_ElementMetaData(ODR o)
{
}
static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf,
- ODR o)
+ ODR o, int *len)
{
Z_ElementData *res = odr_malloc(o, sizeof(*res));
+ data1_node *p;
+
+ for (p = n->parent; p && p->which != DATA1N_tag; p = p->parent)
+ ;
if (!n)
{
}
else if (n->which == DATA1N_data && (leaf || n->parent->num_children == 1))
{
+ char str[512];
+ int toget;
+
switch (n->u.data.what)
{
case DATA1I_num:
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(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_node *n, int select, ODR o,
+ int *len)
{
Z_TaggedElement *res = odr_malloc(o, sizeof(*res));
data1_tag *tag = 0;
data = n->child;
leaf = 0;
}
+ /*
+ * If we're a data element at this point, we need to insert a
+ * wellKnown tag to wrap us up.
+ */
else if (n->which == DATA1N_data || n->which == DATA1N_variant)
{
if (!(tag = data1_gettagbyname(n->root->u.root.absyn->tagset,
}
res->tagType = odr_malloc(o, sizeof(int));
- *res->tagType = tag ? tag->tagset->type : 3;
+ *res->tagType = (tag && tag->tagset) ? tag->tagset->type : 3;
res->tagValue = odr_malloc(o, sizeof(Z_StringOrNumeric));
if (tag && tag->which == DATA1T_numeric)
{
int nvars = 0;
res->metaData = get_ElementMetaData(o);
- if (traverse_triples(data, 0, res->metaData, o) < 0)
- return 0;
+ if (n->which == DATA1N_tag && n->u.tag.make_variantlist)
+ if (traverse_triples(data, 0, res->metaData, o) < 0)
+ return 0;
while (data && data->which == DATA1N_variant)
{
nvars++;
data = data->child;
}
- res->appliedVariant = make_variant(data->parent, nvars-1, o);
+ if (n->which != DATA1N_tag || !n->u.tag.no_data_requested)
+ res->appliedVariant = make_variant(data->parent, nvars-1, o);
+ }
+ if (n->which == DATA1N_tag && n->u.tag.no_data_requested)
+ {
+ res->content = odr_malloc(o, sizeof(*res->content));
+ res->content->which = Z_ElementData_noDataRequested;
+ res->content->u.noDataRequested = ODR_NULLVAL;
}
- if (!(res->content = nodetoelementdata(data, select, leaf, o)))
+ else if (!(res->content = nodetoelementdata(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_node *n, int select, ODR o, int *len)
{
Z_GenericRecord *res = odr_malloc(o, sizeof(*res));
data1_node *c;
if (c->which == DATA1N_tag && select && !c->u.tag.node_selected)
continue;
if (!(res->elements[res->num_elements++] =
- nodetotaggedelement(c, select, o)))
+ nodetotaggedelement(c, select, o, len)))
return 0;
}
return res;