X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=0a49a0fd11657d69621f41f4850cb0dd35cc1bbf;hb=174ad2c7bbf2b7312ac080de2fd85d0509a55404;hp=08a21870a26ff3d7fb789381515f5863c2c1324a;hpb=03ada04bea71af9a1c6b6bb2cfed660e21775fdb;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index 08a2187..0a49a0f 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,6 +1,6 @@ -/* $Id: zrpn.c,v 1.165 2005-01-03 19:31:57 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: zrpn.c,v 1.168 2005-01-15 20:47:15 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -36,6 +36,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +/* maximum number of terms in an and/or/phrase item */ +#define TERM_LIST_LENGTH_MAX 256 static const struct key_control it_ctrl = { @@ -64,8 +66,8 @@ typedef struct } AttrType; -static int log_level_set=0; -static int log_level_rpn=0; +static int log_level_set = 0; +static int log_level_rpn = 0; static const char **rpn_char_map_handler(void *vp, const char **from, int len) { @@ -193,7 +195,7 @@ static void term_untrans(ZebraHandle zh, int reg_type, while (*src) { const char *cp = zebra_maps_output(zh->reg->zebra_maps, - reg_type, &src); + reg_type, &src); if (!cp && len < IT_MAX_WORD-1) dst[len++] = *src++; else @@ -209,7 +211,7 @@ static void add_isam_p(const char *name, const char *info, if (!log_level_set) { log_level_rpn = yaz_log_module_level("rpn"); - log_level_set=1; + log_level_set = 1; } if (p->isam_p_indx == p->isam_p_size) { @@ -229,8 +231,7 @@ static void add_isam_p(const char *name, const char *info, p->isam_p_buf = new_isam_p_buf; #ifdef TERM_COUNT - new_term_no = (int *) 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, @@ -296,7 +297,7 @@ static int term_pre(ZebraMaps zebra_maps, int reg_type, const char **src, #define REGEX_CHARS " []()|.*+?!" -/* term_100: handle term, where trunc=none(no operators at all) */ +/* 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) @@ -357,7 +358,7 @@ static int term_100(ZebraMaps zebra_maps, int reg_type, return i; } -/* term_101: handle term, where trunc=Process # */ +/* 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) @@ -399,7 +400,7 @@ static int term_101(ZebraMaps zebra_maps, int reg_type, return i; } -/* term_103: handle term, where trunc=re-2 (regular expressions) */ +/* 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) @@ -448,7 +449,7 @@ static int term_103(ZebraMaps zebra_maps, int reg_type, const char **src, return i; } -/* term_103: handle term, where trunc=re-1 (regular expressions) */ +/* 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) { @@ -457,7 +458,7 @@ static int term_102 (ZebraMaps zebra_maps, int reg_type, const char **src, } -/* term_104: handle term, where trunc=Process # and ! */ +/* 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) @@ -528,7 +529,7 @@ static int term_104(ZebraMaps zebra_maps, int reg_type, return i; } -/* term_105/106: handle term, where trunc=Process * and ! and right trunc */ +/* 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) @@ -680,7 +681,7 @@ static void gen_regular_rel(char *dst, int val, int islt) { /* match everything less than 10^(pos-1) */ strcat(dst, "0*"); - for (i=1; i= (int) (sizeof(rset)/sizeof(*rset))) - break; } grep_info_delete (&grep_info); if (rset_no == 0) @@ -1413,15 +1412,15 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; - RSET rset[60]; - int rset_no = 0; + RSET rset[TERM_LIST_LENGTH_MAX]; + size_t rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; - while (1) + for (; rset_no < sizeof(rset)/sizeof(*rset); rset_no++) { yaz_log(log_level_rpn, "APT_or_list termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, @@ -1432,14 +1431,12 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, xpath_use,rset_nmem); if (!rset[rset_no]) break; - if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) - break; } grep_info_delete (&grep_info); if (rset_no == 0) return rsnull_create (rset_nmem,key_it_ctrl); - return rsmultior_create(rset_nmem, key_it_ctrl,key_it_ctrl->scope, - rset_no, rset); + return rsmulti_or_create(rset_nmem, key_it_ctrl,key_it_ctrl->scope, + rset_no, rset); } static RSET rpn_search_APT_and_list (ZebraHandle zh, @@ -1454,15 +1451,15 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; - RSET rset[60]; /* FIXME - bug 160 - should be dynamic somehow */ - int rset_no = 0; + RSET rset[TERM_LIST_LENGTH_MAX]; + size_t rset_no = 0; struct grep_info grep_info; char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; - while (1) + for (; rset_no < sizeof(rset)/sizeof(*rset); rset_no++) { yaz_log(log_level_rpn, "APT_and_list termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, @@ -1473,16 +1470,13 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, xpath_use, rset_nmem); if (!rset[rset_no]) break; - assert (rset[rset_no]); - if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) - break; } grep_info_delete (&grep_info); if (rset_no == 0) - return rsnull_create (rset_nmem,key_it_ctrl); - - return rsmultiand_create( rset_nmem, key_it_ctrl, key_it_ctrl->scope, - rset_no, rset); + return rsnull_create(rset_nmem,key_it_ctrl); + + return rsmulti_and_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, + rset_no, rset); } static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -1536,7 +1530,7 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, r = dict_lookup_grep(zh->reg->dict, term_dict, 0, grep_info, max_pos, 0, grep_handle); if (r) - yaz_log(YLOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r); + 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; } @@ -1593,7 +1587,7 @@ static int numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, } else { - if ((r=att_getentbyatt (zh, &attp, curAttributeSet, use_value, + if ((r = att_getentbyatt (zh, &attp, curAttributeSet, use_value, use_string))) { yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", @@ -1677,14 +1671,15 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, { char term_dst[IT_MAX_WORD+1]; const char *termp = termz; - RSET rset[60]; /* FIXME - hard-coded magic number */ - int r, rset_no = 0; + RSET rset[TERM_LIST_LENGTH_MAX]; + int r; + size_t rset_no = 0; struct grep_info grep_info; yaz_log(log_level_rpn, "APT_numeric t='%s'",termz); if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; - while (1) + for (; rset_no < sizeof(rset)/sizeof(*rset); rset_no++) { yaz_log(YLOG_DEBUG, "APT_numeric termp=%s", termp); grep_info.isam_p_indx = 0; @@ -1701,17 +1696,16 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, 0 /* preserve position */, zapt->term->which, rset_nmem, key_it_ctrl,key_it_ctrl->scope); - assert (rset[rset_no]); - if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) - break; + if (!rset[rset_no]) + break; } grep_info_delete (&grep_info); if (rset_no == 0) - return rsnull_create (rset_nmem,key_it_ctrl); + return rsnull_create(rset_nmem,key_it_ctrl); if (rset_no == 1) return rset[0]; - return rsmultiand_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, - rset_no, rset); + return rsmulti_and_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, + rset_no, rset); } static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -1933,14 +1927,14 @@ static RSET rpn_search_xpath (ZebraHandle zh, / -> none - a[@attr=value]/b[@other=othervalue] + a[@attr = value]/b[@other = othervalue] /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) + /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) */ @@ -2034,18 +2028,10 @@ static RSET rpn_search_xpath (ZebraHandle zh, rset_end_tag = xpath_trunc(zh, stream, '0', xpath_rev, 2, curAttributeSet, rset_nmem); - /* - parms.key_size = sizeof(struct it_key); - parms.cmp = key_compare_it; - parms.rset_l = rset_start_tag; - parms.rset_m = rset; - parms.rset_r = rset_end_tag; - parms.rset_attr = rset_attr; - parms.printer = key_print_it; - rset = rset_create (rset_kind_between, &parms); - */ - rset=rsbetween_create( rset_nmem,key_it_ctrl,key_it_ctrl->scope, - rset_start_tag, rset, rset_end_tag, rset_attr); + rset = rsbetween_create(rset_nmem, key_it_ctrl, + key_it_ctrl->scope, + rset_start_tag, rset, + rset_end_tag, rset_attr); } first_path = 0; } @@ -2076,7 +2062,7 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!log_level_set) { log_level_rpn = yaz_log_module_level("rpn"); - log_level_set=1; + log_level_set = 1; } zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, rank_type, &complete_flag, &sort_flag); @@ -2175,12 +2161,12 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, switch (zop->which) { case Z_Operator_and: - r=rsmultiand_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, - 2, rsets); + r = rsmulti_and_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, + 2, rsets); break; case Z_Operator_or: - r=rsmultior_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, - 2, rsets); + r = rsmulti_or_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, + 2, rsets); break; case Z_Operator_and_not: r = rsbool_create_not(rset_nmem,key_it_ctrl, key_it_ctrl->scope, @@ -2203,7 +2189,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, else { /* new / old prox */ - r=rsprox_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, + r = rsprox_create(rset_nmem,key_it_ctrl,key_it_ctrl->scope, 2, rsets, *zop->u.prox->ordered, (!zop->u.prox->exclusion ? @@ -2426,7 +2412,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, char rank_type[128]; int complete_flag; int sort_flag; - NMEM rset_nmem=NULL; + NMEM rset_nmem = NULL; *list = 0; @@ -2482,7 +2468,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, attent attp; data1_local_attribute *local_attr; - if ((r=att_getentbyatt (zh, &attp, attributeset, use_value, + if ((r = att_getentbyatt (zh, &attp, attributeset, use_value, use_string))) { yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d", @@ -2558,7 +2544,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, if (trans_scan_term(zh, zapt, termz+prefix_len, reg_id)) return ; - + dict_scan(zh->reg->dict, termz, &before_tmp, &after_tmp, scan_info, scan_handle); } @@ -2582,7 +2568,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, for (j = 0; j < ord_no; j++) { if (ptr[j] < before+after && - (tst=scan_info_array[j].list[ptr[j]].term) && + (tst = scan_info_array[j].list[ptr[j]].term) && (!mterm || strcmp (tst, mterm) < 0)) { j0 = j; @@ -2594,104 +2580,116 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, 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, 0, zapt->term->which, rset_nmem, - key_it_ctrl,key_it_ctrl->scope); + glist[i+before].term, strlen(glist[i+before].term), + NULL, 0, zapt->term->which, rset_nmem, + key_it_ctrl,key_it_ctrl->scope); ptr[j0]++; for (j = j0+1; jterm->which,rset_nmem, - key_it_ctrl, key_it_ctrl->scope); - rset = rsbool_create_or(rset_nmem,key_it_ctrl, - key_it_ctrl->scope, rset, rset2); - /* FIXME - Use a proper multi-or */ - + RSET rsets[2]; + + rsets[0] = rset; + rsets[1] = + rset_trunc(zh, &scan_info_array[j].list[ptr[j]].isam_p, 1, + glist[i+before].term, + strlen(glist[i+before].term), NULL, 0, + zapt->term->which,rset_nmem, + key_it_ctrl, key_it_ctrl->scope); + rset = rsmulti_or_create(rset_nmem, key_it_ctrl, + 2, key_it_ctrl->scope, rsets); ptr[j]++; } } if (limit_set) - rset = rsbool_create_and(rset_nmem,key_it_ctrl,key_it_ctrl->scope, - rset, rset_dup(limit_set)); - count_set (rset, &glist[i+before].occurrences); - rset_delete (rset); + { + RSET rsets[2]; + rsets[0] = rset; + rsets[1] = rset_dup(limit_set); + + rset = rsmulti_and_create(rset_nmem, key_it_ctrl, + key_it_ctrl->scope, 2, rsets); + } + count_set(rset, &glist[i+before].occurrences); + rset_delete(rset); } if (i < after) { - *num_entries -= (after-i); - *is_partial = 1; + *num_entries -= (after-i); + *is_partial = 1; } - + /* 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, 0, zapt->term->which,rset_nmem, - key_it_ctrl,key_it_ctrl->scope); - - ptr[j0]++; - - for (j = j0+1; j 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, 0, zapt->term->which,rset_nmem, + key_it_ctrl,key_it_ctrl->scope); + + ptr[j0]++; + + for (j = j0+1; jterm->which, rset_nmem, key_it_ctrl, key_it_ctrl->scope); - rset = rsbool_create_and(rset_nmem,key_it_ctrl, - key_it_ctrl->scope, rset, rset2); - /* FIXME - multi-and ?? */ - ptr[j]++; - } - } + rset = rsmulti_or_create(rset_nmem, key_it_ctrl, + 2, key_it_ctrl->scope, rsets); + + ptr[j]++; + } + } if (limit_set) - rset = rsbool_create_and(rset_nmem,key_it_ctrl,key_it_ctrl->scope, - rset, rset_dup(limit_set)); - count_set (rset, &glist[before-1-i].occurrences); - rset_delete (rset); + { + RSET rsets[2]; + rsets[0] = rset; + rsets[1] = rset_dup(limit_set); + + rset = rsmulti_and_create(rset_nmem, key_it_ctrl, + key_it_ctrl->scope, 2, rsets); + } + count_set (rset, &glist[before-1-i].occurrences); + rset_delete (rset); } i = before-i; if (i) @@ -2700,13 +2698,13 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, *position -= i; *num_entries -= i; } - + nmem_destroy(rset_nmem); *list = glist + i; /* list is set to first 'real' entry */ yaz_log(YLOG_DEBUG, "position = %d, num_entries = %d", - *position, *num_entries); + *position, *num_entries); if (zh->errCode) yaz_log(YLOG_DEBUG, "scan error: %d", zh->errCode); } - +