pp2_relevance_token_t prt;
const char *facet_component;
WRBUF facet_wrbuf = wrbuf_alloc();
+ WRBUF display_wrbuf = wrbuf_alloc();
+ int i;
+ const char *icu_chain_id = 0;
+
+ for (i = 0; i < service->num_metadata; i++)
+ if (!strcmp((service->metadata + i)->name, type))
+ icu_chain_id = (service->metadata + i)->icu_chain;
+ yaz_log(YLOG_LOG, "icu_chain id=%s", icu_chain_id ? icu_chain_id : "null");
+
prt = pp2_relevance_tokenize(service->facet_pct);
pp2_relevance_first(prt, value, 0);
while ((facet_component = pp2_relevance_token_next(prt)))
{
+ const char *display_component;
if (*facet_component)
{
if (wrbuf_len(facet_wrbuf))
wrbuf_puts(facet_wrbuf, " ");
wrbuf_puts(facet_wrbuf, facet_component);
}
+ display_component = pp2_get_display(prt);
+ if (display_component)
+ {
+ if (wrbuf_len(display_wrbuf))
+ wrbuf_puts(display_wrbuf, " ");
+ wrbuf_puts(display_wrbuf, display_component);
+ }
}
pp2_relevance_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 (wrbuf_len(facet_wrbuf))
{
int i;
#if 0
session_log(s, YLOG_DEBUG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count);
#endif
- termlist_insert(s->termlists[i].termlist, wrbuf_cstr(facet_wrbuf),
- count);
+ termlist_insert(s->termlists[i].termlist, wrbuf_cstr(display_wrbuf),
+ wrbuf_cstr(facet_wrbuf), count);
}
wrbuf_destroy(facet_wrbuf);
+ wrbuf_destroy(display_wrbuf);
}
static xmlDoc *record_to_xml(struct session *se,
if (!facet_limits)
{
*addinfo = "limit";
+ session_leave(se);
return PAZPAR2_MALFORMED_PARAMETER_VALUE;
}
for (l = se->clients; l; l = l->next)
nmem_destroy(se->nmem);
service_destroy(se->service);
yaz_mutex_destroy(&se->session_mutex);
- wrbuf_destroy(se->wrbuf);
}
/* Depreciated: use session_destroy */
session->clients = 0;
session->session_nmem = nmem;
session->nmem = nmem_create();
- session->wrbuf = wrbuf_alloc();
session->databases = 0;
for (i = 0; i <= SESSION_WATCH_MAX; i++)
{