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
Added zebra_octet_term_encoding that specifies encoding for search
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
600248a
..
3077ed1
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-1,4
+1,4
@@
-/* $Id: zserver.c,v 1.123 2004-11-19 10:27:08 heikki Exp $
+/* $Id: zserver.c,v 1.126 2004-12-21 22:00:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-32,7
+32,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#include <errno.h>
#endif
#include <errno.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.h>
@@
-153,7
+153,8
@@
bend_initresult *bend_init (bend_initrequest *q)
charsets[i], right_name);
odr_set_charset (q->stream, right_name, "UTF-8");
if (selected)
charsets[i], right_name);
odr_set_charset (q->stream, right_name, "UTF-8");
if (selected)
- zebra_record_encoding (zh, right_name);
+ zebra_record_encoding(zh, right_name);
+ zebra_octet_term_encoding(zh, right_name);
q->charneg_response =
yaz_set_response_charneg (q->stream, charsets[i],
0, selected);
q->charneg_response =
yaz_set_response_charneg (q->stream, charsets[i],
0, selected);
@@
-271,7
+272,7
@@
int bend_search (void *handle, bend_search_rr *r)
zebra_result (zh, &r->errcode, &r->errstring);
return 0;
}
zebra_result (zh, &r->errcode, &r->errstring);
return 0;
}
- yaz_log (YLOG_LOG, "ResultSet '%s'", r->setname);
+ yaz_log (YLOG_DEBUG, "ResultSet '%s'", r->setname);
switch (r->query->which)
{
case Z_Query_type_1: case Z_Query_type_101:
switch (r->query->which)
{
case Z_Query_type_1: case Z_Query_type_101: