- 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, 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.");
- return 0;
+ case DATA1I_num:
+ res->which = Z_ElementData_numeric;
+ res->u.numeric = (int *)odr_malloc(o, sizeof(int));
+ *res->u.numeric = atoi_n (cp, toget);
+ *len += 4;
+ break;
+ case DATA1I_text:
+ res->which = Z_ElementData_string;
+ res->u.string = (char *)odr_malloc(o, toget+1);
+ if (toget)
+ memcpy(res->u.string, cp, toget);
+ res->u.string[toget] = '\0';
+ *len += toget;
+ break;
+ case DATA1I_oid:
+ res->which = Z_ElementData_oid;
+ if (toget > 63)
+ toget = 63;
+ memcpy (str, cp, toget);
+ str[toget] = '\0';
+ res->u.oid = odr_getoidbystr(o, str);
+ *len += oid_oidlen(res->u.oid) * sizeof(int);
+ break;
+ default:
+ yaz_log(LOG_WARN, "Can't handle datatype.");
+ return 0;