#include "charsets.h"
#include "normalize7bit.h"
-#if YAZ_HAVE_ICU
-#include <yaz/icu.h>
-#endif
-
typedef struct pp2_charset_s *pp2_charset_t;
static pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node);
-static pp2_charset_t pp2_charset_create(struct icu_chain * icu_chn);
+static pp2_charset_t pp2_charset_create(void);
static pp2_charset_t pp2_charset_create_a_to_z(void);
static void pp2_charset_destroy(pp2_charset_t pct);
static pp2_charset_token_t pp2_charset_tokenize(pp2_charset_t pct);
+#if YAZ_HAVE_ICU
+#include <yaz/icu.h>
+static pp2_charset_t pp2_charset_create_icu(struct icu_chain *icu_chn);
+#endif
+
/* charset handle */
struct pp2_charset_s {
const char *(*token_next_handler)(pp2_charset_token_t prt);
pp2_charset_fact_add(pft, pp2_charset_create_a_to_z(), "relevance");
pp2_charset_fact_add(pft, pp2_charset_create_a_to_z(), "sort");
pp2_charset_fact_add(pft, pp2_charset_create_a_to_z(), "mergekey");
- pp2_charset_fact_add(pft, pp2_charset_create(0), "facet");
+ pp2_charset_fact_add(pft, pp2_charset_create(), "facet");
return pft;
}
//xmlChar *xmlstr = 0;
//int size = 0;
//xmlDocDumpMemory(icu_doc, size);
-
+
yaz_log(YLOG_FATAL, "Could not parse ICU chain config:\n"
"<%s>\n ... \n</%s>",
xml_node->name, xml_node->name);
return 0;
}
- return pp2_charset_create(chain);
+ return pp2_charset_create_icu(chain);
#else // YAZ_HAVE_ICU
yaz_log(YLOG_FATAL, "Error: ICU support requested with element:\n"
"<%s>\n ... \n</%s>",
xml_node->name, xml_node->name);
- yaz_log(YLOG_FATAL,
+ yaz_log(YLOG_FATAL,
"But no ICU support is compiled into the YAZ library.");
return 0;
#endif // YAZ_HAVE_ICU
}
-pp2_charset_t pp2_charset_create_a_to_z(void)
-{
- pp2_charset_t pct = pp2_charset_create(0);
- pct->token_next_handler = pp2_charset_token_a_to_z;
- return pct;
-}
-
-pp2_charset_t pp2_charset_create(struct icu_chain *icu_chn)
+pp2_charset_t pp2_charset_create(void)
{
pp2_charset_t pct = xmalloc(sizeof(*pct));
pct->get_display_handler = pp2_get_display_ascii;
#if YAZ_HAVE_ICU
pct->icu_chn = 0;
+#endif // YAZ_HAVE_ICU
+ return pct;
+}
+
+pp2_charset_t pp2_charset_create_a_to_z(void)
+{
+ pp2_charset_t pct = pp2_charset_create();
+ pct->token_next_handler = pp2_charset_token_a_to_z;
+ return pct;
+}
+
+#if YAZ_HAVE_ICU
+pp2_charset_t pp2_charset_create_icu(struct icu_chain *icu_chn)
+{
+ pp2_charset_t pct = pp2_charset_create();
if (icu_chn)
{
pct->icu_chn = icu_chn;
pct->get_sort_handler = pp2_get_sort_icu;
pct->get_display_handler = pp2_get_display_icu;
}
-#endif // YAZ_HAVE_ICU
return pct;
}
+#endif // YAZ_HAVE_ICU
void pp2_charset_destroy(pp2_charset_t pct)
{
void pp2_charset_token_first(pp2_charset_token_t prt,
const char *buf, int skip_article)
-{
+{
if (skip_article)
{
const char *p = buf;
char firstword[64];
char *pout = firstword;
char articles[] = "the den der die des an a "; // must end in space
-
+
for (; *p && *p != ' ' && pout - firstword < (sizeof(firstword)-2); p++)
*pout++ = tolower(*(unsigned char *)p);
*pout++ = ' ';
if (prt->iter)
icu_iter_destroy(prt->iter);
#endif
- if(prt->norm_str)
+ if(prt->norm_str)
wrbuf_destroy(prt->norm_str);
- if(prt->sort_str)
+ if(prt->sort_str)
wrbuf_destroy(prt->sort_str);
xfree(prt);
}
char *tmp = xstrdup(prt->last_cp);
char *result = 0;
result = normalize7bit_mergekey(tmp);
-
+
wrbuf_rewind(prt->sort_str);
wrbuf_puts(prt->sort_str, result);
xfree(tmp);