int index;
int freq = 100;
int length = strlen(facet_name) + 10;
- char key[length];
+ char *key = odr_malloc(odr, length);
key[0] = '\0';
for (index = 0; index < facet_field->num_terms; index++) {
Z_Term *term;
Z_FacetList *new_list = facet_list_create(odr, facet_list->num);
for (index = 0; index < facet_list->num; index++) {
- struct attrvalues attrvalues;
- facet_struct_init(&attrvalues);
- attrvalues.limit = 10;
- facetattrs(facet_list->elements[index]->attributes, &attrvalues);
+ struct yaz_facet_attr attrvalues;
+ yaz_facet_attr_init(&attrvalues);
+ attrvalues.limit = 0;
+ yaz_facet_attr_get_z_attributes(facet_list->elements[index]->attributes,
+ &attrvalues);
yaz_log(YLOG_LOG, "Attributes: %s %d ", attrvalues.useattr, attrvalues.limit);
if (attrvalues.errstring)
yaz_log(YLOG_LOG, "Error parsing attributes: %s", attrvalues.errstring);
- if (attrvalues.limit > 0) {
+ if (attrvalues.limit > 0 && attrvalues.useattr) {
new_list->elements[new_index] = facet_field_create(odr, facet_list->elements[index]->attributes, attrvalues.limit);
addterms(odr, new_list->elements[new_index], attrvalues.useattr);
new_index++;
oiu->which = Z_OtherInfo_externallyDefinedInfo;
oiu->information.externallyDefinedInfo = odr_malloc(odr, sizeof(*oiu->information.externallyDefinedInfo));
oiu->information.externallyDefinedInfo->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1);
+ oiu->information.externallyDefinedInfo->descriptor = 0;
+ oiu->information.externallyDefinedInfo->indirect_reference = 0;
oiu->information.externallyDefinedInfo->which = Z_External_userFacets;
oiu->information.externallyDefinedInfo->u.facetList = new_list;
oi->list[0] = oiu;
if (1)
{
- /* TODO Not general. Only handles one (Facet) OtherInformation. Overwrite */
- Z_FacetList *facet_list = extract_facet_request(rr->stream, rr->search_input);
-
+ Z_FacetList *facet_list = yaz_oi_get_facetlist(&rr->search_input);
if (facet_list) {
yaz_log(YLOG_LOG, "%d Facets in search request.", facet_list->num);
rr->search_info = build_facet_response(rr->stream, facet_list);