X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=432752f82d4c1ceb75e31163488d49e4ba3ee3e6;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=fe9a6bf36f1fdfc3fe07715ae080cb040efdda77;hpb=eed3cdbd136db8f184cbb30a9ad02539cb1a6eea;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index fe9a6bf..432752f 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -4,7 +4,17 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zrpn.c,v $ - * Revision 1.57 1996-11-11 13:38:02 adam + * 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 @@ -348,7 +358,7 @@ static int term_pre (char **src, const char *ct1, const char *ct2) return *s0; } -static int term_100 (char **src, char *dst) +static int term_100 (char **src, char *dst, int space_split) { char *s0, *s1, **map; int i = 0; @@ -360,7 +370,7 @@ static int term_100 (char **src, char *dst) { s1 = s0; map = map_chrs_input (&s0, strlen(s0)); - if (**map == *CHR_SPACE) + if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) { @@ -374,7 +384,7 @@ static int term_100 (char **src, char *dst) return i; } -static int term_101 (char **src, char *dst) +static int term_101 (char **src, char *dst, int space_split) { char *s0, *s1, **map; int i = 0; @@ -394,7 +404,7 @@ static int term_101 (char **src, char *dst) { s1 = s0; map = map_chrs_input (&s0, strlen(s0)); - if (**map == *CHR_SPACE) + if (space_split && **map == *CHR_SPACE) break; while (s1 < s0) { @@ -410,7 +420,7 @@ static int term_101 (char **src, char *dst) } -static int term_103 (char **src, char *dst, int *errors) +static int term_103 (char **src, char *dst, int *errors, int space_split) { int i = 0; char *s0, *s1, **map; @@ -449,9 +459,9 @@ static int term_103 (char **src, char *dst, int *errors) return i; } -static int term_102 (char **src, char *dst) +static int term_102 (char **src, char *dst, int space_split) { - return term_103 (src, dst, NULL); + return term_103 (src, dst, NULL, space_split); } /* gen_regular_rel - generate regular expression from relation @@ -581,7 +591,7 @@ static int relational_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, switch (relation_value) { case 1: - if (!term_100 (term_sub, term_dict)) + if (!term_100 (term_sub, term_dict, 1)) return 0; term_value = atoi (term_dict); if (term_value <= 0) @@ -590,7 +600,7 @@ static int relational_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, gen_regular_rel (term_dict + strlen(term_dict), term_value-1, 1); break; case 2: - if (!term_100 (term_sub, term_dict)) + if (!term_100 (term_sub, term_dict, 1)) return 0; term_value = atoi (term_dict); if (term_value < 0) @@ -599,7 +609,7 @@ static int relational_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, gen_regular_rel (term_dict + strlen(term_dict), term_value, 1); break; case 4: - if (!term_100 (term_sub, term_dict)) + if (!term_100 (term_sub, term_dict, 1)) return 0; term_value = atoi (term_dict); if (term_value < 0) @@ -608,7 +618,7 @@ static int relational_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, gen_regular_rel (term_dict + strlen(term_dict), term_value, 0); break; case 5: - if (!term_100 (term_sub, term_dict)) + if (!term_100 (term_sub, term_dict, 1)) return 0; term_value = atoi (term_dict); if (term_value < 0) @@ -631,7 +641,7 @@ static int relational_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, char **term_sub, int regType, oid_value attributeSet, struct grep_info *grep_info, - int num_bases, char **basenames) + int num_bases, char **basenames, int space_split) { char term_dict[2*IT_MAX_WORD+2]; int j, r, base_no; @@ -644,7 +654,7 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, attr_init (&use, zapt, 1); use_value = attr_find (&use, &curAttributeSet); - logf (LOG_DEBUG, "use value %d", use_value); + logf (LOG_DEBUG, "field_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); @@ -706,8 +716,8 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, { case -1: /* not specified */ case 100: /* do not truncate */ - term_dict[j++] = '('; - if (!term_100 (&termp, term_dict + j)) + term_dict[j++] = '('; + if (!term_100 (&termp, term_dict + j, space_split)) return 0; strcat (term_dict, ")"); r = dict_lookup_grep (zi->dict, term_dict, 0, grep_info, @@ -717,7 +727,7 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, break; case 1: /* right truncation */ term_dict[j++] = '('; - if (!term_100 (&termp, term_dict + j)) + if (!term_100 (&termp, term_dict + j, space_split)) return 0; strcat (term_dict, ".*)"); dict_lookup_grep (zi->dict, term_dict, 0, grep_info, @@ -729,7 +739,7 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, return -1; case 101: /* process # in term */ term_dict[j++] = '('; - if (!term_101 (&termp, term_dict + j)) + if (!term_101 (&termp, term_dict + j, space_split)) return 0; strcat (term_dict, ")"); r = dict_lookup_grep (zi->dict, term_dict, 0, grep_info, @@ -739,7 +749,7 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, break; case 102: /* Regexp-1 */ term_dict[j++] = '('; - if (!term_102 (&termp, term_dict + j)) + if (!term_102 (&termp, term_dict + j, space_split)) return 0; strcat (term_dict, ")"); logf (LOG_DEBUG, "Regexp-1 tolerance=%d", r); @@ -752,7 +762,7 @@ static int field_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, case 103: /* Regexp-1 */ r = 1; term_dict[j++] = '('; - if (!term_103 (&termp, term_dict + j, &r)) + if (!term_103 (&termp, term_dict + j, &r, space_split)) return 0; strcat (term_dict, ")"); logf (LOG_DEBUG, "Regexp-2 tolerance=%d", r); @@ -792,22 +802,23 @@ static void trans_scan_term (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, const char *cp_end = cp + term->u.general->len; const char *src; int i = 0; - int prev_space = 0; + const char *space_map = NULL; int len; while ((len = (cp_end - cp)) > 0) { map = map_chrs_input (&cp, len); if (**map == *CHR_SPACE) - { - if (prev_space) - continue; - prev_space = 1; - } + space_map = *map; else - prev_space = 0; - for (src = *map; *src; src++) - termz[i++] = *src; + { + 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'; } @@ -826,8 +837,8 @@ static RSET rpn_search_APT_relevance (ZServerInfo *zi, int r; parms.key_size = sizeof(struct it_key); - parms.max_rec = 100; - parms.cmp = key_compare; + parms.max_rec = 1000; + parms.cmp = key_compare_it; parms.is = zi->isam; parms.isc = zi->isamc; parms.no_terms = 0; @@ -848,7 +859,7 @@ static RSET rpn_search_APT_relevance (ZServerInfo *zi, while (1) { r = field_term (zi, zapt, &termp, 'w', attributeSet, &grep_info, - num_bases, basenames); + num_bases, basenames, 1); if (r <= 0) break; #ifdef TERM_COUNT @@ -897,7 +908,7 @@ static RSET rpn_search_APT_cphrase (ZServerInfo *zi, grep_info.isam_p_buf = NULL; r = field_term (zi, zapt, &termp, 'p', attributeSet, &grep_info, - num_bases, basenames); + num_bases, basenames, 0); result = rset_trunc (zi, grep_info.isam_p_buf, grep_info.isam_p_indx); #ifdef TERM_COUNT xfree(grep_info.term_no); @@ -931,7 +942,7 @@ static RSET rpn_proximity (RSET rset1, RSET rset2, int ordered, exclusion, ordered, relation, distance); while (more1 && more2) { - int cmp = key_compare (&buf1, &buf2); + int cmp = key_compare_it (&buf1, &buf2); if (cmp < -1) more1 = rset_read (rset1, rsfd1, &buf1); else if (cmp > 1) @@ -955,7 +966,6 @@ static RSET rpn_proximity (RSET rset1, RSET rset2, int ordered, int excl = exclusion; if (!ordered && diff < 0) diff = -diff; - logf (LOG_DEBUG, "l = %d r = %d", seqno[i], buf2.seqno); switch (relation) { case 1: /* < */ @@ -984,10 +994,7 @@ static RSET rpn_proximity (RSET rset1, RSET rset2, int ordered, break; } if (excl) - { - logf (LOG_DEBUG, " match"); rset_write (result, rsfd_result, &buf2); - } } } while ((more2 = rset_read (rset2, rsfd2, &buf2)) && sysno == buf2.sysno); @@ -1046,7 +1053,7 @@ static RSET rpn_prox (RSET *rset, int rset_no) *more = 0; break; } - cmp = key_compare (buf[i], buf[i-1]); + cmp = key_compare_it (buf[i], buf[i-1]); if (cmp > 1) { more[i-1] = rset_read (rset[i-1], rsfd[i-1], buf[i-1]); @@ -1113,7 +1120,7 @@ static RSET rpn_search_APT_phrase (ZServerInfo *zi, { grep_info.isam_p_indx = 0; r = field_term (zi, zapt, &termp, 'w', attributeSet, &grep_info, - num_bases, basenames); + num_bases, basenames, 1); if (r < 1) break; rset[rset_no] = rset_trunc (zi, grep_info.isam_p_buf, @@ -1286,7 +1293,7 @@ static RSET rpn_search_structure (ZServerInfo *zi, Z_RPNStructure *zs, if (rset_is_ranked(bool_parms.rset_r)) soft = 1; bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare; + bool_parms.cmp = key_compare_it; switch (zop->which) { @@ -1360,7 +1367,8 @@ void count_set_save (RSET *r, int *count) RSFD rfd, wfd; RSET w; rset_temp_parms parms; - + int maxResultSetSize = atoi (res_get_def (common_resource, + "maxResultSetSize", "400")); logf (LOG_DEBUG, "count_set_save"); *count = 0; parms.key_size = sizeof(struct it_key); @@ -1369,12 +1377,12 @@ void count_set_save (RSET *r, int *count) rfd = rset_open (*r, RSETF_READ|RSETF_SORT_SYSNO); while (rset_read (*r, rfd, &key)) { - logf (LOG_DEBUG, "sysno=%-7d seqno=%d", key.sysno, key.seqno); if (key.sysno != psysno) { - rset_write (w, wfd, &key); - psysno = key.sysno; + if (*count < maxResultSetSize) + rset_write (w, wfd, &key); (*count)++; + psysno = key.sysno; } kno++; } @@ -1462,7 +1470,6 @@ static int scan_handle (char *name, const char *info, int pos, void *client) idx = scan_info->after - pos + scan_info->before; else idx = - pos - 1; - logf (LOG_DEBUG, "%-3d %s", idx, name+len_prefix); scan_info->list[idx].term = odr_malloc (scan_info->odr, strlen(name + len_prefix)+1); strcpy (scan_info->list[idx].term, name + len_prefix); @@ -1622,7 +1629,7 @@ int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, rset_trunc (zi, &scan_info_array[j].list[ptr[j]].isam_p, 1); bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare; + bool_parms.cmp = key_compare_it; bool_parms.rset_l = rset; bool_parms.rset_r = rset2; @@ -1683,7 +1690,7 @@ int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, &scan_info_array[j].list[before-1-ptr[j]].isam_p, 1); bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare; + bool_parms.cmp = key_compare_it; bool_parms.rset_l = rset; bool_parms.rset_r = rset2;