X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_grs.c;h=9033c4d3bb92b30166bf96b9980079757569cf60;hb=52463063061a631f9cb086e938bc4494efec0bb5;hp=7c863b07680793c90b6375fd52c9816c3264c777;hpb=a309d6ece06c0ab732d98c59f2718efaebd01ec6;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_grs.c b/retrieval/d1_grs.c
index 7c863b0..9033c4d 100644
--- a/retrieval/d1_grs.c
+++ b/retrieval/d1_grs.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_grs.c,v $
- * Revision 1.3  1995-11-13 09:27:35  quinn
+ * 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
@@ -131,6 +140,10 @@ static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf,
     ODR o)
 {
     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)
     {
@@ -139,6 +152,9 @@ 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;
+
 	switch (n->u.data.what)
 	{
 	    case DATA1I_num:
@@ -147,10 +163,19 @@ static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf,
 		*res->u.numeric = atoi(n->u.data.data);
 		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';
+		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);
 		break;
 	    default:
 	    	logf(LOG_WARN, "Can't handle datatype.");
@@ -202,7 +227,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_node *n, int select, ODR o)
     }
 
     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)
     {