X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzrpn.c;h=0a9716f6c732abda9b6eccbe8dee0171f7b98612;hp=710a6999de9ca763f56adcb0cd1a98ddc532be55;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hpb=e5b0bb88921b593c89dd6ae9077c6566bc8a6a91 diff --git a/index/zrpn.c b/index/zrpn.c index 710a699..4ae0937 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,411 +1,78 @@ -/* - * Copyright (C) 1995-1998, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: zrpn.c,v $ - * Revision 1.86 1998-09-22 10:48:20 adam - * Minor changes in search API. - * - * Revision 1.85 1998/09/22 10:03:43 adam - * Changed result sets to be persistent in the sense that they can - * be re-searched if needed. - * Fixed memory leak in rsm_or. - * - * Revision 1.84 1998/09/18 12:41:00 adam - * Fixed bug with numerical relations. - * - * Revision 1.83 1998/09/02 13:53:19 adam - * Extra parameter decode added to search routines to implement - * persistent queries. - * - * Revision 1.82 1998/06/26 11:16:40 quinn - * Added support (un-optimised) for left and left/right truncation - * - * Revision 1.81 1998/06/24 12:16:14 adam - * Support for relations on text operands. Open range support in - * DFA module (i.e. [-j], [g-]). - * - * Revision 1.80 1998/06/23 15:33:34 adam - * Added feature to specify sort criteria in query (type 7 specifies - * sort flags). - * - * Revision 1.79 1998/06/22 11:35:09 adam - * Minor changes. - * - * Revision 1.78 1998/06/08 14:43:17 adam - * Added suport for EXPLAIN Proxy servers - added settings databasePath - * and explainDatabase to facilitate this. Increased maximum number - * of databases and attributes in one register. - * - * Revision 1.77 1998/05/20 10:12:22 adam - * Implemented automatic EXPLAIN database maintenance. - * Modified Zebra to work with ASN.1 compiled version of YAZ. - * - * Revision 1.76 1998/04/02 14:35:29 adam - * First version of Zebra that works with compiled ASN.1. - * - * Revision 1.75 1998/03/05 08:45:13 adam - * New result set model and modular ranking system. Moved towards - * descent server API. System information stored as "SGML" records. - * - * Revision 1.74 1998/02/10 12:03:06 adam - * Implemented Sort. - * - * Revision 1.73 1998/01/29 13:40:11 adam - * Better logging for scan service. - * - * Revision 1.72 1998/01/07 13:53:41 adam - * Queries using simple ranked operands returns right number of hits. - * - * Revision 1.71 1997/12/18 10:54:24 adam - * New method result set method rs_hits that returns the number of - * hits in result-set (if known). The ranked result set returns real - * number of hits but only when not combined with other operands. - * - * Revision 1.70 1997/10/31 12:34:43 adam - * Changed a few log statements. - * - * Revision 1.69 1997/10/29 12:05:02 adam - * Server produces diagnostic "Unsupported Attribute Set" when appropriate. - * - * Revision 1.68 1997/10/27 14:33:06 adam - * Moved towards generic character mapping depending on "structure" - * field in abstract syntax file. Fixed a few memory leaks. Fixed - * bug with negative integers when doing searches with relational - * operators. - * - * Revision 1.67 1997/09/29 09:06:10 adam - * Removed one static var in order to make this module thread safe. - * - * Revision 1.66 1997/09/25 14:58:03 adam - * Windows NT port. - * - * Revision 1.65 1997/09/22 12:39:06 adam - * Added get_pos method for the ranked result sets. - * - * Revision 1.64 1997/09/18 08:59:20 adam - * Extra generic handle for the character mapping routines. - * - * Revision 1.63 1997/09/17 12:19:18 adam - * Zebra version corresponds to YAZ version 1.4. - * Changed Zebra server so that it doesn't depend on global common_resource. - * - * Revision 1.62 1997/09/05 15:30:09 adam - * Changed prototype for chr_map_input - added const. - * Added support for C++, headers uses extern "C" for public definitions. - * - * Revision 1.61 1997/02/10 10:21:14 adam - * Bug fix: in search terms character (^) wasn't observed. - * - * Revision 1.60 1997/01/31 11:10:34 adam - * Bug fix: Leading and trailing white space weren't removed in scan tokens. - * - * Revision 1.59 1997/01/17 11:31:46 adam - * Bug fix: complete phrase search didn't work. - * - * Revision 1.58 1996/12/23 15:30:45 adam - * Work on truncation. - * Bug fix: result sets weren't deleted after server shut down. - * - * Revision 1.57 1996/11/11 13:38:02 adam - * Added proximity support in search. - * - * Revision 1.56 1996/11/08 11:10:32 adam - * Buffers used during file match got bigger. - * Compressed ISAM support everywhere. - * Bug fixes regarding masking characters in queries. - * Redesigned Regexp-2 queries. - * - * Revision 1.55 1996/11/04 14:07:44 adam - * Moved truncation code to trunc.c. - * - * Revision 1.54 1996/10/29 14:09:52 adam - * Use of cisam system - enabled if setting isamc is 1. - * - * Revision 1.53 1996/06/26 09:21:43 adam - * Bug fix: local attribute set wasn't obeyed in scan. - * - * Revision 1.52 1996/06/17 14:26:20 adam - * Function gen_regular_rel changed to handle negative numbers. - * - * Revision 1.51 1996/06/11 10:54:15 quinn - * Relevance work - * - * Revision 1.50 1996/06/07 08:51:53 adam - * Bug fix: Character mapping was broken (introducued by last revision). - * - * Revision 1.49 1996/06/04 10:18:11 adam - * Search/scan uses character mapping module. - * - * Revision 1.48 1996/05/28 15:15:01 adam - * Bug fix: Didn't handle unknown database correctly. - * - * Revision 1.47 1996/05/15 18:36:28 adam - * Function trans_term transforms unsearchable characters to blanks. - * - * Revision 1.46 1996/05/15 11:57:56 adam - * Fixed bug introduced by set/field mapping in search operations. - * - * Revision 1.45 1996/05/14 11:34:00 adam - * Scan support in multiple registers/databases. - * - * Revision 1.44 1996/05/14 06:16:44 adam - * Compact use/set bytes used in search service. - * - * Revision 1.43 1996/05/09 09:54:43 adam - * Server supports maps from one logical attributes to a list of physical - * attributes. - * The extraction process doesn't make space consuming 'any' keys. - * - * Revision 1.42 1996/05/09 07:28:56 quinn - * Work towards phrases and multiple registers - * - * Revision 1.41 1996/03/20 09:36:43 adam - * Function dict_lookup_grep got extra parameter, init_pos, which marks - * from which position in pattern approximate pattern matching should occur. - * Approximate pattern matching is used in relevance=re-2. - * - * Revision 1.40 1996/02/02 13:44:44 adam - * The public dictionary functions simply use char instead of Dict_char - * to represent search strings. Dict_char is used internally only. - * - * Revision 1.39 1996/01/03 16:22:13 quinn - * operator->roperator - * - * Revision 1.38 1995/12/11 09:12:55 adam - * The rec_get function returns NULL if record doesn't exist - will - * happen in the server if the result set records have been deleted since - * the creation of the set (i.e. the search). - * The server saves a result temporarily if it is 'volatile', i.e. the - * set is register dependent. - * - * Revision 1.37 1995/12/06 15:05:28 adam - * More verbose in count_set. - * - * Revision 1.36 1995/12/06 12:41:27 adam - * New command 'stat' for the index program. - * Filenames can be read from stdin by specifying '-'. - * Bug fix/enhancement of the transformation from terms to regular - * expressons in the search engine. - * - * Revision 1.35 1995/11/27 09:29:00 adam - * Bug fixes regarding conversion to regular expressions. - * - * Revision 1.34 1995/11/16 17:00:56 adam - * Better logging of rpn query. - * - * Revision 1.33 1995/11/01 13:58:28 quinn - * Moving data1 to yaz/retrieval - * - * Revision 1.32 1995/10/27 14:00:11 adam - * Implemented detection of database availability. - * - * Revision 1.31 1995/10/17 18:02:10 adam - * New feature: databases. Implemented as prefix to words in dictionary. - * - * Revision 1.30 1995/10/16 09:32:38 adam - * More work on relational op. - * - * Revision 1.29 1995/10/13 16:01:49 adam - * Work on relations. - * - * Revision 1.28 1995/10/13 12:26:43 adam - * Optimization of truncation. - * - * Revision 1.27 1995/10/12 17:07:22 adam - * Truncation works. - * - * Revision 1.26 1995/10/12 12:40:54 adam - * Bug fixes in rpn_prox. - * - * Revision 1.25 1995/10/10 13:59:24 adam - * Function rset_open changed its wflag parameter to general flags. - * - * Revision 1.24 1995/10/09 16:18:37 adam - * Function dict_lookup_grep got extra client data parameter. - * - * Revision 1.23 1995/10/06 16:33:37 adam - * Use attribute mappings. - * - * Revision 1.22 1995/10/06 15:07:39 adam - * Structure 'local-number' handled. - * - * Revision 1.21 1995/10/06 13:52:06 adam - * Bug fixes. Handler may abort further scanning. - * - * Revision 1.20 1995/10/06 11:06:33 adam - * Scan entries include 'occurrences' now. - * - * Revision 1.19 1995/10/06 10:43:56 adam - * Scan added. 'occurrences' in scan entries not set yet. - * - * Revision 1.18 1995/10/04 16:57:20 adam - * Key input and merge sort in one pass. - * - * Revision 1.17 1995/10/04 12:55:17 adam - * Bug fix in ranked search. Use=Any keys inserted. - * - * Revision 1.16 1995/10/02 16:24:40 adam - * Use attribute actually used in search requests. - * - * Revision 1.15 1995/10/02 15:18:52 adam - * New member in recRetrieveCtrl: diagnostic. - * - * Revision 1.14 1995/09/28 12:10:32 adam - * Bug fixes. Field prefix used in queries. - * - * Revision 1.13 1995/09/18 14:17:50 adam - * Minor changes. - * - * Revision 1.12 1995/09/15 14:45:21 adam - * Retrieve control. - * Work on truncation. - * - * Revision 1.11 1995/09/14 11:53:27 adam - * First work on regular expressions/truncations. - * - * Revision 1.10 1995/09/11 15:23:26 adam - * More work on relevance search. - * - * Revision 1.9 1995/09/11 13:09:35 adam - * More work on relevance feedback. - * - * Revision 1.8 1995/09/08 14:52:27 adam - * Minor changes. Dictionary is lower case now. - * - * Revision 1.7 1995/09/07 13:58:36 adam - * New parameter: result-set file descriptor (RSFD) to support multiple - * positions within the same result-set. - * Boolean operators: and, or, not implemented. - * Result-set references. - * - * Revision 1.6 1995/09/06 16:11:18 adam - * Option: only one word key per file. - * - * Revision 1.5 1995/09/06 10:33:04 adam - * More work on present. Some log messages removed. - * - * Revision 1.4 1995/09/05 15:28:40 adam - * More work on search engine. - * - * Revision 1.3 1995/09/04 15:20:22 adam - * Minor changes. - * - * Revision 1.2 1995/09/04 12:33:43 adam - * Various cleanup. YAZ util used instead. - * - * Revision 1.1 1995/09/04 09:10:40 adam - * More work on index add/del/update. - * Merge sort implemented. - * Initial work on z39 server. - * - */ +/* $Id: zrpn.c,v 1.228 2006-09-08 14:40:53 adam Exp $ + Copyright (C) 1995-2006 + 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 this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + #include #include -#ifdef WINDOWS +#ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include -#include "zserver.h" - +#include +#include "index.h" +#include +#include #include -#include -#include -#include +#include -struct rpn_char_map_info { +struct rpn_char_map_info +{ ZebraMaps zm; int reg_type; }; -static const char **rpn_char_map_handler (void *vp, const char **from, int len) -{ - struct rpn_char_map_info *p = vp; - return zebra_maps_input (p->zm, p->reg_type, from, len); -} - -static void rpn_char_map_prepare (ZebraHandle zh, int reg_type, - struct rpn_char_map_info *map_info) -{ - map_info->zm = zh->zebra_maps; - map_info->reg_type = reg_type; - dict_grep_cmap (zh->dict, map_info, rpn_char_map_handler); -} +static int log_level_set = 0; +static int log_level_rpn = 0; -typedef struct { - int type; - int major; - int minor; - Z_AttributesPlusTerm *zapt; -} AttrType; +#define TERMSET_DISABLE 1 -static int attr_find (AttrType *src, oid_value *attributeSetP) +static const char **rpn_char_map_handler(void *vp, const char **from, int len) { - 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) + struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp; + const char **out = zebra_maps_input(p->zm, p->reg_type, from, len, 0); +#if 0 + if (out && *out) { - 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) + const char *outp = *out; + yaz_log(YLOG_LOG, "---"); + while (*outp) { - switch (element->which) - { - case Z_AttributeValue_numeric: - ++(src->major); - if (element->attributeSet && attributeSetP) - { - oident *attrset; - - attrset = oid_getentbyoid (element->attributeSet); - *attributeSetP = attrset->value; - } - return *element->value.numeric; - break; - case Z_AttributeValue_complex: - if (src->minor >= element->value.complex->num_list || - element->value.complex->list[src->minor]->which != - Z_StringOrNumeric_numeric) - break; - ++(src->minor); - if (element->attributeSet && attributeSetP) - { - oident *attrset; - - attrset = oid_getentbyoid (element->attributeSet); - *attributeSetP = attrset->value; - } - return *element->value.complex->list[src->minor-1]->u.numeric; - default: - assert (0); - } + yaz_log(YLOG_LOG, "%02X", *outp); + outp++; } - ++(src->major); } - return -1; +#endif + return out; } -static void attr_init (AttrType *src, Z_AttributesPlusTerm *zapt, - int type) +static void rpn_char_map_prepare(struct zebra_register *reg, int reg_type, + struct rpn_char_map_info *map_info) { - src->zapt = zapt; - src->type = type; - src->major = 0; - src->minor = 0; + map_info->zm = reg->zebra_maps; + map_info->reg_type = reg_type; + dict_grep_cmap(reg->dict, map_info, rpn_char_map_handler); } #define TERM_COUNT @@ -419,23 +86,38 @@ struct grep_info { int isam_p_indx; ZebraHandle zh; int reg_type; + ZebraSet termset; }; -static void term_untrans (ZebraHandle zh, int reg_type, - char *dst, const char *src) +void zebra_term_untrans(ZebraHandle zh, int reg_type, + char *dst, const char *src) { + int len = 0; while (*src) { - const char *cp = zebra_maps_output (zh->zebra_maps, reg_type, &src); - while (*cp) - *dst++ = *cp++; + const char *cp = zebra_maps_output(zh->reg->zebra_maps, + reg_type, &src); + if (!cp) + { + if (len < IT_MAX_WORD-1) + dst[len++] = *src; + 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) +static void add_isam_p(const char *name, const char *info, + struct grep_info *p) { + if (!log_level_set) + { + log_level_rpn = yaz_log_module_level("rpn"); + log_level_set = 1; + } if (p->isam_p_indx == p->isam_p_size) { ISAM_P *new_isam_p_buf; @@ -443,46 +125,58 @@ static void add_isam_p (const char *name, const char *info, int *new_term_no; #endif p->isam_p_size = 2*p->isam_p_size + 100; - new_isam_p_buf = xmalloc (sizeof(*new_isam_p_buf) * - p->isam_p_size); + new_isam_p_buf = (ISAM_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, + memcpy(new_isam_p_buf, p->isam_p_buf, p->isam_p_indx * sizeof(*p->isam_p_buf)); - xfree (p->isam_p_buf); + xfree(p->isam_p_buf); } p->isam_p_buf = new_isam_p_buf; #ifdef TERM_COUNT - new_term_no = xmalloc (sizeof(*new_term_no) * - p->isam_p_size); + new_term_no = (int *) xmalloc(sizeof(*new_term_no) * p->isam_p_size); if (p->term_no) { - memcpy (new_term_no, p->isam_p_buf, + memcpy(new_term_no, p->isam_p_buf, p->isam_p_indx * sizeof(*p->term_no)); - xfree (p->term_no); + xfree(p->term_no); } p->term_no = new_term_no; #endif } - assert (*info == sizeof(*p->isam_p_buf)); - memcpy (p->isam_p_buf + p->isam_p_indx, info+1, sizeof(*p->isam_p_buf)); + assert(*info == sizeof(*p->isam_p_buf)); + memcpy(p->isam_p_buf + p->isam_p_indx, info+1, sizeof(*p->isam_p_buf)); -#if 0 - term_untrans (p->zh, p->reg_type, term_tmp, name+2); - logf (LOG_DEBUG, "grep: %s", term_tmp); -#endif + if (p->termset) + { + const char *db; + char term_tmp[IT_MAX_WORD]; + int ord = 0; + const char *index_name; + int len = key_SU_decode (&ord, (const unsigned char *) name); + + zebra_term_untrans (p->zh, p->reg_type, term_tmp, name+len); + yaz_log(log_level_rpn, "grep: %d %c %s", ord, name[len], term_tmp); + zebraExplain_lookup_ord(p->zh->reg->zei, + ord, 0 /* index_type */, &db, &index_name); + yaz_log(log_level_rpn, "grep: db=%s index=%s", db, index_name); + + resultSetAddTerm(p->zh, p->termset, name[len], db, + index_name, term_tmp); + } (p->isam_p_indx)++; } -static int grep_handle (char *name, const char *info, void *p) +static int grep_handle(char *name, const char *info, void *p) { - add_isam_p (name, info, p); + add_isam_p(name, info, (struct grep_info *) p); return 0; } -static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, - const char *ct1, const char *ct2) +static int term_pre(ZebraMaps zebra_maps, int reg_type, const char **src, + const char *ct1, const char *ct2, int first) { const char *s1, *s0 = *src; const char **map; @@ -490,12 +184,12 @@ static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, /* skip white space */ while (*s0) { - if (ct1 && strchr (ct1, *s0)) + if (ct1 && strchr(ct1, *s0)) break; - if (ct2 && strchr (ct2, *s0)) + 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; @@ -504,31 +198,103 @@ static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, return *s0; } -static int term_100 (ZebraMaps zebra_maps, int reg_type, - const char **src, char *dst, int space_split, - char *dst_term) + +static void esc_str(char *out_buf, size_t out_size, + const char *in_buf, int in_size) +{ + int k; + + assert(out_buf); + assert(in_buf); + assert(out_size > 20); + *out_buf = '\0'; + for (k = 0; k 126) + pc = '?'; + else + pc = c; + sprintf(out_buf +strlen(out_buf), "%02X:%c ", c, pc); + if (strlen(out_buf) > out_size-20) + { + strcat(out_buf, ".."); + break; + } + } +} + +#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 *s0, *s1; + const char *s0; const char **map; int i = 0; int j = 0; - if (!term_pre (zebra_maps, reg_type, src, NULL, NULL)) + const char *space_start = 0; + const char *space_end = 0; + + 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 && **map == *CHR_SPACE) - break; - while (s1 < s0) + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); + if (space_split) + { + if (**map == *CHR_SPACE) + break; + } + else /* complete subfield only. */ { - if (!isalnum (*s1) && *s1 != '-') - dst[i++] = '\\'; - dst_term[j++] = *s1; - dst[i++] = *s1++; + 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 */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } } dst[i] = '\0'; dst_term[j] = '\0'; @@ -536,16 +302,17 @@ static int term_100 (ZebraMaps zebra_maps, int reg_type, return i; } -static int term_101 (ZebraMaps zebra_maps, int reg_type, - const char **src, char *dst, int space_split, - char *dst_term) +/* 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 *s0, *s1; + const char *s0; 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) @@ -554,21 +321,37 @@ 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)); + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); if (space_split && **map == *CHR_SPACE) break; - while (s1 < s0) - { - if (!isalnum (*s1)) - dst[i++] = '\\'; - dst_term[j++] = *s1; - dst[i++] = *s1++; - } + + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } } } dst[i] = '\0'; @@ -577,21 +360,21 @@ static int term_101 (ZebraMaps zebra_maps, int reg_type, return i; } - -static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, - char *dst, int *errors, int space_split, - char *dst_term) +/* 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) { int i = 0; int j = 0; - const char *s0, *s1; + const char *s0; 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] && - isdigit (s0[1])) + isdigit(((const unsigned char *)s0)[1])) { *errors = s0[1] - '0'; s0 += 3; @@ -600,75 +383,252 @@ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, } while (*s0) { - if (strchr ("^\\()[].*+?|-", *s0)) - { - dst_term[j++] = *s0; + if (strchr("^\\()[].*+?|-", *s0)) + { + dst_term[j++] = *s0; dst[i++] = *s0++; - } + } else { - s1 = s0; - map = zebra_maps_input (zebra_maps, reg_type, &s0, strlen(s0)); - if (**map == *CHR_SPACE) + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); + if (space_split && **map == *CHR_SPACE) break; - while (s1 < s0) + + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } + } + } + dst[i] = '\0'; + dst_term[j] = '\0'; + *src = s0; + + return i; +} + +/* 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) +{ + return term_103(zebra_maps, reg_type, src, dst, NULL, space_split, + 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 *s0; + const char **map; + int i = 0; + int j = 0; + + if (!term_pre(zebra_maps, reg_type, src, "?*#", "?*#", !space_split)) + return 0; + s0 = *src; + while (*s0) + { + if (*s0 == '?') + { + dst_term[j++] = *s0++; + if (*s0 >= '0' && *s0 <= '9') { - if (!isalnum (*s1)) - dst[i++] = '\\'; - dst_term[j++] = *s1; - dst[i++] = *s1++; + 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++; + } + else if (*s0 == '#') + { + dst[i++] = '.'; + dst_term[j++] = *s0++; + } + else + { + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); + if (space_split && **map == *CHR_SPACE) + break; + + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } } } dst[i] = '\0'; - dst_term[j] = '\0'; + dst_term[j++] = '\0'; *src = s0; return i; } -static int term_102 (ZebraMaps zebra_maps, int reg_type, const char **src, - char *dst, int space_split, char *dst_term) +/* 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) { - return term_103 (zebra_maps, reg_type, src, dst, NULL, space_split, - dst_term); + const char *s0; + const char **map; + int i = 0; + int j = 0; + + if (!term_pre(zebra_maps, reg_type, src, "*!", "*!", !space_split)) + return 0; + s0 = *src; + while (*s0) + { + if (*s0 == '*') + { + dst[i++] = '.'; + dst[i++] = '*'; + dst_term[j++] = *s0++; + } + else if (*s0 == '!') + { + dst[i++] = '.'; + dst_term[j++] = *s0++; + } + else + { + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); + if (space_split && **map == *CHR_SPACE) + break; + + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } + } + } + if (right_truncate) + { + dst[i++] = '.'; + dst[i++] = '*'; + } + dst[i] = '\0'; + + dst_term[j++] = '\0'; + *src = s0; + return i; } + /* gen_regular_rel - generate regular expression from relation * val: border value (inclusive) * islt: 1 if <=; 0 if >=. */ -static void gen_regular_rel (char *dst, int val, int islt) +static void gen_regular_rel(char *dst, int val, int islt) { int dst_p; int w, d, i; int pos = 0; char numstr[20]; - logf (LOG_DEBUG, "gen_regular_rel. val=%d, islt=%d", val, islt); + yaz_log(YLOG_DEBUG, "gen_regular_rel. val=%d, islt=%d", val, islt); if (val >= 0) { if (islt) - strcpy (dst, "(-[0-9]+|("); + strcpy(dst, "(-[0-9]+|("); else - strcpy (dst, "(("); + strcpy(dst, "(("); } else { if (!islt) { - strcpy (dst, "([0-9]+|-("); - dst_p = strlen (dst); + strcpy(dst, "([0-9]+|-("); + dst_p = strlen(dst); islt = 1; } else { - strcpy (dst, "(-("); + strcpy(dst, "(-("); islt = 0; } val = -val; } - dst_p = strlen (dst); - sprintf (numstr, "%d", val); + dst_p = strlen(dst); + sprintf(numstr, "%d", val); for (w = strlen(numstr); --w >= 0; pos++) { d = numstr[w]; @@ -688,7 +648,7 @@ static void gen_regular_rel (char *dst, int val, int islt) } } - strcpy (dst + dst_p, numstr); + strcpy(dst + dst_p, numstr); dst_p = strlen(dst) - pos - 1; if (islt) @@ -730,22 +690,25 @@ static void gen_regular_rel (char *dst, int val, int islt) dst[dst_p] = '\0'; if (islt) { - for (i=1; izebra_maps, reg_type, term_sub, term_component, - space_split, term_dst)) + if (!term_100(zh->reg->zebra_maps, reg_type, + 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; + yaz_log(log_level_rpn, "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); + if (i) + *term_tmp++ = '|'; + 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++ = '^'; + string_rel_add_char(&term_tmp, term_component, &i); + *term_tmp++ = '-'; - *term_tmp++ = ']'; - *term_tmp++ = '.'; - *term_tmp++ = '*'; - } - *term_tmp++ = ')'; - *term_tmp = '\0'; + *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->zebra_maps, reg_type, term_sub, term_component, - space_split, term_dst)) + if (!term_100(zh->reg->zebra_maps, reg_type, + term_sub, term_component, + space_split, term_dst)) return 0; - logf (LOG_DEBUG, "Relation <="); + yaz_log(log_level_rpn, "Relation <="); - *term_tmp++ = '('; - for (i = 0; term_component[i]; ) - { - int j = 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++ = '['; + 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++ = '^'; + string_rel_add_char(&term_tmp, term_component, &i); + *term_tmp++ = '-'; - *term_tmp++ = ']'; - *term_tmp++ = '.'; - *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++ = '|'; + + 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->zebra_maps, reg_type, term_sub, term_component, - space_split, term_dst)) + if (!term_100 (zh->reg->zebra_maps, reg_type, + term_sub, term_component, space_split, term_dst)) return 0; - logf (LOG_DEBUG, "Relation >"); + yaz_log(log_level_rpn, "Relation >"); - *term_tmp++ = '('; - for (i = 0; term_component[i];) - { - int j = 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); + 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++ = ']'; + *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++ = '|'; + + 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->zebra_maps, reg_type, term_sub, term_component, - space_split, term_dst)) + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, + term_component, space_split, term_dst)) return 0; - logf (LOG_DEBUG, "Relation >="); + yaz_log(log_level_rpn, "Relation >="); - *term_tmp++ = '('; - for (i = 0; term_component[i];) - { - int j = 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 (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'; + 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->zebra_maps, reg_type, term_sub, term_component, - space_split, term_dst)) + case 102: + case -1: + if (!**term_sub) + return 1; + yaz_log(log_level_rpn, "Relation ="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, + 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, ")"); + break; + case 103: + yaz_log(log_level_rpn, "Relation always matches"); + /* skip to end of term (we don't care what it is) */ + while (**term_sub != '\0') + (*term_sub)++; + break; + default: + *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE; + return 0; } return 1; } -static int string_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) +static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + const char **term_sub, + oid_value attributeSet, NMEM stream, + struct grep_info *grep_info, + int reg_type, int complete_flag, + int num_bases, char **basenames, + char *term_dst, + const char *xpath_use, + struct ord_list **ol); + +static ZEBRA_RES term_limits_APT(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + zint *hits_limit_value, + const char **term_ref_id_str, + NMEM nmem) +{ + AttrType term_ref_id_attr; + AttrType hits_limit_attr; + int term_ref_id_int; + + attr_init_APT(&hits_limit_attr, zapt, 11); + *hits_limit_value = attr_find(&hits_limit_attr, NULL); + + attr_init_APT(&term_ref_id_attr, zapt, 10); + term_ref_id_int = attr_find_ex(&term_ref_id_attr, NULL, term_ref_id_str); + if (term_ref_id_int >= 0) + { + char *res = nmem_malloc(nmem, 20); + sprintf(res, "%d", term_ref_id_int); + *term_ref_id_str = res; + } + + /* no limit given ? */ + if (*hits_limit_value == -1) + { + if (*term_ref_id_str) + { + /* use global if term_ref is present */ + *hits_limit_value = zh->approx_limit; + } + else + { + /* no counting if term_ref is not present */ + *hits_limit_value = 0; + } + } + else if (*hits_limit_value == 0) + { + /* 0 is the same as global limit */ + *hits_limit_value = zh->approx_limit; + } + yaz_log(YLOG_DEBUG, "term_limits_APT ref_id=%s limit=" ZINT_FORMAT, + *term_ref_id_str ? *term_ref_id_str : "none", + *hits_limit_value); + return ZEBRA_OK; +} + +static ZEBRA_RES term_trunc(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + const char **term_sub, + oid_value attributeSet, NMEM stream, + struct grep_info *grep_info, + int reg_type, int complete_flag, + int num_bases, char **basenames, + char *term_dst, + const char *rank_type, + const char *xpath_use, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) +{ + ZEBRA_RES res; + struct ord_list *ol; + zint hits_limit_value; + const char *term_ref_id_str = 0; + *rset = 0; + + term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, stream); + grep_info->isam_p_indx = 0; + res = string_term(zh, zapt, term_sub, attributeSet, stream, grep_info, + reg_type, complete_flag, num_bases, basenames, + term_dst, xpath_use, &ol); + if (res != ZEBRA_OK) + return res; + if (!*term_sub) /* no more terms ? */ + return res; + yaz_log(log_level_rpn, "term: %s", term_dst); + *rset = 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, rset_nmem, + kc, kc->scope, ol, reg_type, hits_limit_value, + term_ref_id_str); + if (!*rset) + return ZEBRA_FAIL; + return ZEBRA_OK; +} + +static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + const char **term_sub, + oid_value attributeSet, NMEM stream, + struct grep_info *grep_info, + int reg_type, int complete_flag, + int num_bases, char **basenames, + char *term_dst, + const char *xpath_use, + struct ord_list **ol) { char term_dict[2*IT_MAX_WORD+4000]; int j, r, base_no; AttrType truncation; int truncation_value; - AttrType use; - int use_value; - oid_value curAttributeSet = attributeSet; const char *termp; struct rpn_char_map_info rcmi; int space_split = complete_flag ? 0 : 1; - rpn_char_map_prepare (zh, reg_type, &rcmi); - attr_init (&use, zapt, 1); - use_value = attr_find (&use, &curAttributeSet); - logf (LOG_DEBUG, "string_term, use value %d", use_value); - attr_init (&truncation, zapt, 5); - truncation_value = attr_find (&truncation, NULL); - logf (LOG_DEBUG, "truncation value %d", truncation_value); + int bases_ok = 0; /* no of databases with OK attribute */ + + *ol = ord_list_create(stream); - if (use_value == -1) - use_value = 1016; + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); + attr_init_APT(&truncation, zapt, 5); + truncation_value = attr_find(&truncation, NULL); + yaz_log(log_level_rpn, "truncation value %d", truncation_value); for (base_no = 0; base_no < num_bases; base_no++) { - attent attp; - data1_local_attribute *local_attr; + int ord = -1; + int regex_range = 0; int max_pos, prefix_len = 0; + int relation_error; + char ord_buf[32]; + int ord_len, i; - 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 (zebraExplain_curDatabase (zh->zei, basenames[base_no])) + termp = *term_sub; /* start of term for each database */ + + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { - zh->errCode = 109; /* Database unavailable */ - zh->errString = basenames[base_no]; - return -1; + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + return ZEBRA_FAIL; } - for (local_attr = attp.local_attributes; local_attr; - local_attr = local_attr->next) - { - int ord; - char ord_buf[32]; - int i, ord_len; + + if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use, + attributeSet, &ord) != ZEBRA_OK) + continue; - ord = zebraExplain_lookupSU (zh->zei, attp.attset_ordinal, - local_attr->local); - if (ord < 0) - continue; - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; + bases_ok++; - ord_len = key_SU_code (ord, ord_buf); - for (i = 0; ierrCode = 114; - return -1; + term_dict[prefix_len++] = 1; /* our internal regexp escape char */ + term_dict[prefix_len++] = ord_buf[i]; } - 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]); + term_dict[prefix_len++] = ')'; 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->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->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ".*)"); - dict_lookup_grep (zh->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->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - dict_lookup_grep (zh->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->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ".*)"); - dict_lookup_grep (zh->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->zebra_maps, reg_type, - &termp, term_dict + j, space_split, term_dst)) - return 0; - strcat (term_dict, ")"); - r = dict_lookup_grep (zh->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->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->dict, term_dict, 0, grep_info, - &max_pos, 0, grep_handle); - if (r) - logf (LOG_WARN, "dict_lookup_grep err, trunc=regular: %d", - r); + 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, + &relation_error)) + { + if (relation_error) + { + zebra_setError(zh, relation_error, 0); + return ZEBRA_FAIL; + } + *term_sub = 0; + return ZEBRA_OK; + } break; - case 103: /* Regexp-2 */ - r = 1; - term_dict[j++] = '('; - if (!term_103 (zh->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->dict, term_dict, r, grep_info, - &max_pos, 2, grep_handle); - if (r) - logf (LOG_WARN, "dict_lookup_grep err, trunc=eregular: %d", - r); + case 1: /* right truncation */ + term_dict[j++] = '('; + if (!term_100(zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, space_split, term_dst)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ".*)"); + 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); + 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ".*)"); + break; + 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); + 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); + break; + case 103: /* Regexp-2 */ + regex_range = 1; + term_dict[j++] = '('; + if (!term_103(zh->reg->zebra_maps, reg_type, + &termp, term_dict + j, ®ex_range, + space_split, term_dst)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); + 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); + 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)) + { + *term_sub = 0; + return ZEBRA_OK; + } + strcat(term_dict, ")"); + break; + default: + zebra_setError_zint(zh, + YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, + truncation_value); + return ZEBRA_FAIL; } + if (1) + { + char buf[80]; + const char *input = term_dict + prefix_len; + esc_str(buf, sizeof(buf), input, strlen(input)); + } + yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_dict+prefix_len); + r = dict_lookup_grep(zh->reg->dict, term_dict, regex_range, + grep_info, &max_pos, + ord_len /* number of "exact" chars */, + grep_handle); + if (r) + yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r); } + if (!bases_ok) + return ZEBRA_FAIL; *term_sub = termp; - logf (LOG_DEBUG, "%d positions", grep_info->isam_p_indx); - return 1; + yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); + return ZEBRA_OK; } -static void trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - char *termz) + +/* convert APT search term to UTF8 */ +static ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + char *termz) { size_t sizez; Z_Term *term = zapt->term; - 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'; -} - -static void 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) + switch (term->which) { - map = zebra_maps_input (zh->zebra_maps, reg_type, &cp, len); - if (**map == *CHR_SPACE) - space_map = *map; + case Z_Term_general: + if (zh->iconv_to_utf8 != 0) + { + char *inbuf = (char *) term->u.general->buf; + size_t inleft = term->u.general->len; + char *outbuf = termz; + size_t outleft = IT_MAX_WORD-1; + size_t ret; + + ret = yaz_iconv(zh->iconv_to_utf8, &inbuf, &inleft, + &outbuf, &outleft); + if (ret == (size_t)(-1)) + { + ret = yaz_iconv(zh->iconv_to_utf8, 0, 0, 0, 0); + zebra_setError( + zh, + YAZ_BIB1_QUERY_TERM_INCLUDES_CHARS_THAT_DO_NOT_TRANSLATE_INTO_, + 0); + return ZEBRA_FAIL; + } + *outbuf = 0; + } 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; + 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); + if (sizez > IT_MAX_WORD-1) + sizez = IT_MAX_WORD-1; + memcpy (termz, term->u.characterString, sizez); + termz[sizez] = '\0'; + break; + default: + zebra_setError(zh, YAZ_BIB1_UNSUPP_CODED_VALUE_FOR_TERM, 0); + return ZEBRA_FAIL; } - termz[i] = '\0'; + return ZEBRA_OK; } -static RSET rpn_proximity (ZebraHandle zh, RSET rset1, RSET rset2, - int ordered, - int exclusion, int relation, int distance) +/* convert APT SCAN term to internal cmap */ +static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + char *termz, int reg_type) { - int i; - RSFD rsfd1, rsfd2; - int more1, more2; - struct it_key buf1, buf2; - RSFD rsfd_result; - RSET result; - rset_temp_parms parms; - int term_index; - - rsfd1 = rset_open (rset1, RSETF_READ); - more1 = rset_read (rset1, rsfd1, &buf1, &term_index); - - rsfd2 = rset_open (rset2, RSETF_READ); - more2 = rset_read (rset2, rsfd2, &buf2, &term_index); - - 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); - - logf (LOG_DEBUG, "rpn_proximity excl=%d ord=%d rel=%d dis=%d", - exclusion, ordered, relation, distance); - while (more1 && more2) - { - int cmp = key_compare_it (&buf1, &buf2); - if (cmp < -1) - more1 = rset_read (rset1, rsfd1, &buf1, &term_index); - else if (cmp > 1) - more2 = rset_read (rset2, rsfd2, &buf2, &term_index); - else + char termz0[IT_MAX_WORD]; + + if (zapt_term_to_utf8(zh, zapt, termz0) == ZEBRA_FAIL) + return ZEBRA_FAIL; /* error */ + 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) { - int sysno = buf1.sysno; - int seqno[500]; - int n = 0; - - seqno[n++] = buf1.seqno; - while ((more1 = rset_read (rset1, rsfd1, &buf1, &term_index)) && - sysno == buf1.sysno) - if (n < 500) - seqno[n++] = buf1.seqno; - do + map = zebra_maps_input(zh->reg->zebra_maps, reg_type, &cp, len, 0); + if (**map == *CHR_SPACE) + space_map = *map; + else { - for (i = 0; i= */ - if (diff >= distance) - excl = !excl; - break; - case 5: /* > */ - if (diff > distance) - excl = !excl; - break; - case 6: /* != */ - if (diff != distance) - excl = !excl; - break; - } - if (excl) - rset_write (result, rsfd_result, &buf2); - } - } while ((more2 = rset_read (rset2, rsfd2, &buf2, &term_index)) && - sysno == buf2.sysno); + if (i && space_map) + for (src = space_map; *src; src++) + termz[i++] = *src; + space_map = NULL; + for (src = *map; *src; src++) + termz[i++] = *src; + } } + termz[i] = '\0'; } - rset_close (result, rsfd_result); - rset_close (rset1, rsfd1); - rset_close (rset2, rsfd2); - return result; + return ZEBRA_OK; } -static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no) +static void grep_info_delete(struct grep_info *grep_info) { - 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; - const char *flags = NULL; - - rsfd = xmalloc (sizeof(*rsfd)*rset_no); - more = xmalloc (sizeof(*more)*rset_no); - buf = xmalloc (sizeof(*buf)*rset_no); +#ifdef TERM_COUNT + xfree(grep_info->term_no); +#endif + xfree(grep_info->isam_p_buf); +} - 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 (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; - } - } - if (i != rset_no) - { - rset_null_parms parms; +static ZEBRA_RES grep_info_prepare(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + struct grep_info *grep_info, + int reg_type) +{ + AttrType termset; + int termset_value_numeric; + const char *termset_value_string; - while (i >= 0) - { - rset_close (rset[i], rsfd[i]); - xfree (buf[i]); - --i; - } - parms.rset_term = rset_term_create (prox_term, -1, flags); - parms.rset_term->nn = 0; - result = rset_create (rset_kind_null, &parms); - } - else +#ifdef TERM_COUNT + grep_info->term_no = 0; +#endif + grep_info->isam_p_size = 0; + grep_info->isam_p_buf = NULL; + grep_info->zh = zh; + grep_info->reg_type = reg_type; + grep_info->termset = 0; + if (!zapt) + return ZEBRA_OK; + attr_init_APT(&termset, zapt, 8); + termset_value_numeric = + attr_find_ex(&termset, NULL, &termset_value_string); + if (termset_value_numeric != -1) { - rset_temp_parms parms; - RSFD rsfd_result; - - parms.rset_term = rset_term_create (prox_term, -1, flags); - parms.rset_term->nn = min_nn; - 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); - } - } - - for (i = 0; itermset = resultSetAdd(zh, termset_name, 1); + if (!grep_info->termset) + { + zebra_setError(zh, YAZ_BIB1_ILLEGAL_RESULT_SET_NAME, termset_name); + return ZEBRA_FAIL; + } +#endif } - xfree (buf); - xfree (more); - xfree (rsfd); - return result; + return ZEBRA_OK; } - -static RSET rpn_search_APT_phrase (ZebraHandle zh, - Z_AttributesPlusTerm *zapt, - const char *termz, - oid_value attributeSet, - int reg_type, int complete_flag, - const char *rank_type, - int num_bases, char **basenames) + +/** + \brief Create result set(s) for list of terms + \param zh Zebra Handle + \param zapt Attributes Plust Term (RPN leaf) + \param termz term as used in query but converted to UTF-8 + \param attributeSet default attribute set + \param stream memory for result + \param reg_type register type ('w', 'p',..) + \param complete_flag whether it's phrases or not + \param rank_type term flags for ranking + \param xpath_use use attribute for X-Path (-1 for no X-path) + \param num_bases number of databases + \param basenames array of databases + \param rset_nmem memory for result sets + \param result_sets output result set for each term in list (output) + \param num_result_sets number of output result sets + \param kc rset key control to be used for created result sets +*/ +static ZEBRA_RES term_list_trunc(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + const char *termz, + oid_value attributeSet, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, + const char *xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET **result_sets, int *num_result_sets, + struct rset_key_control *kc) { char term_dst[IT_MAX_WORD+1]; - const char *termp = termz; - RSET rset[60], result; - int i, r, rset_no = 0; struct grep_info grep_info; + const char *termp = termz; + int alloc_sets = 0; -#ifdef TERM_COUNT - grep_info.term_no = 0; -#endif - grep_info.isam_p_size = 0; - grep_info.isam_p_buf = NULL; - grep_info.zh = zh; - grep_info.reg_type = reg_type; - - while (1) + *num_result_sets = 0; + *term_dst = 0; + if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL) + return ZEBRA_FAIL; + while(1) { - logf (LOG_DEBUG, "APT_phrase termp=%s", termp); - grep_info.isam_p_indx = 0; - r = string_term (zh, zapt, &termp, attributeSet, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst); - if (r < 1) - break; - 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); - assert (rset[rset_no]); - if (++rset_no >= sizeof(rset)/sizeof(*rset)) + ZEBRA_RES res; + + if (alloc_sets == *num_result_sets) + { + int add = 10; + RSET *rnew = (RSET *) nmem_malloc(stream, (alloc_sets+add) * + sizeof(*rnew)); + if (alloc_sets) + memcpy(rnew, *result_sets, alloc_sets * sizeof(*rnew)); + alloc_sets = alloc_sets + add; + *result_sets = rnew; + } + res = term_trunc(zh, zapt, &termp, attributeSet, + stream, &grep_info, + reg_type, complete_flag, + num_bases, basenames, + term_dst, rank_type, + xpath_use, rset_nmem, + &(*result_sets)[*num_result_sets], + kc); + if (res != ZEBRA_OK) + { + int i; + for (i = 0; i < *num_result_sets; i++) + rset_delete((*result_sets)[i]); + grep_info_delete (&grep_info); + return res; + } + if ((*result_sets)[*num_result_sets] == 0) + break; + (*num_result_sets)++; + + if (!*termp) break; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); - if (rset_no == 0) - { - rset_null_parms parms; - - parms.rset_term = rset_term_create (term_dst, -1, rank_type); - return rset_create (rset_kind_null, &parms); - } - else if (rset_no == 1) - return (rset[0]); - result = rpn_prox (zh, rset, rset_no); - for (i = 0; i= sizeof(rset)/sizeof(*rset)) - break; + if (!zebra_maps_is_first_in_field(zh->reg->zebra_maps, reg_type)) + { + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE, + position_value); + return ZEBRA_FAIL; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); - if (rset_no == 0) + + if (!zh->reg->isamb) { - rset_null_parms parms; - - parms.rset_term = rset_term_create (term_dst, -1, rank_type); - return rset_create (rset_kind_null, &parms); + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE, + position_value); + return ZEBRA_FAIL; } - result = rset[0]; - for (i = 1; ireg->zei, basenames[base_no])) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + return ZEBRA_FAIL; + } + + if (zebra_apt_get_ord(zh, zapt, reg_type, 0, + attributeSet, &ord) != ZEBRA_OK) + continue; + + ord_len = key_SU_encode (ord, ord_buf); + memcpy(term_dict, ord_buf, ord_len); + strcpy(term_dict+ord_len, FIRST_IN_FIELD_STR); + val = dict_lookup(zh->reg->dict, term_dict); + if (!val) + continue; + assert(*val == sizeof(ISAM_P)); + memcpy(&isam_p, val+1, sizeof(isam_p)); + + f_set[num_sets++] = rsisamb_create(rset_nmem, kc, kc->scope, + zh->reg->isamb, isam_p, 0); + + } + if (num_sets) + { + *rset = rset_create_or(rset_nmem, kc, kc->scope, + 0 /* termid */, num_sets, f_set); } - return result; + xfree(f_set); + return ZEBRA_OK; } - -static RSET rpn_search_APT_and_list (ZebraHandle zh, - Z_AttributesPlusTerm *zapt, - const char *termz, - oid_value attributeSet, - int reg_type, int complete_flag, - const char *rank_type, - int num_bases, char **basenames) + +static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + const char *termz_org, + oid_value attributeSet, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, + const char *xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) { - char term_dst[IT_MAX_WORD+1]; - const char *termp = termz; - RSET rset[60], result; - int i, r, rset_no = 0; - struct grep_info grep_info; - -#ifdef TERM_COUNT - grep_info.term_no = 0; -#endif - grep_info.isam_p_size = 0; - grep_info.isam_p_buf = NULL; - grep_info.zh = zh; - grep_info.reg_type = reg_type; - - while (1) - { - logf (LOG_DEBUG, "APT_and_list termp=%s", termp); - grep_info.isam_p_indx = 0; - r = string_term (zh, zapt, &termp, attributeSet, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst); - if (r < 1) - break; - 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); - assert (rset[rset_no]); - if (++rset_no >= sizeof(rset)/sizeof(*rset)) - break; - } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); - if (rset_no == 0) + RSET *result_sets = 0; + int num_result_sets = 0; + ZEBRA_RES res = + term_list_trunc(zh, zapt, termz_org, attributeSet, + stream, reg_type, complete_flag, + rank_type, xpath_use, + num_bases, basenames, + rset_nmem, + &result_sets, &num_result_sets, kc); + + if (res != ZEBRA_OK) + return res; + + if (num_result_sets > 0) { - rset_null_parms parms; - - parms.rset_term = rset_term_create (term_dst, -1, rank_type); - return rset_create (rset_kind_null, &parms); + RSET first_set = 0; + res = rpn_search_APT_position(zh, zapt, attributeSet, + reg_type, + num_bases, basenames, + rset_nmem, &first_set, + kc); + if (res != ZEBRA_OK) + return res; + if (first_set) + { + RSET *nsets = nmem_malloc(stream, + sizeof(RSET) * (num_result_sets+1)); + nsets[0] = first_set; + memcpy(nsets+1, result_sets, sizeof(RSET) * num_result_sets); + result_sets = nsets; + num_result_sets++; + } } - result = rset[0]; - for (i = 1; iscope, + num_result_sets, result_sets, + 1 /* ordered */, 0 /* exclusion */, + 3 /* relation */, 1 /* distance */); + if (!*rset) + return ZEBRA_FAIL; + return ZEBRA_OK; +} - bool_parms.rset_l = result; - bool_parms.rset_r = rset[i]; - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - result = rset_create (rset_kind_and, &bool_parms); - } - return result; +static ZEBRA_RES rpn_search_APT_or_list(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + const char *termz_org, + oid_value attributeSet, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, + const char *xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) +{ + RSET *result_sets = 0; + int num_result_sets = 0; + ZEBRA_RES res = + term_list_trunc(zh, zapt, termz_org, attributeSet, + stream, reg_type, complete_flag, + rank_type, xpath_use, + num_bases, basenames, + rset_nmem, + &result_sets, &num_result_sets, kc); + if (res != ZEBRA_OK) + return res; + if (num_result_sets == 0) + *rset = rset_create_null(rset_nmem, kc, 0); + else if (num_result_sets == 1) + *rset = result_sets[0]; + else + *rset = rset_create_or(rset_nmem, kc, kc->scope, 0 /* termid */, + num_result_sets, result_sets); + if (!*rset) + return ZEBRA_FAIL; + return ZEBRA_OK; } -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) +static ZEBRA_RES rpn_search_APT_and_list(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + const char *termz_org, + oid_value attributeSet, + NMEM stream, + int reg_type, int complete_flag, + const char *rank_type, + const char *xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) +{ + RSET *result_sets = 0; + int num_result_sets = 0; + ZEBRA_RES res = + term_list_trunc(zh, zapt, termz_org, attributeSet, + stream, reg_type, complete_flag, + rank_type, xpath_use, + num_bases, basenames, + rset_nmem, + &result_sets, &num_result_sets, + kc); + if (res != ZEBRA_OK) + return res; + if (num_result_sets == 0) + *rset = rset_create_null(rset_nmem, kc, 0); + else if (num_result_sets == 1) + *rset = result_sets[0]; + else + *rset = rset_create_and(rset_nmem, kc, kc->scope, + num_result_sets, result_sets); + if (!*rset) + return ZEBRA_FAIL; + return ZEBRA_OK; +} + +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, + int *error_code) { AttrType relation; int relation_value; @@ -1543,540 +1673,893 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int r; char *term_tmp = term_dict + strlen(term_dict); - attr_init (&relation, zapt, 2); - relation_value = attr_find (&relation, NULL); + *error_code = 0; + attr_init_APT(&relation, zapt, 2); + relation_value = attr_find(&relation, NULL); - logf (LOG_DEBUG, "numeric relation value=%d", relation_value); + yaz_log(log_level_rpn, "numeric relation value=%d", relation_value); - if (!term_100 (zh->zebra_maps, reg_type, term_sub, term_tmp, 1, - term_dst)) - return 0; - term_value = atoi (term_tmp); switch (relation_value) { case 1: - logf (LOG_DEBUG, "Relation <"); - gen_regular_rel (term_tmp, term_value-1, 1); + yaz_log(log_level_rpn, "Relation <"); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); + gen_regular_rel(term_tmp, term_value-1, 1); break; case 2: - logf (LOG_DEBUG, "Relation <="); - gen_regular_rel (term_tmp, term_value, 1); + yaz_log(log_level_rpn, "Relation <="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); + gen_regular_rel(term_tmp, term_value, 1); break; case 4: - logf (LOG_DEBUG, "Relation >="); - gen_regular_rel (term_tmp, term_value, 0); + yaz_log(log_level_rpn, "Relation >="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); + gen_regular_rel(term_tmp, term_value, 0); break; case 5: - logf (LOG_DEBUG, "Relation >"); - gen_regular_rel (term_tmp, term_value+1, 0); + yaz_log(log_level_rpn, "Relation >"); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); + gen_regular_rel(term_tmp, term_value+1, 0); break; + case -1: case 3: + yaz_log(log_level_rpn, "Relation ="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); + sprintf(term_tmp, "(0*%d)", term_value); + break; + case 103: + /* term_tmp untouched.. */ + while (**term_sub != '\0') + (*term_sub)++; + break; default: - logf (LOG_DEBUG, "Relation ="); - sprintf (term_tmp, "(0*%d)", term_value); + *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE; + return 0; } - logf (LOG_DEBUG, "dict_lookup_grep: %s", term_tmp); - r = dict_lookup_grep (zh->dict, term_dict, 0, grep_info, max_pos, + yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp); + 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_DEBUG, "%d positions", grep_info->isam_p_indx); + yaz_log(YLOG_WARN, "dict_lookup_grep fail, rel = gt: %d", r); + yaz_log(log_level_rpn, "%d positions", grep_info->isam_p_indx); return 1; } -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) +static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + const char **term_sub, + oid_value attributeSet, NMEM stream, + struct grep_info *grep_info, + int reg_type, int complete_flag, + int num_bases, char **basenames, + char *term_dst, + const char *xpath_use, + struct ord_list **ol) { char term_dict[2*IT_MAX_WORD+2]; - int r, base_no; - AttrType use; - int use_value; - oid_value curAttributeSet = attributeSet; + int base_no; const char *termp; struct rpn_char_map_info rcmi; - rpn_char_map_prepare (zh, reg_type, &rcmi); - attr_init (&use, zapt, 1); - use_value = attr_find (&use, &curAttributeSet); - logf (LOG_DEBUG, "numeric_term, use value %d", use_value); + int bases_ok = 0; /* no of databases with OK attribute */ + + *ol = ord_list_create(stream); - if (use_value == -1) - use_value = 1016; + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); for (base_no = 0; base_no < num_bases; base_no++) { - attent attp; - data1_local_attribute *local_attr; int max_pos, prefix_len = 0; + int relation_error = 0; + int ord, ord_len, i; + char ord_buf[32]; 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 (zebraExplain_curDatabase (zh->zei, basenames[base_no])) + + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { - zh->errCode = 109; /* Database unavailable */ - zh->errString = basenames[base_no]; - return -1; + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + return ZEBRA_FAIL; } - for (local_attr = attp.local_attributes; local_attr; - local_attr = local_attr->next) - { - int ord; - char ord_buf[32]; - int i, ord_len; - ord = zebraExplain_lookupSU (zh->zei, attp.attset_ordinal, - local_attr->local); - if (ord < 0) - continue; - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; + if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use, + attributeSet, &ord) != ZEBRA_OK) + continue; + bases_ok++; - ord_len = key_SU_code (ord, ord_buf); - for (i = 0; ierrCode = 114; - return -1; + term_dict[prefix_len++] = 1; + term_dict[prefix_len++] = ord_buf[i]; } - 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]); + term_dict[prefix_len++] = ')'; term_dict[prefix_len] = '\0'; - if (!numeric_relation (zh, zapt, &termp, term_dict, - attributeSet, grep_info, &max_pos, reg_type, - term_dst)) - return 0; + + if (!numeric_relation(zh, zapt, &termp, term_dict, + attributeSet, grep_info, &max_pos, reg_type, + term_dst, &relation_error)) + { + if (relation_error) + { + zebra_setError(zh, relation_error, 0); + return ZEBRA_FAIL; + } + *term_sub = 0; + return ZEBRA_OK; + } } + if (!bases_ok) + return ZEBRA_FAIL; *term_sub = termp; - logf (LOG_DEBUG, "%d positions", grep_info->isam_p_indx); - return 1; + yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); + return ZEBRA_OK; } -static RSET rpn_search_APT_numeric (ZebraHandle zh, - Z_AttributesPlusTerm *zapt, - const char *termz, - oid_value attributeSet, - int reg_type, int complete_flag, - const char *rank_type, - int num_bases, char **basenames) + +static ZEBRA_RES 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, + const char *xpath_use, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) { char term_dst[IT_MAX_WORD+1]; const char *termp = termz; - RSET rset[60], result; - int i, r, rset_no = 0; + RSET *result_sets = 0; + int num_result_sets = 0; + ZEBRA_RES res; struct grep_info grep_info; + int alloc_sets = 0; + zint hits_limit_value; + const char *term_ref_id_str = 0; -#ifdef TERM_COUNT - grep_info.term_no = 0; -#endif - grep_info.isam_p_size = 0; - grep_info.isam_p_buf = NULL; - grep_info.zh = zh; - grep_info.reg_type = reg_type; + term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, stream); + yaz_log(log_level_rpn, "APT_numeric t='%s'", termz); + if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL) + return ZEBRA_FAIL; while (1) { - 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); - if (r < 1) - break; - 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); - assert (rset[rset_no]); - if (++rset_no >= sizeof(rset)/sizeof(*rset)) + struct ord_list *ol; + if (alloc_sets == num_result_sets) + { + int add = 10; + RSET *rnew = (RSET *) nmem_malloc(stream, (alloc_sets+add) * + sizeof(*rnew)); + if (alloc_sets) + memcpy(rnew, result_sets, alloc_sets * sizeof(*rnew)); + alloc_sets = alloc_sets + add; + result_sets = rnew; + } + yaz_log(YLOG_DEBUG, "APT_numeric termp=%s", termp); + grep_info.isam_p_indx = 0; + res = numeric_term(zh, zapt, &termp, attributeSet, stream, &grep_info, + reg_type, complete_flag, num_bases, basenames, + term_dst, xpath_use, &ol); + if (res == ZEBRA_FAIL || termp == 0) + break; + yaz_log(YLOG_DEBUG, "term: %s", term_dst); + result_sets[num_result_sets] = + rset_trunc(zh, grep_info.isam_p_buf, + grep_info.isam_p_indx, term_dst, + strlen(term_dst), rank_type, + 0 /* preserve position */, + zapt->term->which, rset_nmem, + kc, kc->scope, ol, reg_type, + hits_limit_value, + term_ref_id_str); + if (!result_sets[num_result_sets]) + break; + num_result_sets++; + if (!*termp) break; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); - if (rset_no == 0) + grep_info_delete(&grep_info); + + if (res != ZEBRA_OK) + return res; + if (num_result_sets == 0) + *rset = rset_create_null(rset_nmem, kc, 0); + else if (num_result_sets == 1) + *rset = result_sets[0]; + else + *rset = rset_create_and(rset_nmem, kc, kc->scope, + num_result_sets, result_sets); + if (!*rset) + return ZEBRA_FAIL; + return ZEBRA_OK; +} + +static ZEBRA_RES rpn_search_APT_local(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + const char *termz, + oid_value attributeSet, + NMEM stream, + const char *rank_type, NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) +{ + RSFD rsfd; + struct it_key key; + int sys; + *rset = rset_create_temp(rset_nmem, kc, kc->scope, + res_get (zh->res, "setTmpDir"),0 ); + rsfd = rset_open(*rset, RSETF_WRITE); + + sys = atoi(termz); + if (sys <= 0) + sys = 1; + key.mem[0] = sys; + key.mem[1] = 1; + key.len = 2; + rset_write (rsfd, &key); + rset_close (rsfd); + return ZEBRA_OK; +} + +static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, NMEM stream, + Z_SortKeySpecList *sort_sequence, + const char *rank_type, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) +{ + int i; + int sort_relation_value; + AttrType sort_relation_type; + Z_SortKeySpec *sks; + Z_SortKey *sk; + int oid[OID_SIZE]; + oident oe; + char termz[20]; + + attr_init_APT(&sort_relation_type, zapt, 7); + sort_relation_value = attr_find(&sort_relation_type, &attributeSet); + + if (!sort_sequence->specs) { - rset_null_parms parms; - - parms.rset_term = rset_term_create (term_dst, -1, rank_type); - return rset_create (rset_kind_null, &parms); + 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; } - result = rset[0]; - for (i = 1; iterm->which != Z_Term_general) + i = 0; + else + i = atoi_n ((char *) zapt->term->u.general->buf, + zapt->term->u.general->len); + if (i >= sort_sequence->num_specs) + i = 0; + sprintf(termz, "%d", i); - bool_parms.rset_l = result; - bool_parms.rset_r = rset[i]; - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - result = rset_create (rset_kind_and, &bool_parms); - } - return result; + oe.proto = PROTO_Z3950; + oe.oclass = CLASS_ATTSET; + oe.value = attributeSet; + if (!oid_ent_to_oid (&oe, oid)) + return ZEBRA_FAIL; + + sks = (Z_SortKeySpec *) nmem_malloc(stream, sizeof(*sks)); + sks->sortElement = (Z_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)); + sk->which = Z_SortKey_sortAttributes; + sk->u.sortAttributes = (Z_SortAttributes *) + nmem_malloc(stream, sizeof(*sk->u.sortAttributes)); + + sk->u.sortAttributes->id = oid; + sk->u.sortAttributes->list = zapt->attributes; + + sks->sortRelation = (int *) + nmem_malloc(stream, sizeof(*sks->sortRelation)); + if (sort_relation_value == 1) + *sks->sortRelation = Z_SortKeySpec_ascending; + else if (sort_relation_value == 2) + *sks->sortRelation = Z_SortKeySpec_descending; + else + *sks->sortRelation = Z_SortKeySpec_ascending; + + sks->caseSensitivity = (int *) + nmem_malloc(stream, sizeof(*sks->caseSensitivity)); + *sks->caseSensitivity = 0; + + sks->which = Z_SortKeySpec_null; + sks->u.null = odr_nullval (); + sort_sequence->specs[i] = sks; + *rset = rset_create_null(rset_nmem, kc, 0); + return ZEBRA_OK; } -static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz, - oid_value attributeSet, - const char *rank_type) + +static int rpn_check_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, + struct xpath_location_step *xpath, int max, + NMEM mem) { - RSET result; - RSFD rsfd; - struct it_key key; - rset_temp_parms parms; - - parms.rset_term = rset_term_create (termz, -1, rank_type); - parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->res, "setTmpDir"); - result = rset_create (rset_kind_temp, &parms); - rsfd = rset_open (result, RSETF_WRITE); - - key.sysno = atoi (termz); - key.seqno = 1; - if (key.sysno <= 0) - key.sysno = 1; - rset_write (result, rsfd, &key); - rset_close (result, rsfd); - return result; + oid_value curAttributeSet = attributeSet; + AttrType use; + const char *use_string = 0; + + attr_init_APT(&use, zapt, 1); + attr_find_ex(&use, &curAttributeSet, &use_string); + + if (!use_string || *use_string != '/') + return -1; + + return zebra_parse_xpath_str(use_string, xpath, max, mem); +} + + + +static RSET xpath_trunc(ZebraHandle zh, NMEM stream, + int reg_type, const char *term, + const char *xpath_use, + NMEM rset_nmem, + struct rset_key_control *kc) +{ + RSET rset; + struct grep_info grep_info; + char term_dict[2048]; + char ord_buf[32]; + int prefix_len = 0; + int ord = zebraExplain_lookup_attr_str(zh->reg->zei, + zinfo_index_category_index, + reg_type, + xpath_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') == ZEBRA_FAIL) + return rset_create_null(rset_nmem, kc, 0); + + if (ord < 0) + return rset_create_null(rset_nmem, kc, 0); + if (prefix_len) + term_dict[prefix_len++] = '|'; + else + term_dict[prefix_len++] = '('; + + ord_len = key_SU_encode (ord, ord_buf); + for (i = 0; ireg->dict, term_dict, 0, + &grep_info, &max_pos, 0, grep_handle); + yaz_log(YLOG_DEBUG, "%s %d positions", term, + grep_info.isam_p_indx); + rset = rset_trunc(zh, grep_info.isam_p_buf, + grep_info.isam_p_indx, term, strlen(term), + flags, 1, term_type,rset_nmem, + kc, kc->scope, 0, reg_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); + grep_info_delete(&grep_info); + return rset; } -static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, - const char *rank_type) +static +ZEBRA_RES rpn_search_xpath(ZebraHandle zh, + int num_bases, char **basenames, + NMEM stream, const char *rank_type, RSET rset, + int xpath_len, struct xpath_location_step *xpath, + NMEM rset_nmem, + RSET *rset_out, + struct rset_key_control *kc) { - rset_null_parms parms; + int base_no; int i; - int sort_relation_value; - AttrType sort_relation_type; - int use_value; - AttrType use_type; - Z_SortKeySpec *sks; - Z_SortKey *sk; - Z_AttributeElement *ae; - int oid[OID_SIZE]; - oident oe; - - attr_init (&sort_relation_type, zapt, 7); - sort_relation_value = attr_find (&sort_relation_type, &attributeSet); + int always_matches = rset ? 0 : 1; - attr_init (&use_type, zapt, 1); - use_value = attr_find (&use_type, &attributeSet); + if (xpath_len < 0) + { + *rset_out = rset; + return ZEBRA_OK; + } - if (!sort_sequence->specs) + yaz_log(YLOG_DEBUG, "xpath len=%d", xpath_len); + for (i = 0; inum_specs = 10; - sort_sequence->specs = nmem_malloc (stream, sort_sequence->num_specs * - sizeof(*sort_sequence->specs)); - for (i = 0; inum_specs; i++) - sort_sequence->specs[i] = 0; + yaz_log(log_level_rpn, "XPATH %d %s", i, xpath[i].part); + } - if (zapt->term->which != Z_Term_general) - i = 0; - else - i = atoi_n (zapt->term->u.general->buf, zapt->term->u.general->len); - if (i >= sort_sequence->num_specs) - i = 0; - oe.proto = PROTO_Z3950; - oe.oclass = CLASS_ATTSET; - oe.value = attributeSet; - if (!oid_ent_to_oid (&oe, oid)) - return 0; + /* + //a -> a/.* + //a/b -> b/a/.* + /a -> a/ + /a/b -> b/a/ - sks = nmem_malloc (stream, sizeof(*sks)); - sks->sortElement = nmem_malloc (stream, sizeof(*sks->sortElement)); - sks->sortElement->which = Z_SortElement_generic; - sk = sks->sortElement->u.generic = nmem_malloc (stream, sizeof(*sk)); - sk->which = Z_SortKey_sortAttributes; - sk->u.sortAttributes = nmem_malloc (stream, sizeof(*sk->u.sortAttributes)); + / -> none - sk->u.sortAttributes->id = oid; - sk->u.sortAttributes->list = - nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list)); - sk->u.sortAttributes->list->num_attributes = 1; - sk->u.sortAttributes->list->attributes = - nmem_malloc (stream, sizeof(*sk->u.sortAttributes->list->attributes)); - ae = *sk->u.sortAttributes->list->attributes = - nmem_malloc (stream, sizeof(**sk->u.sortAttributes->list->attributes)); - ae->attributeSet = 0; - ae->attributeType = nmem_malloc (stream, sizeof(*ae->attributeType)); - *ae->attributeType = 1; - ae->which = Z_AttributeValue_numeric; - ae->value.numeric = nmem_malloc (stream, sizeof(*ae->value.numeric)); - *ae->value.numeric = use_value; - - sks->sortRelation = nmem_malloc (stream, sizeof(*sks->sortRelation)); - if (sort_relation_value == 1) - *sks->sortRelation = Z_SortRelation_ascending; - else if (sort_relation_value == 2) - *sks->sortRelation = Z_SortRelation_descending; - else - *sks->sortRelation = Z_SortRelation_ascending; + a[@attr = value]/b[@other = othervalue] - sks->caseSensitivity = nmem_malloc (stream, sizeof(*sks->caseSensitivity)); - *sks->caseSensitivity = 0; + /e/@a val range(e/,range(@a,freetext(w,1015,val),@a),e/) + /a/b val range(b/a/,freetext(w,1016,val),b/a/) + /a/b/@c val range(b/a/,range(@c,freetext(w,1016,val),@c),b/a/) + /a/b[@c = y] val range(b/a/,freetext(w,1016,val),b/a/,@c = y) + /a[@c = y]/b val range(a/,range(b/a/,freetext(w,1016,val),b/a/),a/,@c = y) + /a[@c = x]/b[@c = y] range(a/,range(b/a/,freetext(w,1016,val),b/a/,@c = y),a/,@c = x) + + */ - sks->missingValueAction = 0; + dict_grep_cmap (zh->reg->dict, 0, 0); - sort_sequence->specs[i] = sks; + for (base_no = 0; base_no < num_bases; base_no++) + { + int level = xpath_len; + int first_path = 1; + + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + *rset_out = rset; + return ZEBRA_FAIL; + } + while (--level >= 0) + { + WRBUF xpath_rev = wrbuf_alloc(); + int i; + RSET rset_start_tag = 0, rset_end_tag = 0, rset_attr = 0; - parms.rset_term = rset_term_create ("", -1, rank_type); - return rset_create (rset_kind_null, &parms); + for (i = level; i >= 1; --i) + { + const char *cp = xpath[i].part; + if (*cp) + { + for (; *cp; cp++) + { + if (*cp == '*') + wrbuf_puts(xpath_rev, "[^/]*"); + else if (*cp == ' ') + wrbuf_puts(xpath_rev, "\001 "); + else + wrbuf_putc(xpath_rev, *cp); + + /* wrbuf_putc does not null-terminate , but + wrbuf_puts below ensures it does.. so xpath_rev + is OK iff length is > 0 */ + } + wrbuf_puts(xpath_rev, "/"); + } + else if (i == 1) /* // case */ + wrbuf_puts(xpath_rev, ".*"); + } + if (xpath[level].predicate && + xpath[level].predicate->which == XPATH_PREDICATE_RELATION && + xpath[level].predicate->u.relation.name[0]) + { + WRBUF wbuf = wrbuf_alloc(); + wrbuf_puts(wbuf, xpath[level].predicate->u.relation.name+1); + if (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', wrbuf_buf(wbuf), ZEBRA_XPATH_ATTR_NAME, + rset_nmem, kc); + wrbuf_free(wbuf, 1); + } + else + { + if (!first_path) + { + wrbuf_free(xpath_rev, 1); + continue; + } + } + yaz_log(log_level_rpn, "xpath_rev (%d) = %.*s", level, + wrbuf_len(xpath_rev), wrbuf_buf(xpath_rev)); + if (wrbuf_len(xpath_rev)) + { + rset_start_tag = xpath_trunc(zh, stream, '0', + wrbuf_buf(xpath_rev), + ZEBRA_XPATH_ELM_BEGIN, + rset_nmem, kc); + if (always_matches) + rset = rset_start_tag; + else + { + rset_end_tag = xpath_trunc(zh, stream, '0', + wrbuf_buf(xpath_rev), + ZEBRA_XPATH_ELM_END, + rset_nmem, kc); + + rset = rset_create_between(rset_nmem, kc, kc->scope, + rset_start_tag, rset, + rset_end_tag, rset_attr); + } + } + wrbuf_free(xpath_rev, 1); + first_path = 0; + } + } + *rset_out = rset; + return ZEBRA_OK; } +#define MAX_XPATH_STEPS 10 -static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, - int num_bases, char **basenames) +static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, NMEM stream, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) { + ZEBRA_RES res = ZEBRA_OK; unsigned reg_id; char *search_type = NULL; - char *rank_type = NULL; + char rank_type[128]; int complete_flag; int sort_flag; char termz[IT_MAX_WORD+1]; + int xpath_len; + const char *xpath_use = 0; + struct xpath_location_step xpath[MAX_XPATH_STEPS]; - zebra_maps_attr (zh->zebra_maps, zapt, ®_id, &search_type, - &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 (zapt->term->which != Z_Term_general) + if (!log_level_set) { - zh->errCode = 124; - return NULL; + log_level_rpn = yaz_log_module_level("rpn"); + log_level_set = 1; } - trans_term (zh, zapt, termz); + zebra_maps_attr(zh->reg->zebra_maps, zapt, ®_id, &search_type, + rank_type, &complete_flag, &sort_flag); + + yaz_log(YLOG_DEBUG, "reg_id=%c", reg_id); + yaz_log(YLOG_DEBUG, "complete_flag=%d", complete_flag); + yaz_log(YLOG_DEBUG, "search_type=%s", search_type); + yaz_log(YLOG_DEBUG, "rank_type=%s", rank_type); + + if (zapt_term_to_utf8(zh, zapt, termz) == ZEBRA_FAIL) + return ZEBRA_FAIL; if (sort_flag) - return rpn_sort_spec (zh, zapt, attributeSet, stream, sort_sequence, - rank_type); + return rpn_sort_spec(zh, zapt, attributeSet, stream, sort_sequence, + rank_type, rset_nmem, rset, kc); + /* consider if an X-Path query is used */ + xpath_len = rpn_check_xpath(zh, zapt, attributeSet, + xpath, MAX_XPATH_STEPS, stream); + if (xpath_len >= 0) + { + if (xpath[xpath_len-1].part[0] == '@') + xpath_use = ZEBRA_XPATH_ATTR_CDATA; /* last step is attribute */ + else + xpath_use = ZEBRA_XPATH_CDATA; /* searching for cdata */ + + if (1) + { + AttrType relation; + int relation_value; + + attr_init_APT(&relation, zapt, 2); + relation_value = attr_find(&relation, NULL); + + if (relation_value == 103) /* alwaysmatches */ + { + *rset = 0; /* signal no "term" set */ + return rpn_search_xpath(zh, num_bases, basenames, + stream, rank_type, *rset, + xpath_len, xpath, rset_nmem, rset, kc); + } + } + } - if (!strcmp (search_type, "phrase")) + /* search using one of the various search type strategies + termz is our UTF-8 search term + attributeSet is top-level default attribute set + stream is ODR for search + reg_id is the register type + complete_flag is 1 for complete subfield, 0 for incomplete + xpath_use is use-attribute to be used for X-Path search, 0 for none + */ + if (!strcmp(search_type, "phrase")) + { + res = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem, + rset, kc); + } + else if (!strcmp(search_type, "and-list")) { - return rpn_search_APT_phrase (zh, zapt, termz, attributeSet, + res = rpn_search_APT_and_list(zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, - num_bases, basenames); + xpath_use, + num_bases, basenames, rset_nmem, + rset, kc); + } + else if (!strcmp(search_type, "or-list")) + { + res = rpn_search_APT_or_list(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem, + rset, kc); + } + else if (!strcmp(search_type, "local")) + { + res = rpn_search_APT_local(zh, zapt, termz, attributeSet, stream, + rank_type, rset_nmem, rset, kc); } - else if (!strcmp (search_type, "and-list")) + else if (!strcmp(search_type, "numeric")) { - return rpn_search_APT_and_list (zh, zapt, termz, attributeSet, - reg_id, complete_flag, rank_type, - num_bases, basenames); + res = rpn_search_APT_numeric(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem, + rset, kc); } - else if (!strcmp (search_type, "or-list")) + else { - return rpn_search_APT_or_list (zh, zapt, termz, attributeSet, - reg_id, complete_flag, rank_type, - num_bases, basenames); + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); + res = ZEBRA_FAIL; } - else if (!strcmp (search_type, "local")) + if (res != ZEBRA_OK) + return res; + if (!*rset) + return ZEBRA_FAIL; + return rpn_search_xpath(zh, num_bases, basenames, + stream, rank_type, *rset, + xpath_len, xpath, rset_nmem, rset, kc); +} + +static ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + RSET **result_sets, int *num_result_sets, + Z_Operator *parent_op, + struct rset_key_control *kc); + +ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + RSET *result_set) +{ + RSET *result_sets = 0; + int num_result_sets = 0; + ZEBRA_RES res; + struct rset_key_control *kc = zebra_key_control_create(zh); + + res = rpn_search_structure(zh, zs, attributeSet, + stream, rset_nmem, + sort_sequence, + num_bases, basenames, + &result_sets, &num_result_sets, + 0 /* no parent op */, + kc); + if (res != ZEBRA_OK) { - return rpn_search_APT_local (zh, zapt, termz, attributeSet, - rank_type); + int i; + for (i = 0; ierrCode = 118; - return NULL; + (*kc->dec)(kc); + return res; } -static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, - oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, - int num_bases, char **basenames) +ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + RSET **result_sets, int *num_result_sets, + Z_Operator *parent_op, + struct rset_key_control *kc) { - RSET r = NULL; + *num_result_sets = 0; if (zs->which == Z_RPNStructure_complex) { + ZEBRA_RES res; 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) - 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_delete (bool_parms.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); - break; - case Z_Operator_or: - r = rset_create (rset_kind_or, &bool_parms); - break; - case Z_Operator_and_not: - r = rset_create (rset_kind_not, &bool_parms); - 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 + RSET *result_sets_l = 0; + int num_result_sets_l = 0; + RSET *result_sets_r = 0; + int num_result_sets_r = 0; + + res = rpn_search_structure(zh, zs->u.complex->s1, + attributeSet, stream, rset_nmem, + sort_sequence, + num_bases, basenames, + &result_sets_l, &num_result_sets_l, + zop, kc); + if (res != ZEBRA_OK) + { + int i; + for (i = 0; iu.complex->s2, + attributeSet, stream, rset_nmem, + sort_sequence, + num_bases, basenames, + &result_sets_r, &num_result_sets_r, + zop, kc); + if (res != ZEBRA_OK) + { + int i; + for (i = 0; iu.prox->u.known != Z_ProxUnit_word) - { - char *val = nmem_malloc (stream, 16); - zh->errCode = 132; - zh->errString = val; - sprintf (val, "%d", *zop->u.prox->u.known); - return NULL; - } -#else - if (*zop->u.prox->proximityUnitCode != Z_ProxUnit_word) - { - char *val = nmem_malloc (stream, 16); - zh->errCode = 132; - zh->errString = val; - sprintf (val, "%d", *zop->u.prox->proximityUnitCode); - return NULL; - } -#endif - r = rpn_proximity (zh, bool_parms.rset_l, bool_parms.rset_r, - *zop->u.prox->ordered, - (!zop->u.prox->exclusion ? 0 : - *zop->u.prox->exclusion), - *zop->u.prox->relationType, - *zop->u.prox->distance); - break; - default: - zh->errCode = 110; - return NULL; - } + /* make a new list of result for all children */ + *num_result_sets = num_result_sets_l + num_result_sets_r; + *result_sets = nmem_malloc(stream, *num_result_sets * + sizeof(**result_sets)); + memcpy(*result_sets, result_sets_l, + num_result_sets_l * sizeof(**result_sets)); + memcpy(*result_sets + num_result_sets_l, result_sets_r, + num_result_sets_r * sizeof(**result_sets)); + + if (!parent_op || parent_op->which != zop->which + || (zop->which != Z_Operator_and && + zop->which != Z_Operator_or)) + { + /* parent node different from this one (or non-present) */ + /* we must combine result sets now */ + RSET rset; + switch (zop->which) + { + case Z_Operator_and: + rset = rset_create_and(rset_nmem, kc, + kc->scope, + *num_result_sets, *result_sets); + break; + case Z_Operator_or: + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0, /* termid */ + *num_result_sets, *result_sets); + break; + case Z_Operator_and_not: + rset = rset_create_not(rset_nmem, kc, + kc->scope, + (*result_sets)[0], + (*result_sets)[1]); + break; + case Z_Operator_prox: + if (zop->u.prox->which != Z_ProximityOperator_known) + { + zebra_setError(zh, + YAZ_BIB1_UNSUPP_PROX_UNIT_CODE, + 0); + return ZEBRA_FAIL; + } + if (*zop->u.prox->u.known != Z_ProxUnit_word) + { + zebra_setError_zint(zh, + YAZ_BIB1_UNSUPP_PROX_UNIT_CODE, + *zop->u.prox->u.known); + return ZEBRA_FAIL; + } + else + { + rset = rset_create_prox(rset_nmem, kc, + kc->scope, + *num_result_sets, *result_sets, + *zop->u.prox->ordered, + (!zop->u.prox->exclusion ? + 0 : *zop->u.prox->exclusion), + *zop->u.prox->relationType, + *zop->u.prox->distance ); + } + break; + default: + zebra_setError(zh, YAZ_BIB1_OPERATOR_UNSUPP, 0); + return ZEBRA_FAIL; + } + *num_result_sets = 1; + *result_sets = nmem_malloc(stream, *num_result_sets * + sizeof(**result_sets)); + (*result_sets)[0] = rset; + } } else if (zs->which == Z_RPNStructure_simple) { + RSET rset; + ZEBRA_RES res; + if (zs->u.simple->which == Z_Operand_APT) { - logf (LOG_DEBUG, "rpn_search_APT"); - r = rpn_search_APT (zh, zs->u.simple->u.attributesPlusTerm, - attributeSet, stream, sort_sequence, - num_bases, basenames); + yaz_log(YLOG_DEBUG, "rpn_search_APT"); + res = rpn_search_APT(zh, zs->u.simple->u.attributesPlusTerm, + attributeSet, stream, sort_sequence, + num_bases, basenames, rset_nmem, &rset, + kc); + if (res != ZEBRA_OK) + return res; } 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); + yaz_log(YLOG_DEBUG, "rpn_search_ref"); + rset = resultSetRef(zh, zs->u.simple->u.resultSetId); + if (!rset) + { + zebra_setError(zh, + YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, + zs->u.simple->u.resultSetId); + return ZEBRA_FAIL; + } + rset_dup(rset); } else { - zh->errCode = 3; - return NULL; + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); + return ZEBRA_FAIL; } + *num_result_sets = 1; + *result_sets = nmem_malloc(stream, *num_result_sets * + sizeof(**result_sets)); + (*result_sets)[0] = rset; } else { - zh->errCode = 3; - return NULL; - } - return r; -} - - -RSET rpn_search (ZebraHandle zh, NMEM nmem, - Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname, - ZebraSet sset) -{ - RSET rset; - oident *attrset; - oid_value attributeSet; - Z_SortKeySpecList *sort_sequence; - int sort_status, i; - - zh->errCode = 0; - zh->errString = NULL; - zh->hits = 0; - - sort_sequence = nmem_malloc (nmem, sizeof(*sort_sequence)); - sort_sequence->num_specs = 10; - 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; - - attrset = oid_getentbyoid (rpn->attributeSetId); - attributeSet = attrset->value; - rset = rpn_search_structure (zh, rpn->RPNStructure, attributeSet, - nmem, sort_sequence, num_bases, basenames); - if (!rset) - 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); - 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); - } + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); + return ZEBRA_FAIL; } - return rset; + return ZEBRA_OK; } struct scan_info_entry { @@ -2094,64 +2577,94 @@ struct scan_info { static int scan_handle (char *name, const char *info, int pos, void *client) { int len_prefix, idx; - struct scan_info *scan_info = client; + struct scan_info *scan_info = (struct scan_info *) client; len_prefix = strlen(scan_info->prefix); if (memcmp (name, scan_info->prefix, len_prefix)) return 1; if (pos > 0) - idx = scan_info->after - pos + scan_info->before; + idx = scan_info->after - pos + scan_info->before; else idx = - pos - 1; - scan_info->list[idx].term = odr_malloc (scan_info->odr, - strlen(name + len_prefix)+1); - strcpy (scan_info->list[idx].term, name + len_prefix); + + /* skip special terms.. of no interest */ + if (name[len_prefix] < 4) + return 1; + + if (idx < 0) + return 0; + scan_info->list[idx].term = (char *) + odr_malloc(scan_info->odr, strlen(name + len_prefix)+1); + strcpy(scan_info->list[idx].term, name + len_prefix); assert (*info == sizeof(ISAM_P)); memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAM_P)); return 0; } -static void scan_term_untrans (ZebraHandle zh, NMEM stream, int reg_type, - char **dst, const char *src) +void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type, + 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 = nmem_malloc (stream, strlen(term_dst)+1); - strcpy (*dst, term_dst); + zebra_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) +static void count_set(ZebraHandle zh, RSET rset, zint *count) { - int psysno = 0; - int kno = 0; + zint psysno = 0; struct it_key key; RSFD rfd; - int term_index; - logf (LOG_DEBUG, "count_set"); + yaz_log(YLOG_DEBUG, "count_set"); + + rset->hits_limit = zh->approx_limit; *count = 0; - rfd = rset_open (r, RSETF_READ); - while (rset_read (r, rfd, &key, &term_index)) + rfd = rset_open(rset, RSETF_READ); + while (rset_read(rfd, &key,0 /* never mind terms */)) { - if (key.sysno != psysno) + if (key.mem[0] != psysno) { - psysno = key.sysno; - (*count)++; + psysno = key.mem[0]; + if (rfd->counted_items >= rset->hits_limit) + break; } - kno++; } - rset_close (r, rfd); - logf (LOG_DEBUG, "%d keys, %d records", kno, *count); + rset_close (rfd); + *count = rset->hits_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) +#define RPN_MAX_ORDS 32 + +ZEBRA_RES 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, RSET limit_set, int return_zero) { int i; int pos = *position; @@ -2160,107 +2673,133 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int after; int base_no; char termz[IT_MAX_WORD+20]; - AttrType use; - int use_value; struct scan_info *scan_info_array; ZebraScanEntry *glist; - int ords[32], ord_no = 0; - int ptr[32]; + int ords[RPN_MAX_ORDS], ord_no = 0; + int ptr[RPN_MAX_ORDS]; - unsigned reg_id; + unsigned index_type; char *search_type = NULL; - char *rank_type = NULL; + char rank_type[128]; int complete_flag; int sort_flag; + NMEM rset_nmem = NULL; + struct rset_key_control *kc = 0; + + *list = 0; + *is_partial = 0; if (attributeset == VAL_NONE) attributeset = VAL_BIB1; - zlog_scan (zapt, attributeset); - logf (LOG_DEBUG, "position = %d, num = %d", pos, num); + if (!limit_set) + { + AttrType termset; + int termset_value_numeric; + const char *termset_value_string; + attr_init_APT(&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); + } + } - attr_init (&use, zapt, 1); - use_value = attr_find (&use, &attributeset); - - if (zebra_maps_attr (zh->zebra_maps, zapt, ®_id, &search_type, - &rank_type, &complete_flag, &sort_flag)) + yaz_log(YLOG_DEBUG, "position = %d, num = %d set=%d", + pos, num, attributeset); + + if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type, + rank_type, &complete_flag, &sort_flag)) { - zh->errCode = 113; - return ; + *num_entries = 0; + zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_TYPE, 0); + return ZEBRA_FAIL; } - - if (use_value == -1) - use_value = 1016; - for (base_no = 0; base_no < num_bases && ord_no < 32; base_no++) + for (base_no = 0; base_no < num_bases && ord_no < RPN_MAX_ORDS; base_no++) { - int r; - attent attp; - data1_local_attribute *local_attr; + int ord; - if ((r=att_getentbyatt (zh, &attp, attributeset, use_value))) - { - logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d", - attributeset, use_value); - if (r == -1) - zh->errCode = 114; - else - zh->errCode = 121; - } - if (zebraExplain_curDatabase (zh->zei, basenames[base_no])) - { - zh->errString = basenames[base_no]; - zh->errCode = 109; /* Database unavailable */ - return; - } - for (local_attr = attp.local_attributes; local_attr && ord_no < 32; - local_attr = local_attr->next) - { - int ord; - - ord = zebraExplain_lookupSU (zh->zei, attp.attset_ordinal, - local_attr->local); - if (ord > 0) - ords[ord_no++] = ord; - } + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + *num_entries = 0; + return ZEBRA_FAIL; + } + if (zebra_apt_get_ord(zh, zapt, index_type, 0, attributeset, &ord) + != ZEBRA_OK) + continue; + ords[ord_no++] = ord; } if (ord_no == 0) { - zh->errCode = 113; - return; + *num_entries = 0; + return ZEBRA_FAIL; } /* prepare dictionary scanning */ + if (num < 1) + { + *num_entries = 0; + return ZEBRA_OK; + } before = pos-1; + if (before < 0) + before = 0; after = 1+num-pos; - scan_info_array = odr_malloc (stream, ord_no * sizeof(*scan_info_array)); + if (after < 0) + after = 0; + yaz_log(YLOG_DEBUG, "rpn_scan pos=%d num=%d before=%d " + "after=%d before+after=%d", + pos, num, before, after, before+after); + scan_info_array = (struct scan_info *) + 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_id, &rcmi); + rpn_char_map_prepare (zh->reg, index_type, &rcmi); scan_info->before = before; scan_info->after = after; scan_info->odr = stream; - scan_info->list = odr_malloc (stream, (before+after)* - sizeof(*scan_info->list)); + scan_info->list = (struct scan_info_entry *) + odr_malloc(stream, (before+after) * sizeof(*scan_info->list)); for (j = 0; jlist[j].term = NULL; - prefix_len += key_SU_code (ords[i], termz + prefix_len); - termz[prefix_len++] = reg_id; + prefix_len += key_SU_encode (ords[i], termz + prefix_len); termz[prefix_len] = 0; - strcpy (scan_info->prefix, termz); + strcpy(scan_info->prefix, termz); - trans_scan_term (zh, zapt, termz+prefix_len, reg_id); - - dict_scan (zh->dict, termz, &before_tmp, &after_tmp, scan_info, - scan_handle); + if (trans_scan_term(zh, zapt, termz+prefix_len, index_type) == + ZEBRA_FAIL) + return ZEBRA_FAIL; + + dict_scan(zh->reg->dict, termz, &before_tmp, &after_tmp, + scan_info, scan_handle); } - glist = odr_malloc (stream, (before+after)*sizeof(*glist)); + glist = (ZebraScanEntry *) + odr_malloc(stream, (before+after)*sizeof(*glist)); + + rset_nmem = nmem_create(); + kc = zebra_key_control_create(zh); /* consider terms after main term */ for (i = 0; i < ord_no; i++) @@ -2272,12 +2811,14 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int j, j0 = -1; const char *mterm = NULL; const char *tst; - RSET rset; - + RSET rset = 0; + int lo = i + pos-1; /* offset in result list */ + + /* find: j0 is the first of the minimal values */ for (j = 0; j < ord_no; j++) { - if (ptr[j] < before+after && - (tst=scan_info_array[j].list[ptr[j]].term) && + if (ptr[j] < before+after && ptr[j] >= 0 && + (tst = scan_info_array[j].list[ptr[j]].term) && (!mterm || strcmp (tst, mterm) < 0)) { j0 = j; @@ -2285,120 +2826,178 @@ 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); - rset = rset_trunc (zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1, - glist[i+before].term, strlen(glist[i+before].term), - NULL); + break; /* no value found, stop */ - ptr[j0]++; + /* get result set for first one , but only if it's within bounds */ + if (lo >= 0) + { + /* get result set for first term */ + zebra_term_untrans_iconv(zh, stream->mem, index_type, + &glist[lo].term, mterm); + rset = rset_trunc(zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1, + glist[lo].term, strlen(glist[lo].term), + NULL, 0, zapt->term->which, rset_nmem, + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); + } + ptr[j0]++; /* move index for this set .. */ + /* get result set for remaining scan terms */ for (j = j0+1; j= 0 && + (tst = scan_info_array[j].list[ptr[j]].term) && !strcmp (tst, mterm)) { - rset_bool_parms bool_parms; - RSET rset2; - - rset2 = - rset_trunc (zh, &scan_info_array[j].list[ptr[j]].isam_p, 1, - glist[i+before].term, - strlen(glist[i+before].term), NULL); - - 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); - + if (lo >= 0) + { + RSET rsets[2]; + + rsets[0] = rset; + rsets[1] = + rset_trunc( + zh, &scan_info_array[j].list[ptr[j]].isam_p, 1, + glist[lo].term, + strlen(glist[lo].term), NULL, 0, + zapt->term->which,rset_nmem, + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */ ); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0 /* termid */, + 2, rsets); + } ptr[j]++; } } - count_set (rset, &glist[i+before].occurrences); - rset_delete (rset); + if (lo >= 0) + { + zint count; + /* merge with limit_set if given */ + if (limit_set) + { + RSET rsets[2]; + rsets[0] = rset; + rsets[1] = rset_dup(limit_set); + + rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets); + } + /* count it */ + count_set(zh, rset, &count); + glist[lo].occurrences = count; + rset_delete(rset); + } } if (i < after) { - *num_entries -= (after-i); - *is_partial = 1; + *num_entries -= (after-i); + *is_partial = 1; + if (*num_entries < 0) + { + (*kc->dec)(kc); + nmem_destroy(rset_nmem); + *num_entries = 0; + return ZEBRA_OK; + } } - /* consider terms before main term */ for (i = 0; i 0)) - { - j0 = j; - mterm = tst; - } - } - if (j0 == -1) - break; - - scan_term_untrans (zh, stream->mem, reg_id, - &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); - - ptr[j0]++; - - for (j = j0+1; j= 0 && + (tst = scan_info_array[j].list[before-1-ptr[j]].term) && + (!mterm || strcmp (tst, mterm) > 0)) + { + j0 = j; + mterm = tst; + } + } + if (j0 == -1) + break; + + zebra_term_untrans_iconv(zh, stream->mem, index_type, + &glist[lo].term, mterm); + + rset = rset_trunc + (zh, &scan_info_array[j0].list[before-1-ptr[j0]].isam_p, 1, + glist[lo].term, strlen(glist[lo].term), + NULL, 0, zapt->term->which, rset_nmem, + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); + + ptr[j0]++; + + for (j = j0+1; j= 0 && + (tst = scan_info_array[j].list[before-1-ptr[j]].term) && + !strcmp (tst, mterm)) + { + RSET rsets[2]; + + rsets[0] = rset; + rsets[1] = rset_trunc( + zh, + &scan_info_array[j].list[before-1-ptr[j]].isam_p, 1, + glist[lo].term, + strlen(glist[lo].term), NULL, 0, + zapt->term->which, rset_nmem, + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0 /* termid */, 2, rsets); + + ptr[j]++; + } + } + if (limit_set) + { + RSET rsets[2]; + rsets[0] = rset; + rsets[1] = rset_dup(limit_set); + + rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets); + } + count_set(zh, rset, &count); + glist[lo].occurrences = count; + rset_delete (rset); } + (*kc->dec)(kc); + nmem_destroy(rset_nmem); i = before-i; if (i) { *is_partial = 1; *position -= i; *num_entries -= i; + if (*num_entries <= 0) + { + *num_entries = 0; + return ZEBRA_OK; + } } + *list = glist + i; /* list is set to first 'real' entry */ - logf (LOG_DEBUG, "position = %d, num_entries = %d", - *position, *num_entries); - if (zh->errCode) - logf (LOG_DEBUG, "scan error: %d", zh->errCode); + yaz_log(YLOG_DEBUG, "position = %d, num_entries = %d", + *position, *num_entries); + return ZEBRA_OK; } - + +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +