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
Running to keep up with zebra source changes (I think)
[idzebra-moved-to-github.git]
/
index
/
zrpn.c
diff --git
a/index/zrpn.c
b/index/zrpn.c
index
6f084f1
..
bd0ceab
100644
(file)
--- a/
index/zrpn.c
+++ b/
index/zrpn.c
@@
-1,4
+1,4
@@
-/* $Id: zrpn.c,v 1.120 2002-08-02 19:26:56 adam Exp $
+/* $Id: zrpn.c,v 1.122 2002-08-28 19:52:29 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-1105,8
+1105,7
@@
static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
switch (term->which)
{
case Z_Term_general:
switch (term->which)
{
case Z_Term_general:
-#if HAVE_ICONV_H
- if (zh->iconv_to_utf8 != (iconv_t)(-1))
+ if (zh->iconv_to_utf8 != 0)
{
char *inbuf = term->u.general->buf;
size_t inleft = term->u.general->len;
{
char *inbuf = term->u.general->buf;
size_t inleft = term->u.general->len;
@@
-1115,18
+1114,17
@@
static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt,
size_t ret;
yaz_log (LOG_DEBUG, "converting general from ISO-8859-1");
size_t ret;
yaz_log (LOG_DEBUG, "converting general from ISO-8859-1");
- ret = iconv(zh->iconv_to_utf8, &inbuf, &inleft,
+ ret = yaz_iconv(zh->iconv_to_utf8, &inbuf, &inleft,
&outbuf, &outleft);
if (ret == (size_t)(-1))
{
&outbuf, &outleft);
if (ret == (size_t)(-1))
{
- ret = iconv(zh->iconv_to_utf8, 0, 0, 0, 0);
+ ret = yaz_iconv(zh->iconv_to_utf8, 0, 0, 0, 0);
zh->errCode = 125;
return -1;
}
*outbuf = 0;
return 0;
}
zh->errCode = 125;
return -1;
}
*outbuf = 0;
return 0;
}
-#endif
sizez = term->u.general->len;
if (sizez > IT_MAX_WORD-1)
sizez = IT_MAX_WORD-1;
sizez = term->u.general->len;
if (sizez > IT_MAX_WORD-1)
sizez = IT_MAX_WORD-1;
@@
-2136,12
+2134,28
@@
static RSET xpath_trunc(ZebraHandle zh, NMEM stream,
int prefix_len = 0;
int ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, use);
int ord_len, i, r, max_pos;
int prefix_len = 0;
int ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, use);
int ord_len, i, r, max_pos;
+ int term_type = Z_Term_characterString;
+ const char *flags = "void";
if (grep_info_prepare (zh, 0 /* zapt */, &grep_info, '0', stream))
if (grep_info_prepare (zh, 0 /* zapt */, &grep_info, '0', stream))
- return 0;
+ {
+ rset_null_parms parms;
+
+ parms.rset_term = rset_term_create (term, strlen(term),
+ flags, term_type);
+ parms.rset_term->nn = 0;
+ return rset_create (rset_kind_null, &parms);
+ }
if (ord < 0)
if (ord < 0)
- return 0;
+ {
+ rset_null_parms parms;
+
+ parms.rset_term = rset_term_create (term, strlen(term),
+ flags, term_type);
+ parms.rset_term->nn = 0;
+ return rset_create (rset_kind_null, &parms);
+ }
if (prefix_len)
term_dict[prefix_len++] = '|';
else
if (prefix_len)
term_dict[prefix_len++] = '|';
else
@@
-2166,7
+2180,7
@@
static RSET xpath_trunc(ZebraHandle zh, NMEM stream,
grep_info.isam_p_indx);
rset = rset_trunc (zh, grep_info.isam_p_buf,
grep_info.isam_p_indx, term, strlen(term),
grep_info.isam_p_indx);
rset = rset_trunc (zh, grep_info.isam_p_buf,
grep_info.isam_p_indx, term, strlen(term),
- "void", 1, Z_Term_characterString);
+ flags, 1, term_type);
grep_info_delete (&grep_info);
return rset;
}
grep_info_delete (&grep_info);
return rset;
}
@@
-2294,7
+2308,7
@@
static RSET rpn_search_xpath (ZebraHandle zh,
rset_end_tag = xpath_trunc(zh, stream,
'0', xpath_rev, 2, curAttributeSet);
rset_end_tag = xpath_trunc(zh, stream,
'0', xpath_rev, 2, curAttributeSet);
-
+
parms.key_size = sizeof(struct it_key);
parms.cmp = key_compare_it;
parms.rset_l = rset_start_tag;
parms.key_size = sizeof(struct it_key);
parms.cmp = key_compare_it;
parms.rset_l = rset_start_tag;