/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#include <yaz/xmalloc.h>
#include <yaz/wrbuf.h>
#include <yaz/log.h>
+#include <yaz/yaz-version.h>
#include <ctype.h>
#include <assert.h>
#include <string.h>
#include <yaz/icu.h>
#endif
-
/* charset handle */
struct pp2_charset_s {
const char *(*token_next_handler)(pp2_relevance_token_t prt);
pp2_charset_t pct; /* our main charset handle (type+config) */
WRBUF norm_str; /* normized string we return (temporarily) */
WRBUF sort_str; /* sort string we return (temporarily) */
+ yaz_icu_iter_t iter;
};
}
}
-pp2_relevance_token_t pp2_relevance_tokenize(pp2_charset_t pct,
- const char *buf,
- int skip_article)
+pp2_relevance_token_t pp2_relevance_tokenize(pp2_charset_t pct)
{
pp2_relevance_token_t prt = xmalloc(sizeof(*prt));
assert(pct);
+ prt->norm_str = wrbuf_alloc();
+ prt->sort_str = wrbuf_alloc();
+ prt->cp = 0;
+ prt->last_cp = 0;
+ prt->pct = pct;
+
+#if YAZ_HAVE_ICU
+ prt->iter = 0;
+ if (pct->icu_chn)
+ prt->iter = icu_iter_create(pct->icu_chn);
+#endif
+ return prt;
+}
+
+void pp2_relevance_first(pp2_relevance_token_t prt,
+ const char *buf,
+ int skip_article)
+{
if (skip_article)
{
const char *p = buf;
buf = p;
}
- prt->norm_str = wrbuf_alloc();
- prt->sort_str = wrbuf_alloc();
+ wrbuf_rewind(prt->norm_str);
+ wrbuf_rewind(prt->sort_str);
prt->cp = buf;
prt->last_cp = 0;
- prt->pct = pct;
#if YAZ_HAVE_ICU
- if (pct->icu_chn)
+ if (prt->iter)
{
- int ok = 0;
- pct->icu_sts = U_ZERO_ERROR;
- ok = icu_chain_assign_cstr(pct->icu_chn, buf, &pct->icu_sts);
- //printf("\nfield ok: %d '%s'\n", ok, buf);
- prt->pct = pct;
+ icu_iter_first(prt->iter, buf);
}
#endif // YAZ_HAVE_ICU
- return prt;
}
-
void pp2_relevance_token_destroy(pp2_relevance_token_t prt)
{
assert(prt);
+#if YAZ_HAVE_ICU
+ if (prt->iter)
+ icu_iter_destroy(prt->iter);
+#endif
if(prt->norm_str)
wrbuf_destroy(prt->norm_str);
if(prt->sort_str)
#if YAZ_HAVE_ICU
static const char *pp2_relevance_token_icu(pp2_relevance_token_t prt)
{
- if (icu_chain_next_token(prt->pct->icu_chn, &prt->pct->icu_sts))
+ if (icu_iter_next(prt->iter))
{
- if (U_FAILURE(prt->pct->icu_sts))
- {
- return 0;
- }
- return icu_chain_token_norm(prt->pct->icu_chn);
+ return icu_iter_get_norm(prt->iter);
}
return 0;
}
static const char *pp2_get_sort_icu(pp2_relevance_token_t prt)
{
- return icu_chain_token_sortkey(prt->pct->icu_chn);
+ return icu_iter_get_sortkey(prt->iter);
}
#endif // YAZ_HAVE_ICU