-/* $Id: untrans.c,v 1.2 2007-01-15 15:10:17 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2010 Index Data
Zebra 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 "index.h"
#include <charmap.h>
-void zebra_term_untrans(ZebraHandle zh, int reg_type,
- char *dst, const char *src)
+int zebra_term_untrans(ZebraHandle zh, const char *index_type,
+ char *dst, const char *src)
{
- int len = 0;
- while (*src)
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+ if (!zm)
{
- const char *cp = zebra_maps_output(zh->reg->zebra_maps,
- reg_type, &src);
- if (!cp)
- {
- if (len < IT_MAX_WORD-1)
- dst[len++] = *src;
- src++;
- }
- else
- while (*cp && len < IT_MAX_WORD-1)
- dst[len++] = *cp++;
+ return -2;
+ }
+ if (zebra_maps_is_icu(zm))
+ {
+ return -1;
}
- dst[len] = '\0';
+ else
+ {
+ int len = 0;
+ while (*src)
+ {
+ const char *cp = zebra_maps_output(zm, &src);
+ if (!cp)
+ {
+ if (len < IT_MAX_WORD-1)
+ dst[len++] = *src;
+ src++;
+ }
+ else
+ while (*cp && len < IT_MAX_WORD-1)
+ dst[len++] = *cp++;
+ }
+ dst[len] = '\0';
+ }
+ return 0;
}
-void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
- char **dst, const char *src)
+int zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream,
+ const char *index_type,
+ char **dst, const char *src)
{
char term_src[IT_MAX_WORD];
char term_dst[IT_MAX_WORD];
+ int r;
- zebra_term_untrans (zh, reg_type, term_src, src);
+ r = zebra_term_untrans (zh, index_type, term_src, src);
+ if (r)
+ return r;
if (zh->iconv_from_utf8 != 0)
{
if (ret == (size_t)(-1))
len = 0;
else
+ {
+ yaz_iconv (zh->iconv_from_utf8, 0, 0, &outbuf, &outleft);
len = outbuf - term_dst;
+ }
*dst = nmem_malloc(stream, len + 1);
if (len > 0)
memcpy (*dst, term_dst, len);
}
else
*dst = nmem_strdup(stream, term_src);
+ return 0;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+