X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_grs.c;h=1a9d3133be776a7641913b24c72053a6923f010a;hb=14136ccc562d5d894fb2ba59304ae64d3516f518;hp=1077c521c810f268d93ed3f1b9bf7ca4d5e30f1c;hpb=e42d9ee8961aed7ac5750a4eccbbe681da92df0c;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_grs.c b/retrieval/d1_grs.c
index 1077c52..1a9d313 100644
--- a/retrieval/d1_grs.c
+++ b/retrieval/d1_grs.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_grs.c,v $
- * Revision 1.4  1996-05-01 12:45:30  quinn
+ * 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
  * Support use of local tag names in abs file.
  *
  * Revision 1.3  1995/11/13  09:27:35  quinn
@@ -29,7 +44,7 @@
 
 #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)
 {
@@ -77,8 +92,8 @@ static Z_Variant *make_variant(data1_node *n, int num, ODR o)
 	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;
 
@@ -131,7 +146,7 @@ static int traverse_triples(data1_node *n, int level, Z_ElementMetaData *m,
 }
 
 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));
 
@@ -142,18 +157,37 @@ static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf,
     }
     else if (n->which == DATA1N_data && (leaf || n->parent->num_children == 1))
     {
+	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)
 	{
 	    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.");
@@ -163,13 +197,14 @@ static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf,
     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;
@@ -252,12 +287,13 @@ static Z_TaggedElement *nodetotaggedelement(data1_node *n, int select, ODR o)
 	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(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;
@@ -269,7 +305,7 @@ Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o)
 	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;