X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fzrpn.c;h=b4b747254ee96019c1e81c71f6d572c68e3a9640;hb=230fdc17aa503a23c842cd587f241cfe2fce1c0d;hp=f65475de1525e64fd33aed5e506f44746670309f;hpb=927733195c5646988dcc65365bb45b978b02a15a;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index f65475d..b4b7472 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.145 2004-08-24 14:25:16 heikki Exp $ +/* $Id: zrpn.c,v 1.148 2004-08-31 14:43:41 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -877,7 +877,8 @@ static RSET term_trunc (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int reg_type, int complete_flag, int num_bases, char **basenames, char *term_dst, - const char *rank_type, int xpath_use) + const char *rank_type, int xpath_use, + NMEM rset_nmem) { int r; grep_info->isam_p_indx = 0; @@ -890,7 +891,7 @@ static RSET term_trunc (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return rset_trunc (zh, grep_info->isam_p_buf, grep_info->isam_p_indx, term_dst, strlen(term_dst), rank_type, 1 /* preserve pos */, - zapt->term->which); + zapt->term->which, rset_nmem); } @@ -1362,7 +1363,8 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, NMEM stream, int reg_type, int complete_flag, const char *rank_type, int xpath_use, - int num_bases, char **basenames) + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; @@ -1382,7 +1384,7 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, reg_type, complete_flag, num_bases, basenames, term_dst, rank_type, - xpath_use); + xpath_use,rset_nmem); if (!rset[rset_no]) break; if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) @@ -1410,7 +1412,8 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, int reg_type, int complete_flag, const char *rank_type, int xpath_use, - int num_bases, char **basenames) + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[60]; @@ -1429,7 +1432,7 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, reg_type, complete_flag, num_bases, basenames, term_dst, rank_type, - xpath_use); + xpath_use,rset_nmem); if (!rset[rset_no]) break; if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) @@ -1437,8 +1440,8 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, } grep_info_delete (&grep_info); if (rset_no == 0) - return rsnull_create (NULL); /* FIXME - Use a proper nmem */ - return rsmultior_create(NULL, /* FIXME */ + return rsnull_create (rset_nmem); + return rsmultior_create(rset_nmem, sizeof(struct it_key), key_compare_it, rset_no, rset); @@ -1468,7 +1471,8 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, int reg_type, int complete_flag, const char *rank_type, int xpath_use, - int num_bases, char **basenames) + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[60], result; @@ -1487,7 +1491,7 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, reg_type, complete_flag, num_bases, basenames, term_dst, rank_type, - xpath_use); + xpath_use, rset_nmem); if (!rset[rset_no]) break; assert (rset[rset_no]); @@ -1496,7 +1500,7 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, } grep_info_delete (&grep_info); if (rset_no == 0) - return rsnull_create (NULL); /* FIXME - Use a proper nmem */ + return rsnull_create (rset_nmem); result = rset[0]; /* FIXME - Use a proper rsmultiand */ for (i = 1; iterm->which); + zapt->term->which, rset_nmem); 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 (NULL); /* FIXME - Use a proper nmem */ + return rsnull_create (rset_nmem); result = rset[0]; for (i = 1; ires, "setTmpDir"); result = rset_create (rset_kind_temp, &parms); */ - result = rstemp_create( NULL, /* FIXME - use a proper nmem */ + result = rstemp_create( rset_nmem, sizeof (struct it_key), key_compare_it, res_get (zh->res, "setTmpDir") ); rsfd = rset_open (result, RSETF_WRITE); @@ -1797,8 +1802,8 @@ static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (key.sysno <= 0) key.sysno = 1; #endif - rset_write (result, rsfd, &key); - rset_close (result, rsfd); + rset_write (rsfd, &key); + rset_close (rsfd); return result; } @@ -1917,7 +1922,7 @@ static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, static RSET xpath_trunc(ZebraHandle zh, NMEM stream, int reg_type, const char *term, int use, - oid_value curAttributeSet) + oid_value curAttributeSet, NMEM rset_nmem) { RSET rset; struct grep_info grep_info; @@ -1930,10 +1935,10 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, const char *flags = "void"; if (grep_info_prepare (zh, 0 /* zapt */, &grep_info, '0', stream)) - return rsnull_create (NULL); /* FIXME - Use a proper nmem */ + return rsnull_create (rset_nmem); if (ord < 0) - return rsnull_create (NULL); /* FIXME - Use a proper nmem */ + return rsnull_create (rset_nmem); if (prefix_len) term_dict[prefix_len++] = '|'; else @@ -1958,7 +1963,7 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, grep_info.isam_p_indx); rset = rset_trunc (zh, grep_info.isam_p_buf, grep_info.isam_p_indx, term, strlen(term), - flags, 1, term_type); + flags, 1, term_type,rset_nmem); grep_info_delete (&grep_info); return rset; } @@ -1967,7 +1972,8 @@ static RSET rpn_search_xpath (ZebraHandle zh, oid_value attributeSet, int num_bases, char **basenames, NMEM stream, const char *rank_type, RSET rset, - int xpath_len, struct xpath_location_step *xpath) + int xpath_len, struct xpath_location_step *xpath, + NMEM rset_nmem) { oid_value curAttributeSet = attributeSet; int base_no; @@ -2076,7 +2082,8 @@ static RSET rpn_search_xpath (ZebraHandle zh, } wrbuf_puts(wbuf, ""); rset_attr = xpath_trunc ( - zh, stream, '0', wrbuf_buf(wbuf), 3, curAttributeSet); + zh, stream, '0', wrbuf_buf(wbuf), 3, + curAttributeSet,rset_nmem); wrbuf_free(wbuf, 1); } else @@ -2087,11 +2094,11 @@ static RSET rpn_search_xpath (ZebraHandle zh, yaz_log (LOG_LOG, "xpath_rev (%d) = %s", level, xpath_rev); if (strlen(xpath_rev)) { - rset_start_tag = xpath_trunc(zh, stream, - '0', xpath_rev, 1, curAttributeSet); + rset_start_tag = xpath_trunc(zh, stream, '0', + xpath_rev, 1, curAttributeSet, rset_nmem); - rset_end_tag = xpath_trunc(zh, stream, - '0', xpath_rev, 2, curAttributeSet); + rset_end_tag = xpath_trunc(zh, stream, '0', + xpath_rev, 2, curAttributeSet, rset_nmem); /* parms.key_size = sizeof(struct it_key); @@ -2103,7 +2110,7 @@ static RSET rpn_search_xpath (ZebraHandle zh, parms.printer = key_print_it; rset = rset_create (rset_kind_between, &parms); */ - rset=rsbetween_create( NULL, /* FIXME */ + rset=rsbetween_create( rset_nmem, sizeof(struct it_key), key_compare_it, rset_start_tag, rset, rset_end_tag, rset_attr, key_print_it ); @@ -2120,7 +2127,8 @@ static RSET rpn_search_xpath (ZebraHandle zh, static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, NMEM stream, Z_SortKeySpecList *sort_sequence, - int num_bases, char **basenames) + int num_bases, char **basenames, + NMEM rset_nmem) { unsigned reg_id; char *search_type = NULL; @@ -2160,33 +2168,33 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, rset = rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "and-list")) { rset = rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "or-list")) { rset = rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "local")) { rset = rpn_search_APT_local (zh, zapt, termz, attributeSet, stream, - rank_type); + rank_type, rset_nmem); } else if (!strcmp (search_type, "numeric")) { rset = rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, xpath_use, - num_bases, basenames); + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "always")) { @@ -2195,11 +2203,13 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, else zh->errCode = 118; return rpn_search_xpath (zh, attributeSet, num_bases, basenames, - stream, rank_type, rset, xpath_len, xpath); + stream, rank_type, rset, + xpath_len, xpath, rset_nmem); } static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, - oid_value attributeSet, NMEM stream, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, Z_SortKeySpecList *sort_sequence, int num_bases, char **basenames) { @@ -2211,13 +2221,13 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, RSET rset_r; rset_l = rpn_search_structure (zh, zs->u.complex->s1, - attributeSet, stream, + attributeSet, stream, rset_nmem, sort_sequence, num_bases, basenames); if (rset_l == NULL) return NULL; rset_r = rpn_search_structure (zh, zs->u.complex->s2, - attributeSet, stream, + attributeSet, stream, rset_nmem, sort_sequence, num_bases, basenames); if (rset_r == NULL) @@ -2229,17 +2239,17 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, switch (zop->which) { case Z_Operator_and: - r = rsbool_create_and( NULL, /* FIXME - use a proper nmem */ + r = rsbool_create_and( rset_nmem, sizeof(struct it_key), key_compare_it, rset_l, rset_r, key_logdump_txt ); break; case Z_Operator_or: - r = rsbool_create_or( NULL, /* FIXME - use a proper nmem */ + r = rsbool_create_or( rset_nmem, sizeof(struct it_key), key_compare_it, rset_l, rset_r, key_logdump_txt ); break; case Z_Operator_and_not: - r = rsbool_create_not( NULL, /* FIXME - use a proper nmem */ + r = rsbool_create_not( rset_nmem, sizeof(struct it_key), key_compare_it, rset_l, rset_r, key_logdump_txt ); break; @@ -2264,7 +2274,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, twosets[0] = rset_l; twosets[1] = rset_r; - r=rsprox_create(NULL, /* FIXME - use a proper nmem */ + r=rsprox_create(rset_nmem, sizeof(struct it_key), key_compare_it, key_get_seq, 2, twosets, @@ -2301,7 +2311,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, logf (LOG_DEBUG, "rpn_search_APT"); r = rpn_search_APT (zh, zs->u.simple->u.attributesPlusTerm, attributeSet, stream, sort_sequence, - num_bases, basenames); + num_bases, basenames,rset_nmem); } else if (zs->u.simple->which == Z_Operand_resultSetId) { @@ -2309,7 +2319,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, r = resultSetRef (zh, zs->u.simple->u.resultSetId); if (!r) { - r = rsnull_create (NULL); /* FIXME - Use a proper nmem */ + r = rsnull_create (rset_nmem); zh->errCode = 30; zh->errString = nmem_strdup (stream, zs->u.simple->u.resultSetId); @@ -2333,7 +2343,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, } -RSET rpn_search (ZebraHandle zh, NMEM nmem, +RSET rpn_search (ZebraHandle zh, NMEM nmem, NMEM rset_nmem, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname, ZebraSet sset) @@ -2360,7 +2370,8 @@ RSET rpn_search (ZebraHandle zh, NMEM nmem, attrset = oid_getentbyoid (rpn->attributeSetId); attributeSet = attrset->value; rset = rpn_search_structure (zh, rpn->RPNStructure, attributeSet, - nmem, sort_sequence, num_bases, basenames); + nmem, rset_nmem, + sort_sequence, num_bases, basenames); if (!rset) return 0; @@ -2459,7 +2470,7 @@ static void count_set (RSET r, int *count) *count = 0; rfd = rset_open (r, RSETF_READ); - while (rset_read (r, rfd, &key)) + while (rset_read (rfd, &key)) { #if IT_KEY_NEW if (key.mem[0] != psysno) @@ -2476,7 +2487,7 @@ static void count_set (RSET r, int *count) #endif kno++; } - rset_close (r, rfd); + rset_close (rfd); logf (LOG_DEBUG, "%d keys, %d records", kno, *count); } @@ -2510,6 +2521,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; *list = 0; @@ -2653,6 +2665,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, glist = (ZebraScanEntry *) odr_malloc (stream, (before+after)*sizeof(*glist)); + rset_nmem=nmem_create(); + /* consider terms after main term */ for (i = 0; i < ord_no; i++) ptr[i] = before; @@ -2681,7 +2695,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, 0, zapt->term->which); + NULL, 0, zapt->term->which, rset_nmem); ptr[j0]++; for (j = j0+1; jterm->which); -/* - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - bool_parms.log_item = key_logdump_txt; - bool_parms.rset_l = rset; - bool_parms.rset_r = rset2; - rset = rset_create (rset_kind_or, &bool_parms); -*/ - rset = rsbool_create_or(NULL, /* FIXME -use a proper nmem */ + zapt->term->which,rset_nmem); + rset = rsbool_create_or(rset_nmem, sizeof(struct it_key), key_compare_it, rset, rset2, key_logdump_txt); @@ -2713,21 +2719,10 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, } } if (limit_set) - { - /* - rset_bool_parms bool_parms; - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - bool_parms.log_item = key_logdump_txt; - bool_parms.rset_l = rset; - bool_parms.rset_r = rset_dup(limit_set); - rset = rset_create (rset_kind_and, &bool_parms); - */ - rset = rsbool_create_and(NULL, /* FIXME -use a proper nmem */ + rset = rsbool_create_and(rset_nmem, sizeof(struct it_key), key_compare_it, rset, rset_dup(limit_set), key_logdump_txt); - } count_set (rset, &glist[i+before].occurrences); rset_delete (rset); } @@ -2767,7 +2762,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, 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); + NULL, 0, zapt->term->which,rset_nmem); ptr[j0]++; @@ -2783,16 +2778,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, &scan_info_array[j].list[before-1-ptr[j]].isam_p, 1, glist[before-1-i].term, strlen(glist[before-1-i].term), NULL, 0, - zapt->term->which); -/* - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - bool_parms.log_item = key_logdump_txt; - bool_parms.rset_l = rset; - bool_parms.rset_r = rset2; - rset = rset_create (rset_kind_or, &bool_parms); -*/ - rset = rsbool_create_and(NULL, /* FIXME -use a proper nmem */ + zapt->term->which, rset_nmem); + rset = rsbool_create_and(rset_nmem, sizeof(struct it_key), key_compare_it, rset, rset2, key_logdump_txt); @@ -2800,23 +2787,10 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, } } if (limit_set) - { - /* - rset_bool_parms bool_parms; - - bool_parms.key_size = sizeof(struct it_key); - bool_parms.cmp = key_compare_it; - bool_parms.log_item = key_logdump_txt; - bool_parms.rset_l = rset; - bool_parms.rset_r = rset_dup(limit_set); - - rset = rset_create (rset_kind_and, &bool_parms); - */ - rset = rsbool_create_and(NULL, /* FIXME -use a proper nmem */ + rset = rsbool_create_and(rset_nmem, sizeof(struct it_key), key_compare_it, rset, rset_dup(limit_set), key_logdump_txt); - } count_set (rset, &glist[before-1-i].occurrences); rset_delete (rset); } @@ -2827,6 +2801,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, *position -= i; *num_entries -= i; } + + nmem_destroy(rset_nmem); *list = glist + i; /* list is set to first 'real' entry */ logf (LOG_DEBUG, "position = %d, num_entries = %d",