-/* $Id: zrpn.c,v 1.120 2002-08-02 19:26:56 adam Exp $
+/* $Id: zrpn.c,v 1.124 2002-09-24 19:44:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
static const char **rpn_char_map_handler (void *vp, const char **from, int len)
{
struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp;
- return zebra_maps_input (p->zm, p->reg_type, from, len);
+ const char **out = zebra_maps_input (p->zm, p->reg_type, from, len);
+#if 0
+ if (out && *out)
+ {
+ const char *outp = *out;
+ yaz_log (LOG_LOG, "---");
+ while (*outp)
+ {
+ yaz_log (LOG_LOG, "%02X", *outp);
+ outp++;
+ }
+ }
+#endif
+ return out;
}
static void rpn_char_map_prepare (struct zebra_register *reg, int reg_type,
return *s0;
}
-#define REGEX_CHARS "[]()|.*+!"
+#define REGEX_CHARS " []()|.*+?!"
/* term_100: handle term, where trunc=none (no operators at all) */
static int term_100 (ZebraMaps zebra_maps, int reg_type,
attributeSet,
reg_type, space_split, term_dst))
return 0;
- logf (LOG_DEBUG, "dict_lookup_grep: %s", term_dict+prefix_len);
+ logf (LOG_LOG, "dict_lookup_grep: %s", term_dict+prefix_len);
r = dict_lookup_grep (zh->reg->dict, term_dict, 0,
grep_info, &max_pos, 0, grep_handle);
if (r)
- logf (LOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r);
+ logf (LOG_WARN, "dict_lookup_grep fail %d", r);
break;
case 1: /* right truncation */
term_dict[j++] = '(';
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;
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))
{
- 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;
}
-#endif
sizez = term->u.general->len;
if (sizez > IT_MAX_WORD-1)
sizez = IT_MAX_WORD-1;
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))
- 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)
- 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
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;
}
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;