X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=bb8dc7a24358cd8ef6f80c558248028b45588689;hb=5e7516d00451ada59a311fad05e8e3959242cdc7;hp=b8b2a766c17cf8ab494371217de4c778bcb70f21;hpb=89d059a3e4541ff00bbb4193ba34c1dbe1e21928;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index b8b2a76..bb8dc7a 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,374 +1,9 @@ /* - * Copyright (C) 1995-2001, Index Data + * Copyright (C) 1995-2002, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * - * $Log: zrpn.c,v $ - * Revision 1.108 2001-11-14 22:06:27 adam - * Rank-weight may be controlled via query. - * - * Revision 1.107 2001/10/15 19:53:43 adam - * POSIX thread updates. First work on term sets. - * - * Revision 1.106 2001/04/11 07:58:13 adam - * Bug fix: multiple space mapped to one space when using complete subfield. - * - * Revision 1.105 2000/11/08 13:46:59 adam - * Fixed scan: server could break if bad attribute/database was selected. - * Work on remote update. - * - * Revision 1.104 2000/04/05 09:49:35 adam - * On Unix, zebra/z'mbol uses automake. - * - * Revision 1.103 2000/03/20 19:08:36 adam - * Added remote record import using Z39.50 extended services and Segment - * Requests. - * - * Revision 1.102 2000/03/15 15:00:31 adam - * First work on threaded version. - * - * Revision 1.101 2000/03/02 14:35:03 adam - * Fixed proximity handling. - * - * Revision 1.100 1999/12/28 15:48:12 adam - * Minor Fix. - * - * Revision 1.99 1999/12/23 09:03:32 adam - * Changed behaviour of trunc=105 so that * is regular .* and ! is regular . - * - * Revision 1.98 1999/11/30 13:48:04 adam - * Improved installation. Updated for inclusion of YAZ header files. - * - * Revision 1.97 1999/10/14 14:33:50 adam - * Added truncation 5=106. - * - * Revision 1.96 1999/09/23 10:05:05 adam - * Implemented structure=105 searching. - * - * Revision 1.95 1999/09/07 07:19:21 adam - * Work on character mapping. Implemented replace rules. - * - * Revision 1.94 1999/07/20 13:59:18 adam - * Fixed bug that occurred when phrases had 0 hits. - * - * Revision 1.93 1999/06/17 14:38:40 adam - * Bug fix: Scan SEGV'ed when getting unknown use attribute. - * - * Revision 1.92 1999/05/26 07:49:13 adam - * C++ compilation. - * - * Revision 1.91 1999/02/02 14:51:13 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.90 1998/11/16 16:03:43 adam - * Moved loggin utilities to Yaz. Was implemented in file zlogs.c. - * - * Revision 1.89 1998/11/16 10:11:55 adam - * Added addtional info for error 114 - unsupported use attribute. - * - * Revision 1.88 1998/10/18 07:54:52 adam - * Additional info added for diagnostics 114 (Unsupported use attribute) and - * 121 (Unsupported attribute set). - * - * Revision 1.87 1998/09/28 11:19:12 adam - * Fix for Compiled ASN.1. - * - * 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.114 2002-04-12 14:55:22 adam Exp $ */ #include #include @@ -379,12 +14,13 @@ #endif #include -#include "zserver.h" +#include "index.h" #include #include #include #include +#include struct rpn_char_map_info { ZebraMaps zm; @@ -397,12 +33,12 @@ static const char **rpn_char_map_handler (void *vp, const char **from, int len) return zebra_maps_input (p->zm, p->reg_type, from, len); } -static void rpn_char_map_prepare (ZebraHandle zh, int reg_type, +static void rpn_char_map_prepare (struct zebra_register *reg, int reg_type, struct rpn_char_map_info *map_info) { - map_info->zm = zh->service->zebra_maps; + map_info->zm = reg->zebra_maps; map_info->reg_type = reg_type; - dict_grep_cmap (zh->service->dict, map_info, rpn_char_map_handler); + dict_grep_cmap (reg->dict, map_info, rpn_char_map_handler); } typedef struct { @@ -517,7 +153,7 @@ static void term_untrans (ZebraHandle zh, int reg_type, { while (*src) { - const char *cp = zebra_maps_output (zh->service->zebra_maps, + const char *cp = zebra_maps_output (zh->reg->zebra_maps, reg_type, &src); if (!cp) *dst++ = *src++; @@ -574,7 +210,7 @@ static void add_isam_p (const char *name, const char *info, term_untrans (p->zh, p->reg_type, term_tmp, name+len+1); logf (LOG_LOG, "grep: %d %c %s", su_code, name[len], term_tmp); - zebraExplain_lookup_ord (p->zh->service->zei, + zebraExplain_lookup_ord (p->zh->reg->zei, su_code, &db, &set, &use); logf (LOG_LOG, "grep: set=%d use=%d db=%s", set, use, db); @@ -1021,7 +657,7 @@ static int string_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, switch (relation_value) { case 1: - if (!term_100 (zh->service->zebra_maps, reg_type, + if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; @@ -1051,7 +687,7 @@ static int string_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, *term_tmp = '\0'; break; case 2: - if (!term_100 (zh->service->zebra_maps, reg_type, + if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; @@ -1082,7 +718,7 @@ static int string_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, *term_tmp = '\0'; break; case 5: - if (!term_100 (zh->service->zebra_maps, reg_type, + if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; logf (LOG_DEBUG, "Relation >"); @@ -1114,7 +750,7 @@ static int string_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, *term_tmp = '\0'; break; case 4: - if (!term_100 (zh->service->zebra_maps, reg_type, term_sub, + if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; logf (LOG_DEBUG, "Relation >="); @@ -1151,7 +787,7 @@ static int string_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, case 3: default: logf (LOG_DEBUG, "Relation ="); - if (!term_100 (zh->service->zebra_maps, reg_type, term_sub, + if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; strcat (term_tmp, "("); @@ -1162,12 +798,43 @@ static int string_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, } static int 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 **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); + +static RSET 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) +{ + int r; + grep_info->isam_p_indx = 0; + r = string_term (zh, zapt, term_sub, attributeSet, stream, grep_info, + reg_type, complete_flag, num_bases, basenames, + term_dst); + if (r < 1) + return 0; + logf (LOG_DEBUG, "term: %s", term_dst); + return rset_trunc (zh, grep_info->isam_p_buf, + grep_info->isam_p_indx, term_dst, + strlen(term_dst), rank_type, 1 /* preserve pos */); +} + + +static int 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) { char term_dict[2*IT_MAX_WORD+4000]; int j, r, base_no; @@ -1175,14 +842,15 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int truncation_value; AttrType use; int use_value; + const char *use_string = 0; 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); + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); attr_init (&use, zapt, 1); - use_value = attr_find (&use, &curAttributeSet); + use_value = attr_find_ex (&use, &curAttributeSet, &use_string); logf (LOG_DEBUG, "string_term, use value %d", use_value); attr_init (&truncation, zapt, 5); truncation_value = attr_find (&truncation, NULL); @@ -1190,78 +858,92 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (use_value == -1) use_value = 1016; + if (use_value == -2) + use_value = 1016; for (base_no = 0; base_no < num_bases; base_no++) { attent attp; + data1_local_attribute id_xpath_attr; data1_local_attribute *local_attr; int max_pos, prefix_len = 0; termp = *term_sub; - if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value))) - { - logf (LOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", - curAttributeSet, use_value, r); - if (r == -1) - { - char val_str[32]; - sprintf (val_str, "%d", use_value); - zh->errCode = 114; - zh->errString = nmem_strdup (stream, val_str); - } - else - { - int oid[OID_SIZE]; - struct oident oident; - oident.proto = PROTO_Z3950; - oident.oclass = CLASS_ATTSET; - oident.value = curAttributeSet; - oid_ent_to_oid (&oident, oid); - - zh->errCode = 121; - zh->errString = nmem_strdup (stream, oident.desc); - } - return -1; - } - if (zebraExplain_curDatabase (zh->service->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; } + if (curAttributeSet == VAL_IDXPATH) + { + attp.local_attributes = &id_xpath_attr; + attp.attset_ordinal = curAttributeSet; + id_xpath_attr.next = 0; + id_xpath_attr.local = use_value; + } + else + { + 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) + { + char val_str[32]; + sprintf (val_str, "%d", use_value); + zh->errCode = 114; + zh->errString = nmem_strdup (stream, val_str); + } + else + { + int oid[OID_SIZE]; + struct oident oident; + + oident.proto = PROTO_Z3950; + oident.oclass = CLASS_ATTSET; + oident.value = curAttributeSet; + oid_ent_to_oid (&oident, oid); + + zh->errCode = 121; + zh->errString = nmem_strdup (stream, oident.desc); + } + return -1; + } + } 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->service->zei, attp.attset_ordinal, - local_attr->local); + char ord_buf[32]; + int i, ord_len; + + ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, + local_attr->local); if (ord < 0) continue; if (prefix_len) term_dict[prefix_len++] = '|'; else term_dict[prefix_len++] = '('; - - ord_len = key_SU_encode (ord, ord_buf); - for (i = 0; ierrCode = 114; - zh->errString = nmem_strdup (stream, val_str); + char val_str[32]; + sprintf (val_str, "%d", use_value); + zh->errCode = 114; + zh->errString = nmem_strdup (stream, val_str); return -1; } - term_dict[prefix_len++] = ')'; + 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]); @@ -1276,59 +958,59 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, reg_type, space_split, term_dst)) return 0; logf (LOG_DEBUG, "dict_lookup_grep: %s", term_dict+prefix_len); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, + r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r); break; case 1: /* right truncation */ term_dict[j++] = '('; - if (!term_100 (zh->service->zebra_maps, reg_type, + if (!term_100 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) return 0; strcat (term_dict, ".*)"); - dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); break; case 2: /* keft truncation */ term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; - if (!term_100 (zh->service->zebra_maps, reg_type, + if (!term_100 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) return 0; strcat (term_dict, ")"); - dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); break; case 3: /* left&right truncation */ term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; - if (!term_100 (zh->service->zebra_maps, reg_type, + if (!term_100 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) return 0; strcat (term_dict, ".*)"); - dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); break; zh->errCode = 120; return -1; case 101: /* process # in term */ term_dict[j++] = '('; - if (!term_101 (zh->service->zebra_maps, reg_type, + if (!term_101 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) return 0; strcat (term_dict, ")"); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep err, trunc=#: %d", r); break; case 102: /* Regexp-1 */ term_dict[j++] = '('; - if (!term_102 (zh->service->zebra_maps, reg_type, + if (!term_102 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) return 0; strcat (term_dict, ")"); logf (LOG_DEBUG, "Regexp-1 tolerance=%d", r); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep err, trunc=regular: %d", @@ -1337,12 +1019,12 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, case 103: /* Regexp-2 */ r = 1; term_dict[j++] = '('; - if (!term_103 (zh->service->zebra_maps, reg_type, + if (!term_103 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, &r, space_split, term_dst)) return 0; strcat (term_dict, ")"); logf (LOG_DEBUG, "Regexp-2 tolerance=%d", r); - r = dict_lookup_grep (zh->service->dict, term_dict, r, grep_info, + r = dict_lookup_grep (zh->reg->dict, term_dict, r, grep_info, &max_pos, 2, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep err, trunc=eregular: %d", @@ -1350,33 +1032,33 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, break; case 104: /* process # and ! in term */ term_dict[j++] = '('; - if (!term_104 (zh->service->zebra_maps, reg_type, + if (!term_104 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) return 0; strcat (term_dict, ")"); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep err, trunc=#/!: %d", r); break; case 105: /* process * and ! in term */ term_dict[j++] = '('; - if (!term_105 (zh->service->zebra_maps, reg_type, + if (!term_105 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst, 1)) return 0; strcat (term_dict, ")"); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep err, trunc=*/!: %d", r); break; case 106: /* process * and ! in term */ term_dict[j++] = '('; - if (!term_105 (zh->service->zebra_maps, reg_type, + if (!term_105 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst, 0)) return 0; strcat (term_dict, ")"); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, + r = dict_lookup_grep (zh->reg->dict, term_dict, 0, grep_info, &max_pos, 0, grep_handle); if (r) logf (LOG_WARN, "dict_lookup_grep err, trunc=*/!: %d", r); @@ -1415,7 +1097,7 @@ static void trans_scan_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, while ((len = (cp_end - cp)) > 0) { - map = zebra_maps_input (zh->service->zebra_maps, reg_type, &cp, len); + map = zebra_maps_input (zh->reg->zebra_maps, reg_type, &cp, len); if (**map == *CHR_SPACE) space_map = *map; else @@ -1501,8 +1183,9 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, parms.rset_term = rset_term_create (prox_term, length_prox_term, flags); parms.rset_term->nn = min_nn; + parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->service->res, "setTmpDir"); + parms.temp_path = res_get (zh->res, "setTmpDir"); result = rset_create (rset_kind_temp, &parms); rsfd_result = rset_open (result, RSETF_WRITE); @@ -1559,8 +1242,9 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, parms.rset_term = rset_term_create (prox_term, length_prox_term, flags); parms.rset_term->nn = min_nn; + parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->service->res, "setTmpDir"); + parms.temp_path = res_get (zh->res, "setTmpDir"); result = rset_create (rset_kind_temp, &parms); rsfd_result = rset_open (result, RSETF_WRITE); @@ -1684,7 +1368,7 @@ char *normalize_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, break; } if (ex_list) - wrbuf = zebra_replace(zh->service->zebra_maps, reg_id, ex_list, + wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, ex_list, termz, strlen(termz)); if (!wrbuf) return nmem_strdup(stream, termz); @@ -1697,6 +1381,14 @@ char *normalize_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, } } +static void grep_info_delete (struct grep_info *grep_info) +{ +#ifdef TERM_COUNT + xfree(grep_info->term_no); +#endif + xfree (grep_info->isam_p_buf); +} + static int grep_info_prepare (ZebraHandle zh, Z_AttributesPlusTerm *zapt, struct grep_info *grep_info, @@ -1755,39 +1447,33 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; - int i, r, rset_no = 0; + int i, rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; + *term_dst = 0; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; while (1) { logf (LOG_DEBUG, "APT_phrase termp=%s", termp); - grep_info.isam_p_indx = 0; - r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst); - if (r < 1) + rset[rset_no] = term_trunc (zh, zapt, &termp, attributeSet, + stream, &grep_info, + reg_type, complete_flag, + num_bases, basenames, + term_dst, rank_type); + if (!rset[rset_no]) 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 >= (int) (sizeof(rset)/sizeof(*rset))) break; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); + grep_info_delete (&grep_info); if (rset_no == 0) { rset_null_parms parms; - parms.rset_term = rset_term_create (term_dst, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type); return rset_create (rset_kind_null, &parms); } else if (rset_no == 1) @@ -1809,7 +1495,7 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; - int i, r, rset_no = 0; + int i, rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; @@ -1819,29 +1505,22 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, while (1) { logf (LOG_DEBUG, "APT_or_list termp=%s", termp); - grep_info.isam_p_indx = 0; - r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst); - if (r < 1) + rset[rset_no] = term_trunc (zh, zapt, &termp, attributeSet, + stream, &grep_info, + reg_type, complete_flag, + num_bases, basenames, + term_dst, rank_type); + if (!rset[rset_no]) 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 >= (int) (sizeof(rset)/sizeof(*rset))) break; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); + grep_info_delete (&grep_info); if (rset_no == 0) { rset_null_parms parms; - parms.rset_term = rset_term_create (term_dst, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type); return rset_create (rset_kind_null, &parms); } result = rset[0]; @@ -1869,7 +1548,7 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; - int i, r, rset_no = 0; + int i, rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; @@ -1879,29 +1558,23 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, while (1) { logf (LOG_DEBUG, "APT_and_list termp=%s", termp); - grep_info.isam_p_indx = 0; - r = string_term (zh, zapt, &termp, attributeSet, stream, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst); - if (r < 1) + rset[rset_no] = term_trunc (zh, zapt, &termp, attributeSet, + stream, &grep_info, + reg_type, complete_flag, + num_bases, basenames, + term_dst, rank_type); + if (!rset[rset_no]) 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 >= (int) (sizeof(rset)/sizeof(*rset))) break; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); + grep_info_delete (&grep_info); if (rset_no == 0) { rset_null_parms parms; - parms.rset_term = rset_term_create (term_dst, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type); return rset_create (rset_kind_null, &parms); } result = rset[0]; @@ -1938,7 +1611,7 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, logf (LOG_DEBUG, "numeric relation value=%d", relation_value); - if (!term_100 (zh->service->zebra_maps, reg_type, term_sub, term_tmp, 1, + if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, term_dst)) return 0; term_value = atoi (term_tmp); @@ -1966,7 +1639,7 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, sprintf (term_tmp, "(0*%d)", term_value); } logf (LOG_DEBUG, "dict_lookup_grep: %s", term_tmp); - r = dict_lookup_grep (zh->service->dict, term_dict, 0, grep_info, max_pos, + 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); @@ -1989,7 +1662,7 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, const char *termp; struct rpn_char_map_info rcmi; - rpn_char_map_prepare (zh, reg_type, &rcmi); + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); attr_init (&use, zapt, 1); use_value = attr_find (&use, &curAttributeSet); logf (LOG_DEBUG, "numeric_term, use value %d", use_value); @@ -2014,7 +1687,7 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, zh->errCode = 121; return -1; } - if (zebraExplain_curDatabase (zh->service->zei, basenames[base_no])) + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { zh->errCode = 109; /* Database unavailable */ zh->errString = basenames[base_no]; @@ -2027,7 +1700,7 @@ static int numeric_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, char ord_buf[32]; int i, ord_len; - ord = zebraExplain_lookupSU (zh->service->zei, attp.attset_ordinal, + ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, local_attr->local); if (ord < 0) continue; @@ -2092,15 +1765,13 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, logf (LOG_DEBUG, "term: %s", term_dst); rset[rset_no] = rset_trunc (zh, grep_info.isam_p_buf, grep_info.isam_p_indx, term_dst, - strlen(term_dst), rank_type); + strlen(term_dst), rank_type, + 0 /* preserve position */); assert (rset[rset_no]); if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) break; } -#ifdef TERM_COUNT - xfree(grep_info.term_no); -#endif - xfree (grep_info.isam_p_buf); + grep_info_delete (&grep_info); if (rset_no == 0) { rset_null_parms parms; @@ -2134,8 +1805,9 @@ static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, rset_temp_parms parms; parms.rset_term = rset_term_create (termz, -1, rank_type); + parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); - parms.temp_path = res_get (zh->service->res, "setTmpDir"); + parms.temp_path = res_get (zh->res, "setTmpDir"); result = rset_create (rset_kind_temp, &parms); rsfd = rset_open (result, RSETF_WRITE); @@ -2164,6 +1836,7 @@ static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, Z_AttributeElement *ae; int oid[OID_SIZE]; oident oe; + char termz[20]; attr_init (&sort_relation_type, zapt, 7); sort_relation_value = attr_find (&sort_relation_type, &attributeSet); @@ -2187,6 +1860,7 @@ static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, zapt->term->u.general->len); if (i >= sort_sequence->num_specs) i = 0; + sprintf (termz, "%d", i); oe.proto = PROTO_Z3950; oe.oclass = CLASS_ATTSET; @@ -2243,10 +1917,133 @@ static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, sort_sequence->specs[i] = sks; - parms.rset_term = rset_term_create ("", -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type); return rset_create (rset_kind_null, &parms); } +static RSET rpn_search_xpath (ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, + int num_bases, char **basenames, + NMEM stream, const char *rank_type, RSET rset) +{ + AttrType use; + const char *use_string = 0; + oid_value curAttributeSet = attributeSet; + char term_dict[2048]; + int base_no; + struct grep_info grep_info; + struct rpn_char_map_info rcmi; + + yaz_log (LOG_LOG, "rpn_search_xpath 1"); + attr_init (&use, zapt, 1); + attr_find_ex (&use, &curAttributeSet, &use_string); + + if (curAttributeSet != VAL_IDXPATH) + { + yaz_log (LOG_LOG, "rpn_search_xpath - not 1"); + return rset; + } + if (!use_string) + { + yaz_log (LOG_LOG, "rpn_search_xpath - not 2"); + return rset; + } + + rpn_char_map_prepare (zh->reg, '0', &rcmi); + + if (grep_info_prepare (zh, zapt, &grep_info, '0', stream)) + return 0; + + yaz_log (LOG_LOG, "rpn_search_xpath 2"); + for (base_no = 0; base_no < num_bases; base_no++) + { + rset_between_parms parms; + RSET rset_start_tag, rset_end_tag; + int ord, ord_len, i, r, max_pos; + int prefix_len ; + char ord_buf[32]; + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) + { + zh->errCode = 109; /* Database unavailable */ + zh->errString = basenames[base_no]; + return rset; + } + + prefix_len = 0; + ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, 1); + if (ord < 0) + continue; + 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 (LOG_LOG, "%s %d positions", use_string, + grep_info.isam_p_indx); + rset_start_tag = + rset_trunc (zh, grep_info.isam_p_buf, + grep_info.isam_p_indx, use_string, strlen(use_string), + rank_type, 1); + + prefix_len = 0; + ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, 2); + if (ord < 0) + continue; + 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 (LOG_LOG, "%s %d positions", use_string, + grep_info.isam_p_indx); + rset_end_tag = + rset_trunc (zh, grep_info.isam_p_buf, + grep_info.isam_p_indx, use_string, strlen(use_string), + rank_type, 1); + + parms.key_size = sizeof(struct it_key); + parms.cmp = key_compare_it; + parms.rset_l = rset_start_tag; + parms.rset_m = rset; + parms.rset_r = rset_end_tag; + parms.printer = key_print_it; + yaz_log (LOG_LOG, "rpn_search_xpath 4"); + rset = rset_create (rset_kind_between, &parms); + } + grep_info_delete (&grep_info); + + return rset; +} + + static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, NMEM stream, @@ -2259,8 +2056,9 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int complete_flag; int sort_flag; char termz[IT_MAX_WORD+1]; + RSET rset = 0; - zebra_maps_attr (zh->service->zebra_maps, zapt, ®_id, &search_type, + zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, rank_type, &complete_flag, &sort_flag); logf (LOG_DEBUG, "reg_id=%c", reg_id); @@ -2281,35 +2079,37 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!strcmp (search_type, "phrase")) { - return rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream, + rset = rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, num_bases, basenames); } else if (!strcmp (search_type, "and-list")) { - return rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream, + rset = rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, num_bases, basenames); } else if (!strcmp (search_type, "or-list")) { - return rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream, + rset = rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, num_bases, basenames); } else if (!strcmp (search_type, "local")) { - return rpn_search_APT_local (zh, zapt, termz, attributeSet, stream, + rset = rpn_search_APT_local (zh, zapt, termz, attributeSet, stream, rank_type); } else if (!strcmp (search_type, "numeric")) { - return rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream, + rset = rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, num_bases, basenames); } - zh->errCode = 118; - return NULL; + else + zh->errCode = 118; + return rpn_search_xpath (zh, zapt, attributeSet, num_bases, basenames, + stream, rank_type, rset); } static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, @@ -2594,18 +2394,20 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, if (attributeset == VAL_NONE) attributeset = VAL_BIB1; - logf (LOG_DEBUG, "position = %d, num = %d", pos, num); + yaz_log (LOG_DEBUG, "position = %d, num = %d set=%d", + pos, num, attributeset); attr_init (&use, zapt, 1); use_value = attr_find (&use, &attributeset); - if (zebra_maps_attr (zh->service->zebra_maps, zapt, ®_id, &search_type, + if (zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, rank_type, &complete_flag, &sort_flag)) { *num_entries = 0; zh->errCode = 113; return ; } + yaz_log (LOG_DEBUG, "use_value = %d", use_value); if (use_value == -1) use_value = 1016; @@ -2626,7 +2428,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, *num_entries = 0; return; } - if (zebraExplain_curDatabase (zh->service->zei, basenames[base_no])) + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { zh->errString = basenames[base_no]; zh->errCode = 109; /* Database unavailable */ @@ -2638,7 +2440,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, { int ord; - ord = zebraExplain_lookupSU (zh->service->zei, attp.attset_ordinal, + ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, local_attr->local); if (ord > 0) ords[ord_no++] = ord; @@ -2662,7 +2464,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, struct scan_info *scan_info = scan_info_array + i; struct rpn_char_map_info rcmi; - rpn_char_map_prepare (zh, reg_id, &rcmi); + rpn_char_map_prepare (zh->reg, reg_id, &rcmi); scan_info->before = before; scan_info->after = after; @@ -2680,7 +2482,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, trans_scan_term (zh, zapt, termz+prefix_len, reg_id); - dict_scan (zh->service->dict, termz, &before_tmp, &after_tmp, + dict_scan (zh->reg->dict, termz, &before_tmp, &after_tmp, scan_info, scan_handle); } glist = (ZebraScanEntry *) @@ -2714,7 +2516,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, &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); + NULL, 0); ptr[j0]++; for (j = j0+1; j