From e4c68bbbfdfbfb44c4dbb62c3f528106ab65ffcf Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Mon, 19 Jul 2010 17:20:57 +0200 Subject: [PATCH] Add yaz_parse_facet_list with helper functions --- src/pquery.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/src/pquery.c b/src/pquery.c index 3b416bb..a7ba2a2 100644 --- a/src/pquery.c +++ b/src/pquery.c @@ -823,6 +823,75 @@ Z_AttributeList *yaz_pqf_scan_attribute_list(YAZ_PQF_Parser p, ODR o, return p_query_scan_attributes_mk(p, o, attributeSetP); } +static Z_FacetField* parse_facet(ODR odr, const char *facet, int length) +{ + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + char buffer[length+1]; + Odr_oid *attributeSetId; + Z_FacetField *facet_field; + Z_AttributeList *attribute_list; + memcpy(buffer, facet, length); + buffer[length] = '\0'; + attribute_list = yaz_pqf_scan_attribute_list(pqf_parser, odr, &attributeSetId, buffer); + + if (!attribute_list) { + printf("Invalid facet definition: %s", facet); + return 0; + } + facet_field = odr_malloc(odr, sizeof(*facet_field)); + facet_field->attributes = attribute_list; + facet_field->num_terms = 0; + facet_field->terms = 0; + //debug_add_facet_term(odr, facet_field); + + return facet_field; +} + +#define FACET_DElIMITER ',' + +static int scan_facet_argument(const char *arg) { + int index; + int length = strlen(arg); + int count = 1; + for (index = 0; index < length; index++) { + if (arg[index] == FACET_DElIMITER) + count++; + } + return count; +} + +/** + * yax_pdg_parse_facet_list: Parses a comma-separated list of AttributeList(s) into a FacetList. + * It does not handle the optional facet term(s). + * + */ +Z_FacetList *yaz_pqf_parse_facet_list(ODR odr, const char *facet) { + Z_FacetList *facet_list = 0; + Z_FacetField **elements; + int index = 0; + int num_elements = scan_facet_argument(facet); + if (num_elements == 0) + return facet_list; + facet_list = odr_malloc(odr, sizeof(*facet_list)); + facet_list->num = num_elements; + elements = odr_malloc(odr, num_elements * sizeof(*elements)); + for (index = 0; index < num_elements;) { + const char *pos = strchr(facet, FACET_DElIMITER); + if (pos == 0) + pos = facet + strlen(facet); + elements[index] = parse_facet(odr, (const char *) facet, (pos - facet)); + if (elements[index]) { + index++; + } + else + num_elements--; + facet = pos + 1; + } + facet_list->elements = elements; + return facet_list; +} + + int yaz_pqf_error(YAZ_PQF_Parser p, const char **msg, size_t *off) { -- 1.7.10.4