/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
return attributes;
}
+Z_AttributeList *zget_AttributeList_use_string(ODR o, const char *name)
+{
+ Odr_int attr_list[2];
+ char *attr_clist[1];
+ Odr_oid *attr_set[1];
+
+ attr_list[0] = 1;
+ attr_list[1] = 0; /* not used */
+ attr_clist[0] = odr_strdup(o, name);
+ attr_set[0] = 0;
+ return get_attributeList(o, 1, attr_list, attr_clist, attr_set);
+}
+
Z_Term *z_Term_create(ODR o, int term_type, const char *buf, size_t len)
{
Z_Term *term = (Z_Term *)odr_malloc(o, sizeof(*term));
- Odr_oct *term_octet = (Odr_oct *)odr_malloc(o, sizeof(*term_octet));
- term_octet->buf = (unsigned char *)odr_malloc(o, 1 + len);
- memcpy(term_octet->buf, buf, len);
- term_octet->len = len;
-#if OCT_SIZE
- term_octet->size = len;
-#endif
- term_octet->buf[term_octet->len] = 0; /* null terminate */
-
switch (term_type)
{
case Z_Term_general:
term->which = Z_Term_general;
- term->u.general = term_octet;
+ term->u.general = odr_create_Odr_oct(o, buf, len);
break;
case Z_Term_characterString:
term->which = Z_Term_characterString;
- term->u.characterString = (char*) term_octet->buf;
- /* null terminated above */
+ term->u.characterString = odr_strdupn(o, buf, len);
break;
case Z_Term_numeric:
term->which = Z_Term_numeric;
- term->u.numeric = odr_intdup(o, odr_atoi((const char*) term_octet->buf));
+ term->u.numeric = odr_intdup(o, odr_atoi(odr_strdupn(o, buf, len)));
break;
case Z_Term_null:
term->which = Z_Term_null;
return 0;
}
zo->which = Z_Operand_resultSetId;
- zo->u.resultSetId = (char *)odr_malloc(o, li->lex_len+1);
- memcpy(zo->u.resultSetId, li->lex_buf, li->lex_len);
- zo->u.resultSetId[li->lex_len] = '\0';
+ zo->u.resultSetId = odr_strdupn(o, li->lex_buf, li->lex_len);
lex(li);
break;
default:
{
YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
struct yaz_pqf_parser *li = pqf_parser;
- Odr_oid *attributeSetId;
+ Odr_oid *attributeSetId = 0;
Z_FacetField *facet_field = 0;
Z_AttributeList *attribute_list;