projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build packages for Ubuntu Trusty Tahr 14.04 LTS
[idzebra-moved-to-github.git]
/
index
/
untrans.c
diff --git
a/index/untrans.c
b/index/untrans.c
index
6aa3f64
..
0643114
100644
(file)
--- a/
index/untrans.c
+++ b/
index/untrans.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 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
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
@@
-17,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <assert.h>
#include <ctype.h>
@@
-58,14
+61,14
@@
int zebra_term_untrans(ZebraHandle zh, const char *index_type,
return 0;
}
return 0;
}
-int zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream,
+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;
const char *index_type,
char **dst, const char *src)
{
char term_src[IT_MAX_WORD];
char term_dst[IT_MAX_WORD];
int r;
-
+
r = zebra_term_untrans (zh, index_type, term_src, src);
if (r)
return r;
r = zebra_term_untrans (zh, index_type, term_src, src);
if (r)
return r;
@@
-78,7
+81,7
@@
int zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream,
char *outbuf = term_dst;
size_t outleft = sizeof(term_dst)-1;
size_t ret;
char *outbuf = term_dst;
size_t outleft = sizeof(term_dst)-1;
size_t ret;
-
+
ret = yaz_iconv (zh->iconv_from_utf8, &inbuf, &inleft,
&outbuf, &outleft);
if (ret == (size_t)(-1))
ret = yaz_iconv (zh->iconv_from_utf8, &inbuf, &inleft,
&outbuf, &outleft);
if (ret == (size_t)(-1))