void add_facet(struct session *s, const char *type, const char *value, int count)
{
struct conf_service *service = s->service;
- pp2_relevance_token_t prt;
+ pp2_charset_token_t prt;
const char *facet_component;
WRBUF facet_wrbuf = wrbuf_alloc();
WRBUF display_wrbuf = wrbuf_alloc();
for (i = 0; i < service->num_metadata; i++)
if (!strcmp((service->metadata + i)->name, type))
- icu_chain_id = (service->metadata + i)->icu_chain;
+ icu_chain_id = (service->metadata + i)->facetrule;
yaz_log(YLOG_LOG, "icu_chain id=%s", icu_chain_id ? icu_chain_id : "null");
if (!icu_chain_id)
icu_chain_id = "facet";
- prt = pp2_relevance_create(service->charsets, icu_chain_id);
+ prt = pp2_charset_token_create(service->charsets, icu_chain_id);
if (!prt)
{
yaz_log(YLOG_FATAL, "Unknown ICU chain '%s' for facet of type '%s'",
wrbuf_destroy(display_wrbuf);
return;
}
- pp2_relevance_first(prt, value, 0);
- while ((facet_component = pp2_relevance_token_next(prt)))
+ pp2_charset_token_first(prt, value, 0);
+ while ((facet_component = pp2_charset_token_next(prt)))
{
const char *display_component;
if (*facet_component)
wrbuf_puts(display_wrbuf, display_component);
}
}
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
yaz_log(YLOG_LOG, "facet norm=%s", wrbuf_cstr(facet_wrbuf));
yaz_log(YLOG_LOG, "facet display=%s", wrbuf_cstr(display_wrbuf));
if (value)
{
const char *norm_str;
- pp2_relevance_token_t prt =
- pp2_relevance_create(service->charsets, "mergekey");
+ pp2_charset_token_t prt =
+ pp2_charset_token_create(service->charsets, "mergekey");
- pp2_relevance_first(prt, (const char *) value, 0);
+ pp2_charset_token_first(prt, (const char *) value, 0);
if (wrbuf_len(norm_wr) > 0)
wrbuf_puts(norm_wr, " ");
wrbuf_puts(norm_wr, name);
while ((norm_str =
- pp2_relevance_token_next(prt)))
+ pp2_charset_token_next(prt)))
{
if (*norm_str)
{
}
}
xmlFree(value);
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
no_found++;
}
}
if (mergekey)
{
const char *norm_str;
- pp2_relevance_token_t prt =
- pp2_relevance_create(service->charsets, "mergekey");
+ pp2_charset_token_t prt =
+ pp2_charset_token_create(service->charsets, "mergekey");
- pp2_relevance_first(prt, (const char *) mergekey, 0);
- while ((norm_str = pp2_relevance_token_next(prt)))
+ pp2_charset_token_first(prt, (const char *) mergekey, 0);
+ while ((norm_str = pp2_charset_token_next(prt)))
{
if (*norm_str)
{
wrbuf_puts(norm_wr, norm_str);
}
}
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
xmlFree(mergekey);
}
else
// now parsing XML record and adding data to cluster or record metadata
for (n = root->children; n; n = n->next)
{
- pp2_relevance_token_t prt;
+ pp2_charset_token_t prt;
if (type)
xmlFree(type);
if (value)
nmem_malloc(se->nmem,
sizeof(union data_types));
- prt = pp2_relevance_create(service->charsets, "sort");
+ prt =
+ pp2_charset_token_create(service->charsets, "sort");
- pp2_relevance_first(prt, rec_md->data.text.disp,
- skip_article);
+ pp2_charset_token_first(prt, rec_md->data.text.disp,
+ skip_article);
- pp2_relevance_token_next(prt);
+ pp2_charset_token_next(prt);
sort_str = pp2_get_sort(prt);
}
cluster->sortkeys[sk_field_id]->text.sort =
nmem_strdup(se->nmem, sort_str);
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
}
}
}