X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzrpn.c;h=dea6c98860d8f81192c4711512c5f43e24e07144;hp=c801aebb9c2d8c3bf12b62de7dae13372143acda;hb=7c3a0352f0492609a3b6b26b63a72b0b2d207aab;hpb=8f7e8952ccd2eca24d2bb91a79d2f17f346c490c diff --git a/index/zrpn.c b/index/zrpn.c index c801aeb..dea6c98 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,10 +1,26 @@ -/* - * Copyright (C) 1995-2002, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Id: zrpn.c,v 1.119 2002-08-02 10:07:48 adam Exp $ - */ +/* $Id: zrpn.c,v 1.152 2004-09-14 14:38:07 quinn Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #ifdef WIN32 @@ -15,58 +31,74 @@ #include #include "index.h" +#include #include -#include -#include -#include -#include +#include + + +static const struct key_control it_ctrl = { + sizeof(struct it_key), + 2, /* we have sysnos and seqnos in this key, nothing more */ + key_compare_it, + key_logdump_txt, /* FIXME - clean up these functions */ + key_get_seq, +}; + + +const struct key_control *key_it_ctrl = &it_ctrl; struct rpn_char_map_info { ZebraMaps zm; int reg_type; }; +typedef struct { + int type; + int major; + int minor; + Z_AttributesPlusTerm *zapt; +} AttrType; + + 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, 0); +#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, - struct rpn_char_map_info *map_info) + struct rpn_char_map_info *map_info) { map_info->zm = reg->zebra_maps; map_info->reg_type = reg_type; dict_grep_cmap (reg->dict, map_info, rpn_char_map_handler); } -typedef struct { - int type; - int major; - int minor; - Z_AttributesPlusTerm *zapt; -} AttrType; - static int attr_find_ex (AttrType *src, oid_value *attributeSetP, - const char **string_value) + const char **string_value) { int num_attributes; -#ifdef ASN_COMPILED num_attributes = src->zapt->attributes->num_attributes; -#else - num_attributes = src->zapt->num_attributes; -#endif while (src->major < num_attributes) { Z_AttributeElement *element; -#ifdef ASN_COMPILED element = src->zapt->attributes->attributes[src->major]; -#else - element = src->zapt->attributeList[src->major]; -#endif if (src->type == *element->attributeType) { switch (element->which) @@ -84,7 +116,7 @@ static int attr_find_ex (AttrType *src, oid_value *attributeSetP, break; case Z_AttributeValue_complex: if (src->minor >= element->value.complex->num_list) - break; + break; if (element->attributeSet && attributeSetP) { oident *attrset; @@ -94,23 +126,23 @@ static int attr_find_ex (AttrType *src, oid_value *attributeSetP, } if (element->value.complex->list[src->minor]->which == Z_StringOrNumeric_numeric) - { - ++(src->minor); - return - *element->value.complex->list[src->minor-1]->u.numeric; - } - else if (element->value.complex->list[src->minor]->which == - Z_StringOrNumeric_string) - { - if (!string_value) - break; - ++(src->minor); - *string_value = - element->value.complex->list[src->minor-1]->u.string; - return -2; - } - else - break; + { + ++(src->minor); + return + *element->value.complex->list[src->minor-1]->u.numeric; + } + else if (element->value.complex->list[src->minor]->which == + Z_StringOrNumeric_string) + { + if (!string_value) + break; + ++(src->minor); + *string_value = + element->value.complex->list[src->minor-1]->u.string; + return -2; + } + else + break; default: assert (0); } @@ -140,7 +172,7 @@ struct grep_info { #ifdef TERM_COUNT int *term_no; #endif - ISAMS_P *isam_p_buf; + ISAMC_P *isam_p_buf; int isam_p_size; int isam_p_indx; ZebraHandle zh; @@ -149,33 +181,34 @@ struct grep_info { }; static void term_untrans (ZebraHandle zh, int reg_type, - char *dst, const char *src) + char *dst, const char *src) { + int len = 0; while (*src) { const char *cp = zebra_maps_output (zh->reg->zebra_maps, - reg_type, &src); - if (!cp) - *dst++ = *src++; - else - while (*cp) - *dst++ = *cp++; + reg_type, &src); + if (!cp && len < IT_MAX_WORD-1) + dst[len++] = *src++; + else + while (*cp && len < IT_MAX_WORD-1) + dst[len++] = *cp++; } - *dst = '\0'; + dst[len] = '\0'; } static void add_isam_p (const char *name, const char *info, - struct grep_info *p) + struct grep_info *p) { if (p->isam_p_indx == p->isam_p_size) { - ISAMS_P *new_isam_p_buf; + ISAMC_P *new_isam_p_buf; #ifdef TERM_COUNT int *new_term_no; #endif p->isam_p_size = 2*p->isam_p_size + 100; - new_isam_p_buf = (ISAMS_P *) xmalloc (sizeof(*new_isam_p_buf) * - p->isam_p_size); + new_isam_p_buf = (ISAMC_P *) xmalloc (sizeof(*new_isam_p_buf) * + p->isam_p_size); if (p->isam_p_buf) { memcpy (new_isam_p_buf, p->isam_p_buf, @@ -186,7 +219,7 @@ static void add_isam_p (const char *name, const char *info, #ifdef TERM_COUNT new_term_no = (int *) xmalloc (sizeof(*new_term_no) * - p->isam_p_size); + p->isam_p_size); if (p->term_no) { memcpy (new_term_no, p->isam_p_buf, @@ -202,20 +235,20 @@ static void add_isam_p (const char *name, const char *info, #if 1 if (p->termset) { - const char *db; - int set, use; - char term_tmp[512]; - int su_code = 0; - int len = key_SU_decode (&su_code, name); - - term_untrans (p->zh, p->reg_type, term_tmp, name+len+1); - logf (LOG_LOG, "grep: %d %c %s", su_code, name[len], term_tmp); - zebraExplain_lookup_ord (p->zh->reg->zei, - su_code, &db, &set, &use); - logf (LOG_LOG, "grep: set=%d use=%d db=%s", set, use, db); - - resultSetAddTerm (p->zh, p->termset, name[len], db, - set, use, term_tmp); + const char *db; + int set, use; + char term_tmp[IT_MAX_WORD]; + int su_code = 0; + int len = key_SU_decode (&su_code, name); + + term_untrans (p->zh, p->reg_type, term_tmp, name+len+1); + logf (LOG_LOG, "grep: %d %c %s", su_code, name[len], term_tmp); + zebraExplain_lookup_ord (p->zh->reg->zei, + su_code, &db, &set, &use); + logf (LOG_LOG, "grep: set=%d use=%d db=%s", set, use, db); + + resultSetAddTerm (p->zh, p->termset, name[len], db, + set, use, term_tmp); } #endif (p->isam_p_indx)++; @@ -228,7 +261,7 @@ static int grep_handle (char *name, const char *info, void *p) } static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, - const char *ct1, const char *ct2) + const char *ct1, const char *ct2, int first) { const char *s1, *s0 = *src; const char **map; @@ -241,7 +274,7 @@ static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, if (ct2 && strchr (ct2, *s0)) break; s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s1, strlen(s1)); + map = zebra_maps_input (zebra_maps, reg_type, &s1, strlen(s1), first); if (**map != *CHR_SPACE) break; s0 = s1; @@ -250,12 +283,12 @@ static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, 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, - const char **src, char *dst, int space_split, - char *dst_term) + const char **src, char *dst, int space_split, + char *dst_term) { const char *s0, *s1; const char **map; @@ -265,45 +298,45 @@ static int term_100 (ZebraMaps zebra_maps, int reg_type, const char *space_start = 0; const char *space_end = 0; - if (!term_pre (zebra_maps, reg_type, src, NULL, NULL)) + if (!term_pre (zebra_maps, reg_type, src, NULL, NULL, !space_split)) return 0; s0 = *src; while (*s0) { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); - if (space_split) - { - if (**map == *CHR_SPACE) - break; - } - else /* complete subfield only. */ - { - if (**map == *CHR_SPACE) - { /* save space mapping for later .. */ - space_start = s1; - space_end = s0; - continue; - } - else if (space_start) - { /* reload last space */ - while (space_start < space_end) - { + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); + if (space_split) + { + if (**map == *CHR_SPACE) + break; + } + else /* complete subfield only. */ + { + if (**map == *CHR_SPACE) + { /* save space mapping for later .. */ + space_start = s1; + space_end = s0; + continue; + } + else if (space_start) + { /* reload last space */ + while (space_start < space_end) + { if (strchr (REGEX_CHARS, *space_start)) - dst[i++] = '\\'; - dst_term[j++] = *space_start; - dst[i++] = *space_start++; - } - /* and reset */ - space_start = space_end = 0; - } - } - /* add non-space char */ + dst[i++] = '\\'; + dst_term[j++] = *space_start; + dst[i++] = *space_start++; + } + /* and reset */ + space_start = space_end = 0; + } + } + /* add non-space char */ while (s1 < s0) { if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; - dst_term[j++] = *s1; + dst_term[j++] = *s1; dst[i++] = *s1++; } } @@ -315,15 +348,15 @@ static int term_100 (ZebraMaps zebra_maps, int reg_type, /* term_101: handle term, where trunc=Process # */ static int term_101 (ZebraMaps zebra_maps, int reg_type, - const char **src, char *dst, int space_split, - char *dst_term) + const char **src, char *dst, int space_split, + char *dst_term) { const char *s0, *s1; const char **map; int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, "#", "#")) + if (!term_pre (zebra_maps, reg_type, src, "#", "#", !space_split)) return 0; s0 = *src; while (*s0) @@ -332,19 +365,19 @@ static int term_101 (ZebraMaps zebra_maps, int reg_type, { dst[i++] = '.'; dst[i++] = '*'; - dst_term[j++] = *s0++; + dst_term[j++] = *s0++; } else { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) { if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; - dst_term[j++] = *s1; + dst_term[j++] = *s1; dst[i++] = *s1++; } } @@ -357,15 +390,15 @@ static int term_101 (ZebraMaps zebra_maps, int reg_type, /* term_103: handle term, where trunc=re-2 (regular expressions) */ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, - char *dst, int *errors, int space_split, - char *dst_term) + char *dst, int *errors, int space_split, + char *dst_term) { int i = 0; int j = 0; const char *s0, *s1; const char **map; - if (!term_pre (zebra_maps, reg_type, src, "^\\()[].*+?|", "(")) + if (!term_pre (zebra_maps, reg_type, src, "^\\()[].*+?|", "(", !space_split)) return 0; s0 = *src; if (errors && *s0 == '+' && s0[1] && s0[2] == '+' && s0[3] && @@ -379,21 +412,21 @@ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, while (*s0) { if (strchr ("^\\()[].*+?|-", *s0)) - { - dst_term[j++] = *s0; + { + dst_term[j++] = *s0; dst[i++] = *s0++; - } + } else { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (**map == *CHR_SPACE) break; while (s1 < s0) { if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; - dst_term[j++] = *s1; + dst_term[j++] = *s1; dst[i++] = *s1++; } } @@ -406,49 +439,74 @@ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, /* term_103: handle term, where trunc=re-1 (regular expressions) */ static int term_102 (ZebraMaps zebra_maps, int reg_type, const char **src, - char *dst, int space_split, char *dst_term) + char *dst, int space_split, char *dst_term) { return term_103 (zebra_maps, reg_type, src, dst, NULL, space_split, - dst_term); + dst_term); } /* term_104: handle term, where trunc=Process # and ! */ static int term_104 (ZebraMaps zebra_maps, int reg_type, - const char **src, char *dst, int space_split, - char *dst_term) + const char **src, char *dst, int space_split, + char *dst_term) { const char *s0, *s1; const char **map; int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, "#!", "#!")) + if (!term_pre (zebra_maps, reg_type, src, "?*#", "?*#", !space_split)) return 0; s0 = *src; while (*s0) { - if (*s0 == '#') + if (*s0 == '?') + { + dst_term[j++] = *s0++; + if (*s0 >= '0' && *s0 <= '9') + { + int limit = 0; + while (*s0 >= '0' && *s0 <= '9') + { + limit = limit * 10 + (*s0 - '0'); + dst_term[j++] = *s0++; + } + if (limit > 20) + limit = 20; + while (--limit >= 0) + { + dst[i++] = '.'; + dst[i++] = '?'; + } + } + else + { + dst[i++] = '.'; + dst[i++] = '*'; + } + } + else if (*s0 == '*') { dst[i++] = '.'; dst[i++] = '*'; - dst_term[j++] = *s0++; + dst_term[j++] = *s0++; } - else if (*s0 == '!') - { + else if (*s0 == '#') + { dst[i++] = '.'; - dst_term[j++] = *s0++; - } + dst_term[j++] = *s0++; + } { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) { if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; - dst_term[j++] = *s1; + dst_term[j++] = *s1; dst[i++] = *s1++; } } @@ -461,15 +519,15 @@ static int term_104 (ZebraMaps zebra_maps, int reg_type, /* term_105/106: handle term, where trunc=Process * and ! and right trunc */ static int term_105 (ZebraMaps zebra_maps, int reg_type, - const char **src, char *dst, int space_split, - char *dst_term, int right_truncate) + const char **src, char *dst, int space_split, + char *dst_term, int right_truncate) { const char *s0, *s1; const char **map; int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, "*!", "*!")) + if (!term_pre (zebra_maps, reg_type, src, "*!", "*!", !space_split)) return 0; s0 = *src; while (*s0) @@ -478,23 +536,23 @@ static int term_105 (ZebraMaps zebra_maps, int reg_type, { dst[i++] = '.'; dst[i++] = '*'; - dst_term[j++] = *s0++; + dst_term[j++] = *s0++; } else if (*s0 == '!') - { + { dst[i++] = '.'; - dst_term[j++] = *s0++; - } + dst_term[j++] = *s0++; + } { s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); + map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0), 0); if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) { if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; - dst_term[j++] = *s1; + dst_term[j++] = *s1; dst[i++] = *s1++; } } @@ -609,14 +667,14 @@ static void gen_regular_rel (char *dst, int val, int islt) dst[dst_p] = '\0'; if (islt) { - /* match everything less than 10^(pos-1) */ - strcat (dst, "0*"); - for (i=1; ireg->zebra_maps, reg_type, - term_sub, term_component, - space_split, term_dst)) + term_sub, term_component, + space_split, term_dst)) return 0; logf (LOG_DEBUG, "Relation <"); - - *term_tmp++ = '('; - for (i = 0; term_component[i]; ) - { - int j = 0; - - if (i) - *term_tmp++ = '|'; - while (j < i) - string_rel_add_char (&term_tmp, term_component, &j); - - *term_tmp++ = '['; - - *term_tmp++ = '^'; - string_rel_add_char (&term_tmp, term_component, &i); - *term_tmp++ = '-'; - - *term_tmp++ = ']'; - *term_tmp++ = '.'; - *term_tmp++ = '*'; - } - *term_tmp++ = ')'; - *term_tmp = '\0'; + + *term_tmp++ = '('; + for (i = 0; term_component[i]; ) + { + int j = 0; + + if (i) + *term_tmp++ = '|'; + while (j < i) + string_rel_add_char (&term_tmp, term_component, &j); + + *term_tmp++ = '['; + + *term_tmp++ = '^'; + string_rel_add_char (&term_tmp, term_component, &i); + *term_tmp++ = '-'; + + *term_tmp++ = ']'; + *term_tmp++ = '.'; + *term_tmp++ = '*'; + + if ((term_tmp - term_dict) > IT_MAX_WORD) + break; + } + *term_tmp++ = ')'; + *term_tmp = '\0'; break; case 2: if (!term_100 (zh->reg->zebra_maps, reg_type, - term_sub, term_component, - space_split, term_dst)) + term_sub, term_component, + space_split, term_dst)) return 0; logf (LOG_DEBUG, "Relation <="); - *term_tmp++ = '('; - for (i = 0; term_component[i]; ) - { - int j = 0; - - while (j < i) - string_rel_add_char (&term_tmp, term_component, &j); - *term_tmp++ = '['; - - *term_tmp++ = '^'; - string_rel_add_char (&term_tmp, term_component, &i); - *term_tmp++ = '-'; - - *term_tmp++ = ']'; - *term_tmp++ = '.'; - *term_tmp++ = '*'; - - *term_tmp++ = '|'; - } - for (i = 0; term_component[i]; ) - string_rel_add_char (&term_tmp, term_component, &i); - *term_tmp++ = ')'; - *term_tmp = '\0'; + *term_tmp++ = '('; + for (i = 0; term_component[i]; ) + { + int j = 0; + + while (j < i) + string_rel_add_char (&term_tmp, term_component, &j); + *term_tmp++ = '['; + + *term_tmp++ = '^'; + string_rel_add_char (&term_tmp, term_component, &i); + *term_tmp++ = '-'; + + *term_tmp++ = ']'; + *term_tmp++ = '.'; + *term_tmp++ = '*'; + + *term_tmp++ = '|'; + + if ((term_tmp - term_dict) > IT_MAX_WORD) + break; + } + for (i = 0; term_component[i]; ) + string_rel_add_char (&term_tmp, term_component, &i); + *term_tmp++ = ')'; + *term_tmp = '\0'; break; case 5: if (!term_100 (zh->reg->zebra_maps, reg_type, - term_sub, term_component, space_split, term_dst)) + term_sub, term_component, space_split, term_dst)) return 0; logf (LOG_DEBUG, "Relation >"); - *term_tmp++ = '('; - for (i = 0; term_component[i];) - { - int j = 0; - - while (j < i) - string_rel_add_char (&term_tmp, term_component, &j); - *term_tmp++ = '['; - - *term_tmp++ = '^'; - *term_tmp++ = '-'; - string_rel_add_char (&term_tmp, term_component, &i); - - *term_tmp++ = ']'; - *term_tmp++ = '.'; - *term_tmp++ = '*'; - - *term_tmp++ = '|'; - } - for (i = 0; term_component[i];) - string_rel_add_char (&term_tmp, term_component, &i); - *term_tmp++ = '.'; - *term_tmp++ = '+'; - *term_tmp++ = ')'; - *term_tmp = '\0'; + *term_tmp++ = '('; + for (i = 0; term_component[i];) + { + int j = 0; + + while (j < i) + string_rel_add_char (&term_tmp, term_component, &j); + *term_tmp++ = '['; + + *term_tmp++ = '^'; + *term_tmp++ = '-'; + string_rel_add_char (&term_tmp, term_component, &i); + + *term_tmp++ = ']'; + *term_tmp++ = '.'; + *term_tmp++ = '*'; + + *term_tmp++ = '|'; + + if ((term_tmp - term_dict) > IT_MAX_WORD) + break; + } + for (i = 0; term_component[i];) + string_rel_add_char (&term_tmp, term_component, &i); + *term_tmp++ = '.'; + *term_tmp++ = '+'; + *term_tmp++ = ')'; + *term_tmp = '\0'; break; case 4: if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, - term_component, space_split, term_dst)) + term_component, space_split, term_dst)) return 0; logf (LOG_DEBUG, "Relation >="); - *term_tmp++ = '('; - for (i = 0; term_component[i];) - { - int j = 0; - - if (i) - *term_tmp++ = '|'; - while (j < i) - string_rel_add_char (&term_tmp, term_component, &j); - *term_tmp++ = '['; - - if (term_component[i+1]) - { - *term_tmp++ = '^'; - *term_tmp++ = '-'; - string_rel_add_char (&term_tmp, term_component, &i); - } - else - { - string_rel_add_char (&term_tmp, term_component, &i); - *term_tmp++ = '-'; - } - *term_tmp++ = ']'; - *term_tmp++ = '.'; - *term_tmp++ = '*'; - } - *term_tmp++ = ')'; - *term_tmp = '\0'; + *term_tmp++ = '('; + for (i = 0; term_component[i];) + { + int j = 0; + + if (i) + *term_tmp++ = '|'; + while (j < i) + string_rel_add_char (&term_tmp, term_component, &j); + *term_tmp++ = '['; + + if (term_component[i+1]) + { + *term_tmp++ = '^'; + *term_tmp++ = '-'; + string_rel_add_char (&term_tmp, term_component, &i); + } + else + { + string_rel_add_char (&term_tmp, term_component, &i); + *term_tmp++ = '-'; + } + *term_tmp++ = ']'; + *term_tmp++ = '.'; + *term_tmp++ = '*'; + + if ((term_tmp - term_dict) > IT_MAX_WORD) + break; + } + *term_tmp++ = ')'; + *term_tmp = '\0'; break; case 3: default: logf (LOG_DEBUG, "Relation ="); if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, - term_component, space_split, term_dst)) + term_component, space_split, term_dst)) return 0; - strcat (term_tmp, "("); - strcat (term_tmp, term_component); - strcat (term_tmp, ")"); + strcat (term_tmp, "("); + strcat (term_tmp, term_component); + strcat (term_tmp, ")"); } return 1; } @@ -814,7 +884,8 @@ static RSET term_trunc (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int reg_type, int complete_flag, int num_bases, char **basenames, char *term_dst, - const char *rank_type, int xpath_use) + const char *rank_type, int xpath_use, + NMEM rset_nmem) { int r; grep_info->isam_p_indx = 0; @@ -827,7 +898,8 @@ static RSET term_trunc (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return rset_trunc (zh, grep_info->isam_p_buf, grep_info->isam_p_indx, term_dst, strlen(term_dst), rank_type, 1 /* preserve pos */, - zapt->term->which); + zapt->term->which, rset_nmem, + key_it_ctrl,key_it_ctrl->scope); } @@ -851,6 +923,10 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, struct rpn_char_map_info rcmi; int space_split = complete_flag ? 0 : 1; + int bases_ok = 0; /* no of databases with OK attribute */ + int errCode = 0; /* err code (if any is not OK) */ + char *errString = 0; /* addinfo */ + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); attr_init (&use, zapt, 1); use_value = attr_find_ex (&use, &curAttributeSet, &use_string); @@ -876,7 +952,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, zh->errString = basenames[base_no]; return -1; } - if (use_value == -2) /* string attribute (assume IDXPATH/any) */ + if (xpath_use > 0 && use_value == -2) { use_value = xpath_use; attp.local_attributes = &id_xpath_attr; @@ -884,7 +960,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, id_xpath_attr.next = 0; id_xpath_attr.local = use_value; } - else if (curAttributeSet == VAL_IDXPATH) + else if (curAttributeSet == VAL_IDXPATH) { attp.local_attributes = &id_xpath_attr; attp.attset_ordinal = VAL_IDXPATH; @@ -893,17 +969,23 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } else { - if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value))) + if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value, + use_string))) { logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", curAttributeSet, use_value, r); if (r == -1) { /* set was found, but value wasn't defined */ - char val_str[32]; - sprintf (val_str, "%d (1)", use_value); - zh->errCode = 114; - zh->errString = nmem_strdup (stream, val_str); + errCode = 114; + if (use_string) + errString = nmem_strdup(stream, use_string); + else + { + char val_str[32]; + sprintf (val_str, "%d", use_value); + errString = nmem_strdup (stream, val_str); + } } else { @@ -915,10 +997,10 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, oident.value = curAttributeSet; oid_ent_to_oid (&oident, oid); - zh->errCode = 121; - zh->errString = nmem_strdup (stream, oident.desc); + errCode = 121; + errString = nmem_strdup (stream, oident.desc); } - return -1; + continue; } } for (local_attr = attp.local_attributes; local_attr; @@ -946,142 +1028,155 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } if (!prefix_len) { +#if 1 + bases_ok++; +#else char val_str[32]; - sprintf (val_str, "%d (2)", use_value); - zh->errCode = 114; - zh->errString = nmem_strdup (stream, val_str); - return -1; + sprintf (val_str, "%d", use_value); + errCode = 114; + errString = nmem_strdup (stream, val_str); +#endif + continue; } + bases_ok++; /* this has OK attributes */ + term_dict[prefix_len++] = ')'; term_dict[prefix_len++] = 1; term_dict[prefix_len++] = reg_type; - logf (LOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]); + logf (LOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]); term_dict[prefix_len] = '\0'; - j = prefix_len; - switch (truncation_value) - { - case -1: /* not specified */ - case 100: /* do not truncate */ - if (!string_relation (zh, zapt, &termp, term_dict, - attributeSet, - reg_type, space_split, term_dst)) - return 0; - logf (LOG_DEBUG, "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); - break; - case 1: /* right truncation */ - term_dict[j++] = '('; - if (!term_100 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ".*)"); - dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, - &max_pos, 0, grep_handle); - break; - case 2: /* keft truncation */ - term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; - if (!term_100 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, - &max_pos, 0, grep_handle); - break; - case 3: /* left&right truncation */ - term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; - if (!term_100 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ".*)"); - dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, - &max_pos, 0, grep_handle); - break; - zh->errCode = 120; - return -1; - case 101: /* process # in term */ - term_dict[j++] = '('; - if (!term_101 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - 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 err, trunc=#: %d", r); - break; - case 102: /* Regexp-1 */ - term_dict[j++] = '('; - if (!term_102 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - logf (LOG_DEBUG, "Regexp-1 tolerance=%d", r); - 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 err, trunc=regular: %d", - r); - break; - case 103: /* Regexp-2 */ - r = 1; - term_dict[j++] = '('; - if (!term_103 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, &r, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - logf (LOG_DEBUG, "Regexp-2 tolerance=%d", r); - r = dict_lookup_grep (zh->reg->dict, term_dict, r, grep_info, - &max_pos, 2, grep_handle); - if (r) - logf (LOG_WARN, "dict_lookup_grep err, trunc=eregular: %d", - r); - break; - case 104: /* process # and ! in term */ - term_dict[j++] = '('; - if (!term_104 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - 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 err, trunc=#/!: %d", r); - break; - case 105: /* process * and ! in term */ - term_dict[j++] = '('; - if (!term_105 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst, 1)) - return 0; - strcat (term_dict, ")"); - 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 err, trunc=*/!: %d", r); - break; - case 106: /* process * and ! in term */ - term_dict[j++] = '('; - if (!term_105 (zh->reg->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst, 0)) - return 0; - strcat (term_dict, ")"); - 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 err, trunc=*/!: %d", r); - break; + j = prefix_len; + switch (truncation_value) + { + case -1: /* not specified */ + case 100: /* do not truncate */ + if (!string_relation (zh, zapt, &termp, term_dict, + attributeSet, + reg_type, space_split, term_dst)) + return 0; + logf (LOG_DEBUG, "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 %d", r); + break; + case 1: /* right truncation */ + term_dict[j++] = '('; + if (!term_100 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + return 0; + strcat (term_dict, ".*)"); + dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, + &max_pos, 0, grep_handle); + break; + case 2: /* keft truncation */ + term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; + if (!term_100 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + return 0; + strcat (term_dict, ")"); + dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, + &max_pos, 0, grep_handle); + break; + case 3: /* left&right truncation */ + term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; + if (!term_100 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + return 0; + strcat (term_dict, ".*)"); + dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, + &max_pos, 0, grep_handle); + break; + zh->errCode = 120; + return -1; + case 101: /* process # in term */ + term_dict[j++] = '('; + if (!term_101 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + return 0; + strcat (term_dict, ")"); + 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 err, trunc=#: %d", r); + break; + case 102: /* Regexp-1 */ + term_dict[j++] = '('; + if (!term_102 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + return 0; + strcat (term_dict, ")"); + logf (LOG_DEBUG, "Regexp-1 tolerance=%d", r); + 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 err, trunc=regular: %d", + r); + break; + case 103: /* Regexp-2 */ + r = 1; + term_dict[j++] = '('; + if (!term_103 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, &r, space_split, term_dst)) + return 0; + strcat (term_dict, ")"); + logf (LOG_DEBUG, "Regexp-2 tolerance=%d", r); + r = dict_lookup_grep (zh->reg->dict, term_dict, r, grep_info, + &max_pos, 2, grep_handle); + if (r) + logf (LOG_WARN, "dict_lookup_grep err, trunc=eregular: %d", + r); + break; + case 104: /* process # and ! in term */ + term_dict[j++] = '('; + if (!term_104 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + return 0; + strcat (term_dict, ")"); + 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 err, trunc=#/!: %d", r); + break; + case 105: /* process * and ! in term */ + term_dict[j++] = '('; + if (!term_105 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst, 1)) + return 0; + strcat (term_dict, ")"); + 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 err, trunc=*/!: %d", r); + break; + case 106: /* process * and ! in term */ + term_dict[j++] = '('; + if (!term_105 (zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst, 0)) + return 0; + strcat (term_dict, ")"); + 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 err, trunc=*/!: %d", r); + break; } } + if (!bases_ok) + { + zh->errCode = errCode; + zh->errString = errString; + return -1; + } *term_sub = termp; logf (LOG_DEBUG, "%d positions", grep_info->isam_p_indx); return 1; } -static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - char *termz) +/* convert APT search term to UTF8 */ +static int zapt_term_to_utf8 (ZebraHandle zh, Z_AttributesPlusTerm *zapt, + char *termz) { size_t sizez; Z_Term *term = zapt->term; @@ -1089,8 +1184,7 @@ static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, 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; @@ -1098,24 +1192,24 @@ static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, size_t outleft = IT_MAX_WORD-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)) { - 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; - memcpy (termz, term->u.general->buf, sizez); - termz[sizez] = '\0'; + else + { + sizez = term->u.general->len; + if (sizez > IT_MAX_WORD-1) + sizez = IT_MAX_WORD-1; + memcpy (termz, term->u.general->buf, sizez); + termz[sizez] = '\0'; + } break; case Z_Term_characterString: sizez = strlen(term->u.characterString); @@ -1126,273 +1220,51 @@ static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, break; default: zh->errCode = 124; + return -1; } return 0; } -static void trans_scan_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - char *termz, int reg_type) +/* convert APT SCAN term to internal cmap */ +static int trans_scan_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, + char *termz, int reg_type) { - Z_Term *term = zapt->term; - const char **map; - const char *cp = (const char *) term->u.general->buf; - const char *cp_end = cp + term->u.general->len; - const char *src; - int i = 0; - const char *space_map = NULL; - int len; - - while ((len = (cp_end - cp)) > 0) + char termz0[IT_MAX_WORD]; + + if (zapt_term_to_utf8(zh, zapt, termz0)) + return -1; /* error */ + else { - map = zebra_maps_input (zh->reg->zebra_maps, reg_type, &cp, len); - if (**map == *CHR_SPACE) - space_map = *map; - else + const char **map; + const char *cp = (const char *) termz0; + const char *cp_end = cp + strlen(cp); + const char *src; + int i = 0; + const char *space_map = NULL; + int len; + + while ((len = (cp_end - cp)) > 0) { - if (i && space_map) - for (src = space_map; *src; src++) + map = zebra_maps_input (zh->reg->zebra_maps, reg_type, &cp, len, 0); + if (**map == *CHR_SPACE) + space_map = *map; + else + { + if (i && space_map) + for (src = space_map; *src; src++) + termz[i++] = *src; + space_map = NULL; + for (src = *map; *src; src++) termz[i++] = *src; - space_map = NULL; - for (src = *map; *src; src++) - termz[i++] = *src; + } } + termz[i] = '\0'; } - termz[i] = '\0'; -} - -static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, - int ordered, int exclusion, int relation, int distance) -{ - int i; - RSFD *rsfd; - int *more; - struct it_key **buf; - RSET result; - char prox_term[1024]; - int length_prox_term = 0; - int min_nn = 10000000; - int term_index; - int term_type = Z_Term_characterString; - const char *flags = NULL; - - rsfd = (RSFD *) xmalloc (sizeof(*rsfd)*rset_no); - more = (int *) xmalloc (sizeof(*more)*rset_no); - buf = (struct it_key **) xmalloc (sizeof(*buf)*rset_no); - - *prox_term = '\0'; - for (i = 0; ino_rset_terms; j++) - { - const char *nflags = rset[i]->rset_terms[j]->flags; - char *term = rset[i]->rset_terms[j]->name; - int lterm = strlen(term); - if (lterm + length_prox_term < sizeof(prox_term)-1) - { - if (length_prox_term) - prox_term[length_prox_term++] = ' '; - strcpy (prox_term + length_prox_term, term); - length_prox_term += lterm; - } - if (min_nn > rset[i]->rset_terms[j]->nn) - min_nn = rset[i]->rset_terms[j]->nn; - flags = nflags; - term_type = rset[i]->rset_terms[j]->type; - - /* only if all term types are of type characterString .. */ - /* the resulting term is of that type */ - if (term_type != Z_Term_characterString) - term_type = Z_Term_general; - } - } - for (i = 0; inn = 0; - result = rset_create (rset_kind_null, &parms); - } - else if (ordered && relation == 3 && exclusion == 0 && distance == 1) - { - /* special proximity case = phrase search ... */ - rset_temp_parms parms; - RSFD rsfd_result; - - parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags, term_type); - parms.rset_term->nn = min_nn; - parms.cmp = key_compare_it; - parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->res, "setTmpDir"); - result = rset_create (rset_kind_temp, &parms); - rsfd_result = rset_open (result, RSETF_WRITE); - - while (*more) - { - for (i = 1; i 1) - { - more[i-1] = rset_read (rset[i-1], rsfd[i-1], - buf[i-1], &term_index); - break; - } - else if (cmp == 1) - { - if (buf[i-1]->seqno+1 != buf[i]->seqno) - { - more[i-1] = rset_read (rset[i-1], rsfd[i-1], - buf[i-1], &term_index); - break; - } - } - else - { - more[i] = rset_read (rset[i], rsfd[i], buf[i], - &term_index); - break; - } - } - if (i == rset_no) - { - rset_write (result, rsfd_result, buf[0]); - more[0] = rset_read (*rset, *rsfd, *buf, &term_index); - } - } - rset_close (result, rsfd_result); - } - else if (rset_no == 2) - { - /* generic proximity case (two input sets only) ... */ - rset_temp_parms parms; - RSFD rsfd_result; - - logf (LOG_LOG, "generic prox, dist = %d, relation = %d, ordered =%d, exclusion=%d", - distance, relation, ordered, exclusion); - parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags, term_type); - parms.rset_term->nn = min_nn; - parms.cmp = key_compare_it; - parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->res, "setTmpDir"); - result = rset_create (rset_kind_temp, &parms); - rsfd_result = rset_open (result, RSETF_WRITE); - - while (more[0] && more[1]) - { - int cmp = key_compare_it (buf[0], buf[1]); - if (cmp < -1) - more[0] = rset_read (rset[0], rsfd[0], buf[0], &term_index); - else if (cmp > 1) - more[1] = rset_read (rset[1], rsfd[1], buf[1], &term_index); - else - { - int sysno = buf[0]->sysno; - int seqno[500]; - int n = 0; - - seqno[n++] = buf[0]->seqno; - while ((more[0] = rset_read (rset[0], rsfd[0], buf[0], - &term_index)) && - sysno == buf[0]->sysno) - if (n < 500) - seqno[n++] = buf[0]->seqno; - do - { - for (i = 0; iseqno - seqno[i]; - int excl = exclusion; - if (!ordered && diff < 0) - diff = -diff; - switch (relation) - { - case 1: /* < */ - if (diff < distance && diff >= 0) - excl = !excl; - break; - case 2: /* <= */ - if (diff <= distance && diff >= 0) - excl = !excl; - break; - case 3: /* == */ - if (diff == distance && diff >= 0) - excl = !excl; - break; - case 4: /* >= */ - if (diff >= distance && diff >= 0) - excl = !excl; - break; - case 5: /* > */ - if (diff > distance && diff >= 0) - excl = !excl; - break; - case 6: /* != */ - if (diff != distance && diff >= 0) - excl = !excl; - break; - } - if (excl) - { - rset_write (result, rsfd_result, buf[1]); - break; - } - } - } while ((more[1] = rset_read (rset[1], rsfd[1], buf[1], - &term_index)) && - sysno == buf[1]->sysno); - } - } - rset_close (result, rsfd_result); - } - else - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags, term_type); - parms.rset_term->nn = 0; - result = rset_create (rset_kind_null, &parms); - } - for (i = 0; ireg->zebra_maps, reg_id, ex_list, - termz, strlen(termz)); + wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, ex_list, + termz, strlen(termz)); if (!wrbuf) - return nmem_strdup(stream, termz); + return nmem_strdup(stream, termz); else { - char *buf = (char*) nmem_malloc (stream, wrbuf_len(wrbuf)+1); - memcpy (buf, wrbuf_buf(wrbuf), wrbuf_len(wrbuf)); - buf[wrbuf_len(wrbuf)] = '\0'; - return buf; + char *buf = (char*) nmem_malloc (stream, wrbuf_len(wrbuf)+1); + memcpy (buf, wrbuf_buf(wrbuf), wrbuf_len(wrbuf)); + buf[wrbuf_len(wrbuf)] = '\0'; + return buf; } } @@ -1444,10 +1316,10 @@ static void grep_info_delete (struct grep_info *grep_info) } static int grep_info_prepare (ZebraHandle zh, - Z_AttributesPlusTerm *zapt, - struct grep_info *grep_info, - int reg_type, - NMEM stream) + Z_AttributesPlusTerm *zapt, + struct grep_info *grep_info, + int reg_type, + NMEM stream) { AttrType termset; int termset_value_numeric; @@ -1466,60 +1338,61 @@ static int grep_info_prepare (ZebraHandle zh, return 0; attr_init (&termset, zapt, 8); termset_value_numeric = - attr_find_ex (&termset, NULL, &termset_value_string); + attr_find_ex (&termset, NULL, &termset_value_string); if (termset_value_numeric != -1) { - char resname[32]; - const char *termset_name = 0; - if (termset_value_numeric != -2) - { + char resname[32]; + const char *termset_name = 0; + if (termset_value_numeric != -2) + { - sprintf (resname, "%d", termset_value_numeric); - termset_name = resname; - } - else - termset_name = termset_value_string; - logf (LOG_LOG, "creating termset set %s", termset_name); - grep_info->termset = resultSetAdd (zh, termset_name, 1); - if (!grep_info->termset) - { - zh->errCode = 128; - zh->errString = nmem_strdup (stream, termset_name); - return -1; - } + sprintf (resname, "%d", termset_value_numeric); + termset_name = resname; + } + else + termset_name = termset_value_string; + logf (LOG_LOG, "creating termset set %s", termset_name); + grep_info->termset = resultSetAdd (zh, termset_name, 1); + if (!grep_info->termset) + { + zh->errCode = 128; + zh->errString = nmem_strdup (stream, termset_name); + return -1; + } } return 0; } - + static RSET rpn_search_APT_phrase (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz_org, + const char *termz_org, oid_value attributeSet, - NMEM stream, - int reg_type, int complete_flag, - const char *rank_type, int xpath_use, - int num_bases, char **basenames) + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, int xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; - int i, rset_no = 0; + int rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; *term_dst = 0; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) - return 0; + return 0; while (1) { - logf (LOG_DEBUG, "APT_phrase termp=%s", termp); + logf (LOG_DEBUG, "APT_phrase termp=%s", termp); rset[rset_no] = term_trunc (zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, term_dst, rank_type, - xpath_use); + xpath_use,rset_nmem); if (!rset[rset_no]) break; if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) @@ -1527,49 +1400,46 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, } grep_info_delete (&grep_info); if (rset_no == 0) - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (termz, -1, rank_type, - zapt->term->which); - return rset_create (rset_kind_null, &parms); - } + return rsnull_create (rset_nmem,key_it_ctrl); else if (rset_no == 1) return (rset[0]); - result = rpn_prox (zh, rset, rset_no, 1, 0, 3, 1); - for (i = 0; iscope, + rset_no, rset, + 1 /* ordered */, 0 /* exclusion */, + 3 /* relation */, 1 /* distance */); return result; } static RSET rpn_search_APT_or_list (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz_org, + const char *termz_org, oid_value attributeSet, - NMEM stream, - int reg_type, int complete_flag, - const char *rank_type, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, int xpath_use, - int num_bases, char **basenames) + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; - RSET rset[60], result; - int i, rset_no = 0; + RSET rset[60]; + int rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) - return 0; + return 0; while (1) { - logf (LOG_DEBUG, "APT_or_list termp=%s", termp); + logf (LOG_DEBUG, "APT_or_list termp=%s", termp); rset[rset_no] = term_trunc (zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, term_dst, rank_type, - xpath_use); + xpath_use,rset_nmem); if (!rset[rset_no]) break; if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) @@ -1577,36 +1447,21 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, } grep_info_delete (&grep_info); if (rset_no == 0) - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (termz, -1, rank_type, - zapt->term->which); - return rset_create (rset_kind_null, &parms); - } - result = rset[0]; - for (i = 1; iscope, + rset_no, rset); } static RSET rpn_search_APT_and_list (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz_org, + const char *termz_org, oid_value attributeSet, - NMEM stream, - int reg_type, int complete_flag, - const char *rank_type, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, int xpath_use, - int num_bases, char **basenames) + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; @@ -1616,16 +1471,16 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, const char *termp = termz; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) - return 0; + return 0; while (1) { - logf (LOG_DEBUG, "APT_and_list termp=%s", termp); + logf (LOG_DEBUG, "APT_and_list termp=%s", termp); rset[rset_no] = term_trunc (zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, term_dst, rank_type, - xpath_use); + xpath_use, rset_nmem); if (!rset[rset_no]) break; assert (rset[rset_no]); @@ -1634,35 +1489,23 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, } grep_info_delete (&grep_info); if (rset_no == 0) - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (termz, -1, rank_type, - zapt->term->which); - return rset_create (rset_kind_null, &parms); - } + return rsnull_create (rset_nmem,key_it_ctrl); result = rset[0]; + /* FIXME - Use a proper rsmultiand */ for (i = 1; iscope, + result, rset[i] ); return result; } static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char **term_sub, - char *term_dict, - oid_value attributeSet, - struct grep_info *grep_info, - int *max_pos, - int reg_type, - char *term_dst) + const char **term_sub, + char *term_dict, + oid_value attributeSet, + struct grep_info *grep_info, + int *max_pos, + int reg_type, + char *term_dst) { AttrType relation; int relation_value; @@ -1676,8 +1519,8 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, logf (LOG_DEBUG, "numeric relation value=%d", relation_value); if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, - term_dst)) - return 0; + term_dst)) + return 0; term_value = atoi (term_tmp); switch (relation_value) { @@ -1699,8 +1542,8 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, break; case 3: default: - logf (LOG_DEBUG, "Relation ="); - sprintf (term_tmp, "(0*%d)", term_value); + logf (LOG_DEBUG, "Relation ="); + sprintf (term_tmp, "(0*%d)", term_value); } logf (LOG_DEBUG, "dict_lookup_grep: %s", term_tmp); r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, max_pos, @@ -1712,24 +1555,28 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char **term_sub, - oid_value attributeSet, struct grep_info *grep_info, - int reg_type, int complete_flag, - int num_bases, char **basenames, - char *term_dst) + const char **term_sub, + oid_value attributeSet, struct grep_info *grep_info, + int reg_type, int complete_flag, + int num_bases, char **basenames, + char *term_dst, int xpath_use, NMEM stream) { char term_dict[2*IT_MAX_WORD+2]; int r, base_no; AttrType use; int use_value; + const char *use_string = 0; oid_value curAttributeSet = attributeSet; const char *termp; struct rpn_char_map_info rcmi; + int bases_ok = 0; /* no of databases with OK attribute */ + int errCode = 0; /* err code (if any is not OK) */ + char *errString = 0; /* addinfo */ + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); attr_init (&use, zapt, 1); - use_value = attr_find (&use, &curAttributeSet); - logf (LOG_DEBUG, "numeric_term, use value %d", use_value); + use_value = attr_find_ex (&use, &curAttributeSet, &use_string); if (use_value == -1) use_value = 1016; @@ -1737,19 +1584,44 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, for (base_no = 0; base_no < num_bases; base_no++) { attent attp; + data1_local_attribute id_xpath_attr; data1_local_attribute *local_attr; int max_pos, prefix_len = 0; termp = *term_sub; - if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value))) - { - logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", - curAttributeSet, use_value, r); - if (r == -1) - zh->errCode = 114; - else - zh->errCode = 121; - return -1; + if (use_value == -2) /* string attribute (assume IDXPATH/any) */ + { + use_value = xpath_use; + attp.local_attributes = &id_xpath_attr; + attp.attset_ordinal = VAL_IDXPATH; + id_xpath_attr.next = 0; + id_xpath_attr.local = use_value; + } + else if (curAttributeSet == VAL_IDXPATH) + { + attp.local_attributes = &id_xpath_attr; + attp.attset_ordinal = VAL_IDXPATH; + id_xpath_attr.next = 0; + id_xpath_attr.local = use_value; + } + else + { + if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value, + use_string))) + { + logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", + curAttributeSet, use_value, r); + if (r == -1) + { + char val_str[32]; + sprintf (val_str, "%d", use_value); + errString = nmem_strdup (stream, val_str); + errCode = 114; + } + else + errCode = 121; + continue; + } } if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { @@ -1761,8 +1633,8 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, local_attr = local_attr->next) { int ord; - char ord_buf[32]; - int i, ord_len; + char ord_buf[32]; + int i, ord_len; ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, local_attr->local); @@ -1773,27 +1645,37 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, else term_dict[prefix_len++] = '('; - ord_len = key_SU_encode (ord, ord_buf); - for (i = 0; ierrCode = 114; - return -1; + char val_str[32]; + sprintf (val_str, "%d", use_value); + errCode = 114; + errString = nmem_strdup (stream, val_str); + continue; } + bases_ok++; term_dict[prefix_len++] = ')'; term_dict[prefix_len++] = 1; term_dict[prefix_len++] = reg_type; - logf (LOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]); + logf (LOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]); term_dict[prefix_len] = '\0'; if (!numeric_relation (zh, zapt, &termp, term_dict, - attributeSet, grep_info, &max_pos, reg_type, - term_dst)) - return 0; + attributeSet, grep_info, &max_pos, reg_type, + term_dst)) + return 0; + } + if (!bases_ok) + { + zh->errCode = errCode; + zh->errString = errString; + return -1; } *term_sub = termp; logf (LOG_DEBUG, "%d positions", grep_info->isam_p_indx); @@ -1801,13 +1683,14 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } static RSET rpn_search_APT_numeric (ZebraHandle zh, - Z_AttributesPlusTerm *zapt, - const char *termz, - oid_value attributeSet, - NMEM stream, - int reg_type, int complete_flag, - const char *rank_type, - int num_bases, char **basenames) + Z_AttributesPlusTerm *zapt, + const char *termz, + oid_value attributeSet, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, int xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; const char *termp = termz; @@ -1816,83 +1699,86 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, struct grep_info grep_info; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) - return 0; + return 0; while (1) { - logf (LOG_DEBUG, "APT_numeric termp=%s", termp); - grep_info.isam_p_indx = 0; + logf (LOG_DEBUG, "APT_numeric termp=%s", termp); + grep_info.isam_p_indx = 0; r = numeric_term (zh, zapt, &termp, attributeSet, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst); + reg_type, complete_flag, num_bases, basenames, + term_dst, xpath_use, + stream); if (r < 1) break; - logf (LOG_DEBUG, "term: %s", term_dst); + logf (LOG_DEBUG, "term: %s", term_dst); rset[rset_no] = rset_trunc (zh, grep_info.isam_p_buf, grep_info.isam_p_indx, term_dst, - strlen(term_dst), rank_type, + strlen(term_dst), rank_type, 0 /* preserve position */, - zapt->term->which); + zapt->term->which, rset_nmem, + key_it_ctrl,key_it_ctrl->scope); assert (rset[rset_no]); if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) break; } grep_info_delete (&grep_info); if (rset_no == 0) - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (term_dst, -1, rank_type, - zapt->term->which); - return rset_create (rset_kind_null, &parms); - } + return rsnull_create (rset_nmem,key_it_ctrl); result = rset[0]; for (i = 1; iscope, + result, rset[i] ); } return result; } static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz, + const char *termz, oid_value attributeSet, - NMEM stream, - const char *rank_type) + NMEM stream, + const char *rank_type, NMEM rset_nmem) { RSET result; RSFD rsfd; struct it_key key; + int sys; + /* rset_temp_parms parms; - parms.rset_term = rset_term_create (termz, -1, rank_type, - zapt->term->which); parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); parms.temp_path = res_get (zh->res, "setTmpDir"); result = rset_create (rset_kind_temp, &parms); + */ + result = rstemp_create( rset_nmem,key_it_ctrl,key_it_ctrl->scope, + res_get (zh->res, "setTmpDir") ); rsfd = rset_open (result, RSETF_WRITE); - key.sysno = atoi (termz); + sys = atoi(termz); + if (sys <= 0) + sys = 1; +#if IT_KEY_NEW + key.mem[0] = sys; + key.mem[1] = 1; + key.len = 2; +#else + key.sysno = sys; key.seqno = 1; if (key.sysno <= 0) key.sysno = 1; - rset_write (result, rsfd, &key); - rset_close (result, rsfd); +#endif + rset_write (rsfd, &key); + rset_close (rsfd); return result; } static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, - const char *rank_type) + oid_value attributeSet, NMEM stream, + Z_SortKeySpecList *sort_sequence, + const char *rank_type) { - rset_null_parms parms; int i; int sort_relation_value; AttrType sort_relation_type; @@ -1913,205 +1799,98 @@ static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!sort_sequence->specs) { - sort_sequence->num_specs = 10; - sort_sequence->specs = (Z_SortKeySpec **) - nmem_malloc (stream, sort_sequence->num_specs * - sizeof(*sort_sequence->specs)); - for (i = 0; inum_specs; i++) - sort_sequence->specs[i] = 0; + sort_sequence->num_specs = 10; + sort_sequence->specs = (Z_SortKeySpec **) + nmem_malloc (stream, sort_sequence->num_specs * + sizeof(*sort_sequence->specs)); + for (i = 0; inum_specs; i++) + sort_sequence->specs[i] = 0; } if (zapt->term->which != Z_Term_general) - i = 0; + i = 0; else - i = atoi_n ((char *) zapt->term->u.general->buf, - zapt->term->u.general->len); + i = atoi_n ((char *) zapt->term->u.general->buf, + zapt->term->u.general->len); if (i >= sort_sequence->num_specs) - i = 0; + i = 0; sprintf (termz, "%d", i); oe.proto = PROTO_Z3950; oe.oclass = CLASS_ATTSET; oe.value = attributeSet; if (!oid_ent_to_oid (&oe, oid)) - return 0; + return 0; sks = (Z_SortKeySpec *) nmem_malloc (stream, sizeof(*sks)); sks->sortElement = (Z_SortElement *) - nmem_malloc (stream, sizeof(*sks->sortElement)); + nmem_malloc (stream, sizeof(*sks->sortElement)); sks->sortElement->which = Z_SortElement_generic; sk = sks->sortElement->u.generic = (Z_SortKey *) - nmem_malloc (stream, sizeof(*sk)); + nmem_malloc (stream, sizeof(*sk)); sk->which = Z_SortKey_sortAttributes; sk->u.sortAttributes = (Z_SortAttributes *) - nmem_malloc (stream, sizeof(*sk->u.sortAttributes)); + nmem_malloc (stream, sizeof(*sk->u.sortAttributes)); sk->u.sortAttributes->id = oid; sk->u.sortAttributes->list = (Z_AttributeList *) - nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list)); + nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list)); sk->u.sortAttributes->list->num_attributes = 1; sk->u.sortAttributes->list->attributes = (Z_AttributeElement **) - nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list->attributes)); + nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list->attributes)); ae = *sk->u.sortAttributes->list->attributes = (Z_AttributeElement *) - nmem_malloc (stream, sizeof(**sk->u.sortAttributes->list->attributes)); + nmem_malloc (stream, sizeof(**sk->u.sortAttributes->list->attributes)); ae->attributeSet = 0; - ae->attributeType = (int *) - nmem_malloc (stream, sizeof(*ae->attributeType)); + ae->attributeType = (int *) + nmem_malloc (stream, sizeof(*ae->attributeType)); *ae->attributeType = 1; ae->which = Z_AttributeValue_numeric; ae->value.numeric = (int *) - nmem_malloc (stream, sizeof(*ae->value.numeric)); + nmem_malloc (stream, sizeof(*ae->value.numeric)); *ae->value.numeric = use_value; sks->sortRelation = (int *) - nmem_malloc (stream, sizeof(*sks->sortRelation)); + nmem_malloc (stream, sizeof(*sks->sortRelation)); if (sort_relation_value == 1) - *sks->sortRelation = Z_SortRelation_ascending; + *sks->sortRelation = Z_SortKeySpec_ascending; else if (sort_relation_value == 2) - *sks->sortRelation = Z_SortRelation_descending; + *sks->sortRelation = Z_SortKeySpec_descending; else - *sks->sortRelation = Z_SortRelation_ascending; + *sks->sortRelation = Z_SortKeySpec_ascending; sks->caseSensitivity = (int *) - nmem_malloc (stream, sizeof(*sks->caseSensitivity)); + nmem_malloc (stream, sizeof(*sks->caseSensitivity)); *sks->caseSensitivity = 0; -#ifdef ASN_COMPILED sks->which = Z_SortKeySpec_null; sks->u.null = odr_nullval (); -#else - sks->missingValueAction = 0; -#endif - sort_sequence->specs[i] = sks; - - parms.rset_term = rset_term_create (termz, -1, rank_type, - zapt->term->which); - return rset_create (rset_kind_null, &parms); + return rsnull_create (NULL,key_it_ctrl); + /* FIXME - nmem?? */ } -struct xpath_predicate { - int which; - union { -#define XPATH_PREDICATE_RELATION 1 - struct { - char *name; - char *op; - char *value; - } relation; -#define XPATH_PREDICATE_BOOLEAN 2 - struct { - const char *op; - struct xpath_predicate *left; - struct xpath_predicate *right; - } boolean; - } u; -}; - -struct xpath_location_step { - char *part; - struct xpath_predicate *predicate; -}; static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, - struct xpath_location_step *xpath, NMEM mem) + struct xpath_location_step *xpath, int max, NMEM mem) { oid_value curAttributeSet = attributeSet; AttrType use; const char *use_string = 0; - const char *cp; - int no = 0; attr_init (&use, zapt, 1); attr_find_ex (&use, &curAttributeSet, &use_string); if (!use_string || *use_string != '/') return -1; - cp = use_string; - while (*cp) - { - int i = 0; - while (*cp && !strchr("/[",*cp)) - { - i++; - cp++; - } - xpath[no].predicate = 0; - xpath[no].part = nmem_malloc (mem, i+1); - memcpy (xpath[no].part, cp - i, i); - xpath[no].part[i] = 0; - - if (*cp == '[') - { - struct xpath_predicate *p = xpath[no].predicate = - nmem_malloc (mem, sizeof(struct xpath_predicate)); - - p->which = XPATH_PREDICATE_RELATION; - cp++; - while (*cp == ' ') - cp++; - - for (i = 0; *cp && !strchr("><=] ", *cp); i++) - cp++; - p->u.relation.name = nmem_malloc (mem, i+1); - memcpy (p->u.relation.name, cp - i, i); - p->u.relation.name[i] = 0; - while (*cp == ' ') - cp++; - if (*cp != ']') - { - for (i = 0; *cp && strchr(">=u.relation.op = nmem_malloc (mem, i+1); - if (i) - memcpy (p->u.relation.op, cp - i, i); - p->u.relation.op[i] = 0; - - while (*cp == ' ') - cp++; - - if (strchr("\"'", *cp)) - { - cp++; - for (i = 0; *cp && !strchr("\"'", *cp); i++) - cp++; - - p->u.relation.value = nmem_malloc (mem, i+1); - if (i) - memcpy (p->u.relation.value, cp - i, i); - p->u.relation.value[i] = 0; - yaz_log (LOG_LOG, "value=%s", p->u.relation.value); - cp++; - } - else - { - for (i = 0; *cp && !strchr(" ]", *cp); i++) - cp++; - p->u.relation.value = nmem_malloc (mem, i+1); - if (i) - memcpy (p->u.relation.value, cp - i, i); - p->u.relation.value[i] = 0; - } - while (*cp == ' ') - cp++; - } - if (*cp == ']') - cp++; - } /* end of ] predicate */ - no++; - if (*cp != '/') - break; - cp++; - } - return no; + return zebra_parse_xpath_str(use_string, xpath, max, mem); } - + + static RSET xpath_trunc(ZebraHandle zh, NMEM stream, int reg_type, const char *term, int use, - oid_value curAttributeSet) + oid_value curAttributeSet, NMEM rset_nmem) { RSET rset; struct grep_info grep_info; @@ -2120,12 +1899,14 @@ 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 term_type = Z_Term_characterString; + const char *flags = "void"; if (grep_info_prepare (zh, 0 /* zapt */, &grep_info, '0', stream)) - return 0; + return rsnull_create (rset_nmem,key_it_ctrl); if (ord < 0) - return 0; + return rsnull_create (rset_nmem,key_it_ctrl); if (prefix_len) term_dict[prefix_len++] = '|'; else @@ -2150,7 +1931,8 @@ 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), - "void", 1, Z_Term_characterString); + flags, 1, term_type,rset_nmem, + key_it_ctrl, key_it_ctrl->scope); grep_info_delete (&grep_info); return rset; } @@ -2159,7 +1941,8 @@ static RSET rpn_search_xpath (ZebraHandle zh, oid_value attributeSet, int num_bases, char **basenames, NMEM stream, const char *rank_type, RSET rset, - int xpath_len, struct xpath_location_step *xpath) + int xpath_len, struct xpath_location_step *xpath, + NMEM rset_nmem) { oid_value curAttributeSet = attributeSet; int base_no; @@ -2213,7 +1996,6 @@ static RSET rpn_search_xpath (ZebraHandle zh, { char xpath_rev[128]; int i, len; - rset_between_parms parms; RSET rset_start_tag = 0, rset_end_tag = 0, rset_attr = 0; *xpath_rev = 0; @@ -2252,18 +2034,26 @@ static RSET rpn_search_xpath (ZebraHandle zh, xpath[level].predicate->which == XPATH_PREDICATE_RELATION && xpath[level].predicate->u.relation.name[0]) { - char predicate_str[128]; - - strcpy (predicate_str, - xpath[level].predicate->u.relation.name+1); + WRBUF wbuf = wrbuf_alloc(); + wrbuf_puts(wbuf, xpath[level].predicate->u.relation.name+1); if (xpath[level].predicate->u.relation.value) { - strcat (predicate_str, "="); - strcat (predicate_str, - xpath[level].predicate->u.relation.value); + const char *cp = xpath[level].predicate->u.relation.value; + wrbuf_putc(wbuf, '='); + + while (*cp) + { + if (strchr(REGEX_CHARS, *cp)) + wrbuf_putc(wbuf, '\\'); + wrbuf_putc(wbuf, *cp); + cp++; + } } + wrbuf_puts(wbuf, ""); rset_attr = xpath_trunc ( - zh, stream, '0', predicate_str, 3, curAttributeSet); + zh, stream, '0', wrbuf_buf(wbuf), 3, + curAttributeSet,rset_nmem); + wrbuf_free(wbuf, 1); } else { @@ -2271,14 +2061,15 @@ static RSET rpn_search_xpath (ZebraHandle zh, continue; } yaz_log (LOG_LOG, "xpath_rev (%d) = %s", level, xpath_rev); - if (strlen(xpath_rev)) - { - rset_start_tag = xpath_trunc(zh, stream, - '0', xpath_rev, 1, curAttributeSet); - - rset_end_tag = xpath_trunc(zh, stream, - '0', xpath_rev, 2, curAttributeSet); + if (strlen(xpath_rev)) + { + rset_start_tag = xpath_trunc(zh, stream, '0', + xpath_rev, 1, curAttributeSet, rset_nmem); + rset_end_tag = xpath_trunc(zh, stream, '0', + xpath_rev, 2, curAttributeSet, rset_nmem); + + /* parms.key_size = sizeof(struct it_key); parms.cmp = key_compare_it; parms.rset_l = rset_start_tag; @@ -2287,6 +2078,9 @@ static RSET rpn_search_xpath (ZebraHandle zh, parms.rset_attr = rset_attr; parms.printer = key_print_it; rset = rset_create (rset_kind_between, &parms); + */ + rset=rsbetween_create( rset_nmem,key_it_ctrl,key_it_ctrl->scope, + rset_start_tag, rset, rset_end_tag, rset_attr); } first_path = 0; } @@ -2299,8 +2093,9 @@ static RSET rpn_search_xpath (ZebraHandle zh, static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, - int num_bases, char **basenames) + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + NMEM rset_nmem) { unsigned reg_id; char *search_type = NULL; @@ -2314,20 +2109,20 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, struct xpath_location_step xpath[10]; zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, - rank_type, &complete_flag, &sort_flag); + rank_type, &complete_flag, &sort_flag); logf (LOG_DEBUG, "reg_id=%c", reg_id); logf (LOG_DEBUG, "complete_flag=%d", complete_flag); logf (LOG_DEBUG, "search_type=%s", search_type); logf (LOG_DEBUG, "rank_type=%s", rank_type); - if (trans_term (zh, zapt, termz)) + if (zapt_term_to_utf8(zh, zapt, termz)) return 0; if (sort_flag) - return rpn_sort_spec (zh, zapt, attributeSet, stream, sort_sequence, - rank_type); - xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, stream); + return rpn_sort_spec (zh, zapt, attributeSet, stream, sort_sequence, + rank_type); + xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, 10, stream); if (xpath_len >= 0) { xpath_use = 1016; @@ -2337,35 +2132,36 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!strcmp (search_type, "phrase")) { - rset = rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream, - reg_id, complete_flag, rank_type, + rset = rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "and-list")) { - rset = rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream, - reg_id, complete_flag, rank_type, + rset = rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "or-list")) { - rset = rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream, - reg_id, complete_flag, rank_type, + rset = rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "local")) { rset = rpn_search_APT_local (zh, zapt, termz, attributeSet, stream, - rank_type); + rank_type, rset_nmem); } else if (!strcmp (search_type, "numeric")) { - rset = rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream, - reg_id, complete_flag, rank_type, - num_bases, basenames); + rset = rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "always")) { @@ -2374,65 +2170,59 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, else zh->errCode = 118; return rpn_search_xpath (zh, attributeSet, num_bases, basenames, - stream, rank_type, rset, xpath_len, xpath); + stream, rank_type, rset, + xpath_len, xpath, rset_nmem); } static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, - oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, + Z_SortKeySpecList *sort_sequence, int num_bases, char **basenames) { RSET r = NULL; if (zs->which == Z_RPNStructure_complex) { Z_Operator *zop = zs->u.complex->roperator; - rset_bool_parms bool_parms; - - bool_parms.rset_l = rpn_search_structure (zh, zs->u.complex->s1, - attributeSet, stream, - sort_sequence, - num_bases, basenames); - if (bool_parms.rset_l == NULL) + RSET rset_l; + RSET rset_r; + + rset_l = rpn_search_structure (zh, zs->u.complex->s1, + attributeSet, stream, rset_nmem, + sort_sequence, + num_bases, basenames); + if (rset_l == NULL) return NULL; - bool_parms.rset_r = rpn_search_structure (zh, zs->u.complex->s2, - attributeSet, stream, - sort_sequence, - num_bases, basenames); - if (bool_parms.rset_r == NULL) + rset_r = rpn_search_structure (zh, zs->u.complex->s2, + attributeSet, stream, rset_nmem, + sort_sequence, + num_bases, basenames); + if (rset_r == NULL) { - rset_delete (bool_parms.rset_l); + rset_delete (rset_l); return NULL; } - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; switch (zop->which) { case Z_Operator_and: - r = rset_create (rset_kind_and, &bool_parms); + r = rsbool_create_and(rset_nmem,key_it_ctrl, key_it_ctrl->scope, + rset_l,rset_r ); break; case Z_Operator_or: - r = rset_create (rset_kind_or, &bool_parms); + r = rsbool_create_or(rset_nmem,key_it_ctrl, key_it_ctrl->scope, + rset_l,rset_r ); break; case Z_Operator_and_not: - r = rset_create (rset_kind_not, &bool_parms); + r = rsbool_create_not(rset_nmem,key_it_ctrl, key_it_ctrl->scope, + rset_l,rset_r ); break; case Z_Operator_prox: -#ifdef ASN_COMPILED if (zop->u.prox->which != Z_ProximityOperator_known) { zh->errCode = 132; return NULL; } -#else - if (zop->u.prox->which != Z_ProxCode_known) - { - zh->errCode = 132; - return NULL; - } -#endif - -#ifdef ASN_COMPILED if (*zop->u.prox->u.known != Z_ProxUnit_word) { char *val = (char *) nmem_malloc (stream, 16); @@ -2441,32 +2231,21 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, sprintf (val, "%d", *zop->u.prox->u.known); return NULL; } -#else - if (*zop->u.prox->proximityUnitCode != Z_ProxUnit_word) + else { - char *val = (char *) nmem_malloc (stream, 16); - zh->errCode = 132; - zh->errString = val; - sprintf (val, "%d", *zop->u.prox->proximityUnitCode); - return NULL; + /* new / old prox */ + RSET twosets[2]; + + twosets[0] = rset_l; + twosets[1] = rset_r; + r=rsprox_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, + 2, twosets, + *zop->u.prox->ordered, + (!zop->u.prox->exclusion ? + 0 : *zop->u.prox->exclusion), + *zop->u.prox->relationType, + *zop->u.prox->distance ); } -#endif - else - { - RSET rsets[2]; - - rsets[0] = bool_parms.rset_l; - rsets[1] = bool_parms.rset_r; - - r = rpn_prox (zh, rsets, 2, - *zop->u.prox->ordered, - (!zop->u.prox->exclusion ? 0 : - *zop->u.prox->exclusion), - *zop->u.prox->relationType, - *zop->u.prox->distance); - rset_delete (rsets[0]); - rset_delete (rsets[1]); - } break; default: zh->errCode = 110; @@ -2480,20 +2259,22 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, logf (LOG_DEBUG, "rpn_search_APT"); r = rpn_search_APT (zh, zs->u.simple->u.attributesPlusTerm, attributeSet, stream, sort_sequence, - num_bases, basenames); + num_bases, basenames,rset_nmem); } else if (zs->u.simple->which == Z_Operand_resultSetId) { logf (LOG_DEBUG, "rpn_search_ref"); r = resultSetRef (zh, zs->u.simple->u.resultSetId); - if (!r) - { - r = rset_create (rset_kind_null, NULL); - zh->errCode = 30; - zh->errString = - nmem_strdup (stream, zs->u.simple->u.resultSetId); - return 0; - } + if (!r) + { + r = rsnull_create (rset_nmem,key_it_ctrl); + zh->errCode = 30; + zh->errString = + nmem_strdup (stream, zs->u.simple->u.resultSetId); + return 0; + } + else + rset_dup(r); } else { @@ -2510,10 +2291,10 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, } -RSET rpn_search (ZebraHandle zh, NMEM nmem, - Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname, - ZebraSet sset) +RSET rpn_search (ZebraHandle zh, NMEM nmem, NMEM rset_nmem, + Z_RPNQuery *rpn, int num_bases, char **basenames, + const char *setname, + ZebraSet sset) { RSET rset; oident *attrset; @@ -2526,45 +2307,46 @@ RSET rpn_search (ZebraHandle zh, NMEM nmem, zh->hits = 0; sort_sequence = (Z_SortKeySpecList *) - nmem_malloc (nmem, sizeof(*sort_sequence)); + nmem_malloc (nmem, sizeof(*sort_sequence)); sort_sequence->num_specs = 10; sort_sequence->specs = (Z_SortKeySpec **) - nmem_malloc (nmem, sort_sequence->num_specs * - sizeof(*sort_sequence->specs)); + nmem_malloc (nmem, sort_sequence->num_specs * + sizeof(*sort_sequence->specs)); for (i = 0; inum_specs; i++) - sort_sequence->specs[i] = 0; + sort_sequence->specs[i] = 0; attrset = oid_getentbyoid (rpn->attributeSetId); attributeSet = attrset->value; rset = rpn_search_structure (zh, rpn->RPNStructure, attributeSet, - nmem, sort_sequence, num_bases, basenames); + nmem, rset_nmem, + sort_sequence, num_bases, basenames); if (!rset) - return 0; + return 0; if (zh->errCode) logf (LOG_DEBUG, "search error: %d", zh->errCode); for (i = 0; sort_sequence->specs[i]; i++) - ; + ; sort_sequence->num_specs = i; if (!i) - resultSetRank (zh, sset, rset); + resultSetRank (zh, sset, rset); else { - logf (LOG_DEBUG, "resultSetSortSingle in rpn_search"); - resultSetSortSingle (zh, nmem, sset, rset, - sort_sequence, &sort_status); - if (zh->errCode) - { - logf (LOG_DEBUG, "resultSetSortSingle status = %d", zh->errCode); - } + logf (LOG_DEBUG, "resultSetSortSingle in rpn_search"); + resultSetSortSingle (zh, nmem, sset, rset, + sort_sequence, &sort_status); + if (zh->errCode) + { + logf (LOG_DEBUG, "resultSetSortSingle status = %d", zh->errCode); + } } return rset; } struct scan_info_entry { char *term; - ISAMS_P isam_p; + ISAMC_P isam_p; }; struct scan_info { @@ -2586,54 +2368,82 @@ static int scan_handle (char *name, const char *info, int pos, void *client) else idx = - pos - 1; scan_info->list[idx].term = (char *) - odr_malloc (scan_info->odr, strlen(name + len_prefix)+1); + odr_malloc (scan_info->odr, strlen(name + len_prefix)+1); strcpy (scan_info->list[idx].term, name + len_prefix); - assert (*info == sizeof(ISAMS_P)); - memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAMS_P)); + assert (*info == sizeof(ISAMC_P)); + memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAMC_P)); return 0; } static void scan_term_untrans (ZebraHandle zh, NMEM stream, int reg_type, - char **dst, const char *src) + char **dst, const char *src) { - char term_dst[1024]; - - term_untrans (zh, reg_type, term_dst, src); + char term_src[IT_MAX_WORD]; + char term_dst[IT_MAX_WORD]; - *dst = (char *) nmem_malloc (stream, strlen(term_dst)+1); - strcpy (*dst, term_dst); + term_untrans (zh, reg_type, term_src, src); + + if (zh->iconv_from_utf8 != 0) + { + int len; + char *inbuf = term_src; + size_t inleft = strlen(term_src); + 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)) + len = 0; + else + len = outbuf - term_dst; + *dst = nmem_malloc (stream, len + 1); + if (len > 0) + memcpy (*dst, term_dst, len); + (*dst)[len] = '\0'; + } + else + *dst = nmem_strdup (stream, term_src); } static void count_set (RSET r, int *count) { - int psysno = 0; + zint psysno = 0; int kno = 0; struct it_key key; RSFD rfd; - int term_index; logf (LOG_DEBUG, "count_set"); *count = 0; rfd = rset_open (r, RSETF_READ); - while (rset_read (r, rfd, &key, &term_index)) + while (rset_read (rfd, &key)) { +#if IT_KEY_NEW + if (key.mem[0] != psysno) + { + psysno = key.mem[0]; + (*count)++; + } +#else if (key.sysno != psysno) { psysno = key.sysno; (*count)++; } +#endif kno++; } - rset_close (r, rfd); + rset_close (rfd); logf (LOG_DEBUG, "%d keys, %d records", kno, *count); } void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int num_bases, char **basenames, - int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial) + oid_value attributeset, + int num_bases, char **basenames, + int *position, int *num_entries, ZebraScanEntry **list, + int *is_partial, RSET limit_set, int return_zero) { int i; int pos = *position; @@ -2644,33 +2454,66 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, char termz[IT_MAX_WORD+20]; AttrType use; int use_value; + const char *use_string = 0; struct scan_info *scan_info_array; ZebraScanEntry *glist; int ords[32], ord_no = 0; int ptr[32]; + int bases_ok = 0; /* no of databases with OK attribute */ + int errCode = 0; /* err code (if any is not OK) */ + char *errString = 0; /* addinfo */ + unsigned reg_id; char *search_type = NULL; char rank_type[128]; int complete_flag; int sort_flag; + NMEM rset_nmem=NULL; + *list = 0; if (attributeset == VAL_NONE) attributeset = VAL_BIB1; + if (!limit_set) + { + AttrType termset; + int termset_value_numeric; + const char *termset_value_string; + attr_init (&termset, zapt, 8); + termset_value_numeric = + attr_find_ex (&termset, NULL, &termset_value_string); + if (termset_value_numeric != -1) + { + char resname[32]; + const char *termset_name = 0; + + if (termset_value_numeric != -2) + { + + sprintf (resname, "%d", termset_value_numeric); + termset_name = resname; + } + else + termset_name = termset_value_string; + + limit_set = resultSetRef (zh, termset_name); + } + } + yaz_log (LOG_DEBUG, "position = %d, num = %d set=%d", pos, num, attributeset); attr_init (&use, zapt, 1); - use_value = attr_find (&use, &attributeset); + use_value = attr_find_ex (&use, &attributeset, &use_string); if (zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, - rank_type, &complete_flag, &sort_flag)) + rank_type, &complete_flag, &sort_flag)) { - *num_entries = 0; - zh->errCode = 113; - return ; + *num_entries = 0; + zh->errCode = 113; + return ; } yaz_log (LOG_DEBUG, "use_value = %d", use_value); @@ -2678,80 +2521,99 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, use_value = 1016; for (base_no = 0; base_no < num_bases && ord_no < 32; base_no++) { - int r; + int r; attent attp; data1_local_attribute *local_attr; - if ((r=att_getentbyatt (zh, &attp, attributeset, use_value))) + if ((r=att_getentbyatt (zh, &attp, attributeset, use_value, + use_string))) { logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d", attributeset, use_value); - if (r == -1) - zh->errCode = 114; - else - zh->errCode = 121; - *num_entries = 0; - return; + if (r == -1) + { + char val_str[32]; + sprintf (val_str, "%d", use_value); + errCode = 114; + errString = odr_strdup (stream, val_str); + } + else + errCode = 121; + continue; } if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { zh->errString = basenames[base_no]; - zh->errCode = 109; /* Database unavailable */ - *num_entries = 0; - return; + zh->errCode = 109; /* Database unavailable */ + *num_entries = 0; + return; } + bases_ok++; for (local_attr = attp.local_attributes; local_attr && ord_no < 32; local_attr = local_attr->next) { int ord; ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, - local_attr->local); + local_attr->local); if (ord > 0) ords[ord_no++] = ord; } } + if (!bases_ok && errCode) + { + zh->errCode = errCode; + zh->errString = errString; + *num_entries = 0; + } if (ord_no == 0) { - *num_entries = 0; - zh->errCode = 113; - return; + char val_str[32]; + sprintf (val_str, "%d", use_value); + zh->errCode = 114; + zh->errString = odr_strdup (stream, val_str); + + *num_entries = 0; + return; } /* prepare dictionary scanning */ before = pos-1; after = 1+num-pos; scan_info_array = (struct scan_info *) - odr_malloc (stream, ord_no * sizeof(*scan_info_array)); + odr_malloc (stream, ord_no * sizeof(*scan_info_array)); for (i = 0; i < ord_no; i++) { int j, prefix_len = 0; int before_tmp = before, after_tmp = after; struct scan_info *scan_info = scan_info_array + i; - struct rpn_char_map_info rcmi; + struct rpn_char_map_info rcmi; - rpn_char_map_prepare (zh->reg, reg_id, &rcmi); + rpn_char_map_prepare (zh->reg, reg_id, &rcmi); scan_info->before = before; scan_info->after = after; scan_info->odr = stream; scan_info->list = (struct scan_info_entry *) - odr_malloc (stream, (before+after) * sizeof(*scan_info->list)); + odr_malloc (stream, (before+after) * sizeof(*scan_info->list)); for (j = 0; jlist[j].term = NULL; - prefix_len += key_SU_encode (ords[i], termz + prefix_len); + prefix_len += key_SU_encode (ords[i], termz + prefix_len); termz[prefix_len++] = reg_id; termz[prefix_len] = 0; strcpy (scan_info->prefix, termz); - trans_scan_term (zh, zapt, termz+prefix_len, reg_id); + if (trans_scan_term (zh, zapt, termz+prefix_len, reg_id)) + return ; dict_scan (zh->reg->dict, termz, &before_tmp, &after_tmp, - scan_info, scan_handle); + scan_info, scan_handle); } glist = (ZebraScanEntry *) - odr_malloc (stream, (before+after)*sizeof(*glist)); + odr_malloc (stream, (before+after)*sizeof(*glist)); + + rset_nmem=nmem_create(); /* consider terms after main term */ for (i = 0; i < ord_no; i++) @@ -2778,11 +2640,11 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, if (j0 == -1) break; scan_term_untrans (zh, stream->mem, reg_id, - &glist[i+before].term, mterm); + &glist[i+before].term, mterm); rset = rset_trunc (zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1, - glist[i+before].term, strlen(glist[i+before].term), - NULL, 0, zapt->term->which); - + glist[i+before].term, strlen(glist[i+before].term), + NULL, 0, zapt->term->which, rset_nmem, + key_it_ctrl,key_it_ctrl->scope); ptr[j0]++; for (j = j0+1; jterm->which); - - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; - bool_parms.rset_r = rset2; - - rset = rset_create (rset_kind_or, &bool_parms); + glist[i+before].term, + strlen(glist[i+before].term), NULL, 0, + zapt->term->which,rset_nmem, + key_it_ctrl, key_it_ctrl->scope); + rset = rsbool_create_or(rset_nmem,key_it_ctrl, + key_it_ctrl->scope, rset, rset2); + /* FIXME - Use a proper multi-or */ ptr[j]++; } } + if (limit_set) + rset = rsbool_create_and(rset_nmem,key_it_ctrl,key_it_ctrl->scope, + rset, rset_dup(limit_set)); count_set (rset, &glist[i+before].occurrences); rset_delete (rset); } @@ -2843,12 +2704,13 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, break; scan_term_untrans (zh, stream->mem, reg_id, - &glist[before-1-i].term, mterm); + &glist[before-1-i].term, mterm); rset = rset_trunc (zh, &scan_info_array[j0].list[before-1-ptr[j0]].isam_p, 1, - glist[before-1-i].term, strlen(glist[before-1-i].term), - NULL, 0, zapt->term->which); + glist[before-1-i].term, strlen(glist[before-1-i].term), + NULL, 0, zapt->term->which,rset_nmem, + key_it_ctrl,key_it_ctrl->scope); ptr[j0]++; @@ -2858,25 +2720,23 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, (tst=scan_info_array[j].list[before-1-ptr[j]].term) && !strcmp (tst, mterm)) { - rset_bool_parms bool_parms; RSET rset2; rset2 = rset_trunc (zh, &scan_info_array[j].list[before-1-ptr[j]].isam_p, 1, - glist[before-1-i].term, - strlen(glist[before-1-i].term), NULL, 0, - zapt->term->which); - - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - bool_parms.rset_l = rset; - bool_parms.rset_r = rset2; - - rset = rset_create (rset_kind_or, &bool_parms); - + glist[before-1-i].term, + strlen(glist[before-1-i].term), NULL, 0, + zapt->term->which, rset_nmem, + key_it_ctrl, key_it_ctrl->scope); + rset = rsbool_create_and(rset_nmem,key_it_ctrl, + key_it_ctrl->scope, rset, rset2); + /* FIXME - multi-and ?? */ ptr[j]++; } } + if (limit_set) + rset = rsbool_create_and(rset_nmem,key_it_ctrl,key_it_ctrl->scope, + rset, rset_dup(limit_set)); count_set (rset, &glist[before-1-i].occurrences); rset_delete (rset); } @@ -2887,6 +2747,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, *position -= i; *num_entries -= i; } + + nmem_destroy(rset_nmem); *list = glist + i; /* list is set to first 'real' entry */ logf (LOG_DEBUG, "position = %d, num_entries = %d",