Z_FacetTerm *yaz_sru_proxy_get_facet_term_count(ODR odr, xmlNodePtr node)
{
- int freq;
+ Odr_int freq;
xmlNodePtr child;
WRBUF wrbuf = wrbuf_alloc();
- const char *freq_string = yaz_element_attribute_value_get(node, "facetvalue", "est_representation");
- Z_Term *term;
+ Z_FacetTerm *facet_term;
+ const char *freq_string = yaz_element_attribute_value_get(
+ node, "facetvalue", "est_representation");
if (freq_string)
- freq = atoi(freq_string);
+ freq = odr_atoi(freq_string);
else
freq = -1;
- for (child = node->children; child ; child = child->next) {
+ for (child = node->children; child ; child = child->next)
+ {
if (child->type == XML_TEXT_NODE)
wrbuf_puts(wrbuf, (const char *) child->content);
}
- term = term_create(odr, wrbuf_cstr(wrbuf));
- yaz_log(YLOG_DEBUG, "sru-proxy facet: %s %d", wrbuf_cstr(wrbuf), freq);
+ facet_term = facet_term_create_cstr(odr, wrbuf_cstr(wrbuf), freq);
wrbuf_destroy(wrbuf);
- return facet_term_create(odr, term, freq);
+ return facet_term;
};
static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr)
const char* name = yaz_element_attribute_value_get(ptr, "facet", "code");
yaz_log(YLOG_DEBUG, "sru-proxy facet type: %s", name);
- list = yaz_use_atttribute_create(odr, name);
+ list = yaz_use_attribute_create(odr, name);
for (node = ptr->children; node; node = node->next) {
if (match_element(node, "facetvalue"))
num_terms++;
{
if (match_element(node, "facetvalue"))
{
- facet_field_term_set(odr, facet_field, yaz_sru_proxy_get_facet_term_count(odr, node), index);
+ facet_field_term_set(odr, facet_field,
+ yaz_sru_proxy_get_facet_term_count(odr, node),
+ index);
index++;
}
}