-/* $Id: zrpn.c,v 1.205 2005-08-26 10:13:31 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: zrpn.c,v 1.224 2006-07-04 10:25:21 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
#include <yaz/diagbib1.h>
#include "index.h"
#include <zebra_xpath.h>
-
+#include <attrfind.h>
#include <charmap.h>
#include <rset.h>
int reg_type;
};
-typedef struct
-{
- int type;
- int major;
- int minor;
- Z_AttributesPlusTerm *zapt;
-} AttrType;
-
static int log_level_set = 0;
static int log_level_rpn = 0;
+#define TERMSET_DISABLE 1
+
static const char **rpn_char_map_handler(void *vp, const char **from, int len)
{
struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp;
}
static void rpn_char_map_prepare(struct zebra_register *reg, int reg_type,
- struct rpn_char_map_info *map_info)
+ struct rpn_char_map_info *map_info)
{
map_info->zm = reg->zebra_maps;
map_info->reg_type = reg_type;
dict_grep_cmap(reg->dict, map_info, rpn_char_map_handler);
}
-static int attr_find_ex(AttrType *src, oid_value *attributeSetP,
- const char **string_value)
-{
- int num_attributes;
-
- num_attributes = src->zapt->attributes->num_attributes;
- while (src->major < num_attributes)
- {
- Z_AttributeElement *element;
-
- element = src->zapt->attributes->attributes[src->major];
- if (src->type == *element->attributeType)
- {
- 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)
- break;
- if (element->attributeSet && attributeSetP)
- {
- oident *attrset;
-
- attrset = oid_getentbyoid(element->attributeSet);
- *attributeSetP = attrset->value;
- }
- if (element->value.complex->list[src->minor]->which ==
- Z_StringOrNumeric_numeric)
- {
- ++(src->minor);
- return
- *element->value.complex->list[src->minor-1]->u.numeric;
- }
- else if (element->value.complex->list[src->minor]->which ==
- Z_StringOrNumeric_string)
- {
- if (!string_value)
- break;
- ++(src->minor);
- *string_value =
- element->value.complex->list[src->minor-1]->u.string;
- return -2;
- }
- else
- break;
- default:
- assert(0);
- }
- }
- ++(src->major);
- }
- return -1;
-}
-
-static int attr_find(AttrType *src, oid_value *attributeSetP)
-{
- return attr_find_ex(src, attributeSetP, 0);
-}
-
-static void attr_init(AttrType *src, Z_AttributesPlusTerm *zapt,
- int type)
-{
- src->zapt = zapt;
- src->type = type;
- src->major = 0;
- src->minor = 0;
-}
-
#define TERM_COUNT
struct grep_info {
{
const char *cp = zebra_maps_output(zh->reg->zebra_maps,
reg_type, &src);
- if (!cp && len < IT_MAX_WORD-1)
- dst[len++] = *src++;
+ if (!cp)
+ {
+ if (len < IT_MAX_WORD-1)
+ dst[len++] = *src;
+ src++;
+ }
else
while (*cp && len < IT_MAX_WORD-1)
dst[len++] = *cp++;
assert(*info == sizeof(*p->isam_p_buf));
memcpy(p->isam_p_buf + p->isam_p_indx, info+1, sizeof(*p->isam_p_buf));
-#if 1
if (p->termset)
{
const char *db;
- int set, use;
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+1);
+ 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, &set, &use);
- yaz_log(log_level_rpn, "grep: set=%d use=%d db=%s", set, use, db);
+ 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,
- set, use, term_tmp);
+ index_name, term_tmp);
}
-#endif
(p->isam_p_indx)++;
}
}
-static void esc_str(char *out_buf, int out_size,
+static void esc_str(char *out_buf, size_t out_size,
const char *in_buf, int in_size)
{
int k;
char *term_tmp = term_dict + strlen(term_dict);
char term_component[2*IT_MAX_WORD+20];
- attr_init(&relation, zapt, 2);
+ attr_init_APT(&relation, zapt, 2);
relation_value = attr_find(&relation, NULL);
*error_code = 0;
case 3:
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))
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;
struct grep_info *grep_info,
int reg_type, int complete_flag,
int num_bases, char **basenames,
- char *term_dst, int xpath_use,
+ 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)
+ const char **term_ref_id_str,
+ NMEM nmem)
{
AttrType term_ref_id_attr;
AttrType hits_limit_attr;
+ int term_ref_id_int;
- attr_init(&hits_limit_attr, zapt, 9);
+ attr_init_APT(&hits_limit_attr, zapt, 9);
*hits_limit_value = attr_find(&hits_limit_attr, NULL);
- attr_init(&term_ref_id_attr, zapt, 10);
- attr_find_ex(&term_ref_id_attr, NULL, term_ref_id_str);
+ 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 */
/* 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 */
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,
+ const char *xpath_use,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
const char *term_ref_id_str = 0;
*rset = 0;
- term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str);
+ 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,
struct grep_info *grep_info,
int reg_type, int complete_flag,
int num_bases, char **basenames,
- char *term_dst, int xpath_use,
+ 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;
- 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;
*ol = ord_list_create(stream);
rpn_char_map_prepare (zh->reg, reg_type, &rcmi);
- attr_init(&use, zapt, 1);
- use_value = attr_find_ex(&use, &curAttributeSet, &use_string);
- yaz_log(log_level_rpn, "string_term, use value %d", use_value);
- attr_init(&truncation, zapt, 5);
+ attr_init_APT(&truncation, zapt, 5);
truncation_value = attr_find(&truncation, NULL);
yaz_log(log_level_rpn, "truncation value %d", truncation_value);
- if (use_value == -1) /* no attribute - assumy "any" */
- use_value = 1016;
for (base_no = 0; base_no < num_bases; base_no++)
{
int ord = -1;
- int attr_ok = 0;
int regex_range = 0;
- int init_pos = 0;
- attent attp;
- data1_local_attribute id_xpath_attr;
- data1_local_attribute *local_attr;
int max_pos, prefix_len = 0;
int relation_error;
+ char ord_buf[32];
+ int ord_len, i;
- termp = *term_sub;
+ termp = *term_sub; /* start of term for each database */
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
{
basenames[base_no]);
return ZEBRA_FAIL;
}
- if (xpath_use > 0 && use_value == -2)
- {
- /* xpath mode and we have a string attribute */
- attp.local_attributes = &id_xpath_attr;
- attp.attset_ordinal = VAL_IDXPATH;
- id_xpath_attr.next = 0;
+
+ if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use,
+ attributeSet, &ord) != ZEBRA_OK)
+ continue;
- use_value = xpath_use; /* xpath_use as use-attribute now */
- id_xpath_attr.local = use_value;
- }
- else if (curAttributeSet == VAL_IDXPATH && use_value >= 0)
- {
- /* X-Path attribute, use numeric value directly */
- attp.local_attributes = &id_xpath_attr;
- attp.attset_ordinal = VAL_IDXPATH;
- id_xpath_attr.next = 0;
- id_xpath_attr.local = use_value;
- }
- else if (use_string &&
- (ord = zebraExplain_lookup_attr_str(zh->reg->zei,
- reg_type,
- use_string)) >= 0)
- {
- /* we have a match for a raw string attribute */
- char ord_buf[32];
- int i, ord_len;
+ bases_ok++;
- if (prefix_len)
- term_dict[prefix_len++] = '|';
- else
- term_dict[prefix_len++] = '(';
-
- ord_len = key_SU_encode (ord, ord_buf);
- for (i = 0; i<ord_len; i++)
- {
- term_dict[prefix_len++] = 1;
- term_dict[prefix_len++] = ord_buf[i];
- }
- attp.local_attributes = 0; /* no more attributes */
- *ol = ord_list_append(stream, *ol, ord);
- }
- else
+ *ol = ord_list_append(stream, *ol, ord);
+ ord_len = key_SU_encode (ord, ord_buf);
+
+ term_dict[prefix_len++] = '(';
+ for (i = 0; i<ord_len; i++)
{
- /* lookup in the .att files . Allow string as well */
- if ((r = att_getentbyatt (zh, &attp, curAttributeSet, use_value,
- use_string)))
- {
- yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d",
- curAttributeSet, use_value, r);
- if (r == -1)
- {
- /* set was found, but value wasn't defined */
- if (use_string)
- zebra_setError(zh,
- YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
- use_string);
- else
- zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
- use_value);
- }
- 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);
-
- zebra_setError(zh,
- YAZ_BIB1_UNSUPP_ATTRIBUTE_SET,
- oident.desc);
-
- }
- continue;
- }
+ term_dict[prefix_len++] = 1; /* our internal regexp escape char */
+ term_dict[prefix_len++] = ord_buf[i];
}
- for (local_attr = attp.local_attributes; local_attr;
- local_attr = local_attr->next)
- {
- char ord_buf[32];
- int i, ord_len;
-
- ord = zebraExplain_lookup_attr_su(zh->reg->zei,
- reg_type,
- attp.attset_ordinal,
- local_attr->local);
- if (ord < 0)
- continue;
- *ol = ord_list_append(stream, *ol, ord);
- if (prefix_len)
- term_dict[prefix_len++] = '|';
- else
- term_dict[prefix_len++] = '(';
-
- ord_len = key_SU_encode (ord, ord_buf);
- for (i = 0; i<ord_len; i++)
- {
- term_dict[prefix_len++] = 1;
- term_dict[prefix_len++] = ord_buf[i];
- }
- }
- bases_ok++;
- if (prefix_len)
- attr_ok = 1;
-
term_dict[prefix_len++] = ')';
-#if REG_TYPE_PREFIX
- term_dict[prefix_len++] = 1;
- term_dict[prefix_len++] = reg_type;
- yaz_log(log_level_rpn, "reg_type = %d", term_dict[prefix_len-1]);
-#endif
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,
- &relation_error))
+ if (!string_relation(zh, zapt, &termp, term_dict,
+ attributeSet,
+ reg_type, space_split, term_dst,
+ &relation_error))
{
if (relation_error)
{
case 103: /* Regexp-2 */
regex_range = 1;
term_dict[j++] = '(';
- init_pos = 2;
if (!term_103(zh->reg->zebra_maps, reg_type,
&termp, term_dict + j, ®ex_range,
space_split, term_dst))
truncation_value);
return ZEBRA_FAIL;
}
- if (attr_ok)
+ if (1)
{
char buf[80];
const char *input = term_dict + prefix_len;
esc_str(buf, sizeof(buf), input, strlen(input));
}
- if (attr_ok)
- {
- 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, init_pos,
- grep_handle);
- if (r)
- yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r);
- }
+ 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;
grep_info->zh = zh;
grep_info->reg_type = reg_type;
grep_info->termset = 0;
-
if (!zapt)
return ZEBRA_OK;
- attr_init(&termset, zapt, 8);
+ attr_init_APT(&termset, zapt, 8);
termset_value_numeric =
attr_find_ex(&termset, NULL, &termset_value_string);
if (termset_value_numeric != -1)
{
+#if TERMSET_DISABLE
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, "termset");
+ return ZEBRA_FAIL;
+#else
char resname[32];
const char *termset_name = 0;
if (termset_value_numeric != -2)
zebra_setError(zh, YAZ_BIB1_ILLEGAL_RESULT_SET_NAME, termset_name);
return ZEBRA_FAIL;
}
+#endif
}
return ZEBRA_OK;
}
/**
\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 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_mem memory for result sets
+ \param rset_nmem memory for result sets
\param result_sets output result set for each term in list (output)
- \param number number of output result sets
+ \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,
oid_value attributeSet,
NMEM stream,
int reg_type, int complete_flag,
- const char *rank_type, int xpath_use,
+ const char *rank_type,
+ const char *xpath_use,
int num_bases, char **basenames,
NMEM rset_nmem,
RSET **result_sets, int *num_result_sets,
if ((*result_sets)[*num_result_sets] == 0)
break;
(*num_result_sets)++;
+
+ if (!*termp)
+ break;
}
grep_info_delete(&grep_info);
return ZEBRA_OK;
oid_value attributeSet,
NMEM stream,
int reg_type, int complete_flag,
- const char *rank_type, int xpath_use,
+ const char *rank_type,
+ const char *xpath_use,
int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *rset = rset_create_null(rset_nmem, kc, 0);
else if (num_result_sets == 1)
*rset = result_sets[0];
else
- *rset = rsprox_create(rset_nmem, kc, kc->scope,
- num_result_sets, result_sets,
- 1 /* ordered */, 0 /* exclusion */,
- 3 /* relation */, 1 /* distance */);
+ *rset = rset_create_prox(rset_nmem, kc, kc->scope,
+ num_result_sets, result_sets,
+ 1 /* ordered */, 0 /* exclusion */,
+ 3 /* relation */, 1 /* distance */);
if (!*rset)
return ZEBRA_FAIL;
return ZEBRA_OK;
NMEM stream,
int reg_type, int complete_flag,
const char *rank_type,
- int xpath_use,
+ const char *xpath_use,
int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *rset = rset_create_null(rset_nmem, kc, 0);
else if (num_result_sets == 1)
*rset = result_sets[0];
else
- *rset = rsmulti_or_create(rset_nmem, kc, kc->scope, 0 /* termid */,
- num_result_sets, result_sets);
+ *rset = rset_create_or(rset_nmem, kc, kc->scope, 0 /* termid */,
+ num_result_sets, result_sets);
if (!*rset)
return ZEBRA_FAIL;
return ZEBRA_OK;
NMEM stream,
int reg_type, int complete_flag,
const char *rank_type,
- int xpath_use,
+ const char *xpath_use,
int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *rset = rset_create_null(rset_nmem, kc, 0);
else if (num_result_sets == 1)
*rset = result_sets[0];
else
- *rset = rsmulti_and_create(rset_nmem, kc, kc->scope,
- num_result_sets, result_sets);
+ *rset = rset_create_and(rset_nmem, kc, kc->scope,
+ num_result_sets, result_sets);
if (!*rset)
return ZEBRA_FAIL;
return ZEBRA_OK;
char *term_tmp = term_dict + strlen(term_dict);
*error_code = 0;
- attr_init(&relation, zapt, 2);
+ attr_init_APT(&relation, zapt, 2);
relation_value = attr_find(&relation, NULL);
yaz_log(log_level_rpn, "numeric relation value=%d", relation_value);
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1,
- term_dst))
- return 0;
- term_value = atoi (term_tmp);
switch (relation_value)
{
case 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:
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:
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:
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:
*error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE;
return 0;
static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
const char **term_sub,
- oid_value attributeSet,
+ oid_value attributeSet, NMEM stream,
struct grep_info *grep_info,
int reg_type, int complete_flag,
int num_bases, char **basenames,
- char *term_dst, int xpath_use, NMEM stream)
+ 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;
- const char *use_string = 0;
- oid_value curAttributeSet = attributeSet;
+ int base_no;
const char *termp;
struct rpn_char_map_info rcmi;
int bases_ok = 0; /* no of databases with OK attribute */
- rpn_char_map_prepare (zh->reg, reg_type, &rcmi);
- attr_init(&use, zapt, 1);
- use_value = attr_find_ex(&use, &curAttributeSet, &use_string);
+ *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 id_xpath_attr;
- 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 (use_value == -2) /* string attribute (assume IDXPATH/any) */
- {
- use_value = xpath_use;
- attp.local_attributes = &id_xpath_attr;
- attp.attset_ordinal = VAL_IDXPATH;
- id_xpath_attr.next = 0;
- id_xpath_attr.local = use_value;
- }
- else if (curAttributeSet == VAL_IDXPATH)
- {
- attp.local_attributes = &id_xpath_attr;
- attp.attset_ordinal = VAL_IDXPATH;
- id_xpath_attr.next = 0;
- id_xpath_attr.local = use_value;
- }
- else
- {
- if ((r = att_getentbyatt (zh, &attp, curAttributeSet, use_value,
- use_string)))
- {
- yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d",
- curAttributeSet, use_value, r);
- if (r == -1)
- {
- if (use_string)
- zebra_setError(zh,
- YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
- use_string);
- else
- zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
- use_value);
- }
- else
- zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_SET, 0);
- continue;
- }
- }
+
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
{
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_lookup_attr_su(zh->reg->zei,
- reg_type,
- 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; i<ord_len; i++)
- {
- term_dict[prefix_len++] = 1;
- term_dict[prefix_len++] = ord_buf[i];
- }
- }
- if (!prefix_len)
- {
- zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value);
+ if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use,
+ attributeSet, &ord) != ZEBRA_OK)
continue;
- }
bases_ok++;
+
+ *ol = ord_list_append(stream, *ol, ord);
+
+ ord_len = key_SU_encode (ord, ord_buf);
+
+ term_dict[prefix_len++] = '(';
+ for (i = 0; i < ord_len; i++)
+ {
+ term_dict[prefix_len++] = 1;
+ term_dict[prefix_len++] = ord_buf[i];
+ }
term_dict[prefix_len++] = ')';
-#if REG_TYPE_PREFIX
- term_dict[prefix_len++] = 1;
- term_dict[prefix_len++] = reg_type;
- yaz_log(YLOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]);
-#endif
term_dict[prefix_len] = '\0';
+
if (!numeric_relation(zh, zapt, &termp, term_dict,
attributeSet, grep_info, &max_pos, reg_type,
term_dst, &relation_error))
oid_value attributeSet,
NMEM stream,
int reg_type, int complete_flag,
- const char *rank_type, int xpath_use,
+ const char *rank_type,
+ const char *xpath_use,
int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
zint hits_limit_value;
const char *term_ref_id_str = 0;
- term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str);
+ 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)
{
+ struct ord_list *ol;
if (alloc_sets == num_result_sets)
{
int add = 10;
}
yaz_log(YLOG_DEBUG, "APT_numeric termp=%s", termp);
grep_info.isam_p_indx = 0;
- res = numeric_term(zh, zapt, &termp, attributeSet, &grep_info,
+ res = numeric_term(zh, zapt, &termp, attributeSet, stream, &grep_info,
reg_type, complete_flag, num_bases, basenames,
- term_dst, xpath_use,
- stream);
+ term_dst, xpath_use, &ol);
if (res == ZEBRA_FAIL || termp == 0)
break;
yaz_log(YLOG_DEBUG, "term: %s", term_dst);
strlen(term_dst), rank_type,
0 /* preserve position */,
zapt->term->which, rset_nmem,
- kc, kc->scope, 0, reg_type,
+ 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;
}
grep_info_delete(&grep_info);
- if (termp)
- {
- int i;
- for (i = 0; i<num_result_sets; i++)
- rset_delete(result_sets[i]);
- return ZEBRA_FAIL;
- }
+
+ if (res != ZEBRA_OK)
+ return res;
if (num_result_sets == 0)
- *rset = rsnull_create(rset_nmem, kc, 0);
- if (num_result_sets == 1)
+ *rset = rset_create_null(rset_nmem, kc, 0);
+ else if (num_result_sets == 1)
*rset = result_sets[0];
else
- *rset = rsmulti_and_create(rset_nmem, kc, kc->scope,
- num_result_sets, result_sets);
+ *rset = rset_create_and(rset_nmem, kc, kc->scope,
+ num_result_sets, result_sets);
if (!*rset)
- return ZEBRA_FAIL;
+ return ZEBRA_FAIL;
return ZEBRA_OK;
}
RSFD rsfd;
struct it_key key;
int sys;
- *rset = rstemp_create(rset_nmem, kc, kc->scope,
- res_get (zh->res, "setTmpDir"),0 );
+ *rset = rset_create_temp(rset_nmem, kc, kc->scope,
+ res_get (zh->res, "setTmpDir"),0 );
rsfd = rset_open(*rset, RSETF_WRITE);
sys = atoi(termz);
oident oe;
char termz[20];
- attr_init(&sort_relation_type, zapt, 7);
+ attr_init_APT(&sort_relation_type, zapt, 7);
sort_relation_value = attr_find(&sort_relation_type, &attributeSet);
if (!sort_sequence->specs)
sks->which = Z_SortKeySpec_null;
sks->u.null = odr_nullval ();
sort_sequence->specs[i] = sks;
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *rset = rset_create_null(rset_nmem, kc, 0);
return ZEBRA_OK;
}
-static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
- oid_value attributeSet,
- struct xpath_location_step *xpath, int max, NMEM mem)
+static int rpn_check_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
+ oid_value attributeSet,
+ struct xpath_location_step *xpath, int max,
+ NMEM mem)
{
oid_value curAttributeSet = attributeSet;
AttrType use;
const char *use_string = 0;
- attr_init(&use, zapt, 1);
+ attr_init_APT(&use, zapt, 1);
attr_find_ex(&use, &curAttributeSet, &use_string);
if (!use_string || *use_string != '/')
static RSET xpath_trunc(ZebraHandle zh, NMEM stream,
- int reg_type, const char *term, int use,
- oid_value curAttributeSet, NMEM rset_nmem,
+ int reg_type, const char *term,
+ const char *xpath_use,
+ NMEM rset_nmem,
struct rset_key_control *kc)
{
RSET rset;
char term_dict[2048];
char ord_buf[32];
int prefix_len = 0;
- int ord = zebraExplain_lookup_attr_su(zh->reg->zei, reg_type,
- curAttributeSet, use);
+ 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 rsnull_create(rset_nmem, kc, 0);
+ return rset_create_null(rset_nmem, kc, 0);
if (ord < 0)
- return rsnull_create(rset_nmem, kc, 0);
+ return rset_create_null(rset_nmem, kc, 0);
if (prefix_len)
term_dict[prefix_len++] = '|';
else
term_dict[prefix_len++] = ord_buf[i];
}
term_dict[prefix_len++] = ')';
-#if REG_TYPE_PREFIX
- term_dict[prefix_len++] = 1;
- term_dict[prefix_len++] = reg_type;
-#endif
strcpy(term_dict+prefix_len, term);
grep_info.isam_p_indx = 0;
static
ZEBRA_RES 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,
RSET *rset_out,
struct rset_key_control *kc)
{
- oid_value curAttributeSet = attributeSet;
int base_no;
int i;
+ int always_matches = rset ? 0 : 1;
if (xpath_len < 0)
{
}
- curAttributeSet = VAL_IDXPATH;
-
/*
//a -> a/.*
//a/b -> b/a/.*
}
while (--level >= 0)
{
- char xpath_rev[128];
- int i, len;
+ WRBUF xpath_rev = wrbuf_alloc();
+ int i;
RSET rset_start_tag = 0, rset_end_tag = 0, rset_attr = 0;
- *xpath_rev = 0;
- len = 0;
for (i = level; i >= 1; --i)
{
const char *cp = xpath[i].part;
if (*cp)
{
- for (;*cp; cp++)
+ for (; *cp; cp++)
+ {
if (*cp == '*')
- {
- memcpy (xpath_rev + len, "[^/]*", 5);
- len += 5;
- }
+ wrbuf_puts(xpath_rev, "[^/]*");
else if (*cp == ' ')
- {
-
- xpath_rev[len++] = 1;
- xpath_rev[len++] = ' ';
- }
-
+ wrbuf_puts(xpath_rev, "\001 ");
else
- xpath_rev[len++] = *cp;
- xpath_rev[len++] = '/';
+ 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 */
- {
- xpath_rev[len++] = '.';
- xpath_rev[len++] = '*';
- }
+ wrbuf_puts(xpath_rev, ".*");
}
- xpath_rev[len] = 0;
-
if (xpath[level].predicate &&
xpath[level].predicate->which == XPATH_PREDICATE_RELATION &&
xpath[level].predicate->u.relation.name[0])
}
wrbuf_puts(wbuf, "");
rset_attr = xpath_trunc(
- zh, stream, '0', wrbuf_buf(wbuf), 3,
- curAttributeSet, rset_nmem, kc);
+ 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, xpath_rev);
- if (strlen(xpath_rev))
+ 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',
- xpath_rev, 1, curAttributeSet, rset_nmem, kc);
-
- rset_end_tag = xpath_trunc(zh, stream, '0',
- xpath_rev, 2, curAttributeSet, rset_nmem, kc);
-
- rset = rsbetween_create(rset_nmem, kc, kc->scope,
- rset_start_tag, rset,
- rset_end_tag, rset_attr);
+ 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;
}
}
return ZEBRA_OK;
}
+#define MAX_XPATH_STEPS 10
+
static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
oid_value attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
int sort_flag;
char termz[IT_MAX_WORD+1];
int xpath_len;
- int xpath_use = 0;
- struct xpath_location_step xpath[10];
+ const char *xpath_use = 0;
+ struct xpath_location_step xpath[MAX_XPATH_STEPS];
if (!log_level_set)
{
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 = parse_xpath(zh, zapt, attributeSet, xpath, 10, stream);
+ xpath_len = rpn_check_xpath(zh, zapt, attributeSet,
+ xpath, MAX_XPATH_STEPS, stream);
if (xpath_len >= 0)
{
- xpath_use = 1016; /* searching for element by default */
if (xpath[xpath_len-1].part[0] == '@')
- xpath_use = 1015; /* last step an attribute .. */
+ 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);
+ }
+ }
}
/* search using one of the various search type strategies
}
else
{
- zebra_setError(zh, YAZ_BIB1_UNSUPP_STRUCTURE_ATTRIBUTE, 0);
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0);
res = ZEBRA_FAIL;
}
if (res != ZEBRA_OK)
return res;
if (!*rset)
return ZEBRA_FAIL;
- return rpn_search_xpath(zh, attributeSet, num_bases, basenames,
+ return rpn_search_xpath(zh, num_bases, basenames,
stream, rank_type, *rset,
xpath_len, xpath, rset_nmem, rset, kc);
}
switch (zop->which)
{
case Z_Operator_and:
- rset = rsmulti_and_create(rset_nmem, kc,
- kc->scope,
- *num_result_sets, *result_sets);
+ rset = rset_create_and(rset_nmem, kc,
+ kc->scope,
+ *num_result_sets, *result_sets);
break;
case Z_Operator_or:
- rset = rsmulti_or_create(rset_nmem, kc,
- kc->scope, 0, /* termid */
- *num_result_sets, *result_sets);
+ rset = rset_create_or(rset_nmem, kc,
+ kc->scope, 0, /* termid */
+ *num_result_sets, *result_sets);
break;
case Z_Operator_and_not:
- rset = rsbool_create_not(rset_nmem, kc,
- kc->scope,
- (*result_sets)[0],
- (*result_sets)[1]);
+ 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)
}
else
{
- rset = rsprox_create(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 );
+ 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:
*count = rset->hits_count;
}
+#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 after;
int base_no;
char termz[IT_MAX_WORD+20];
- AttrType use;
- int use_value;
- const char *use_string = 0;
struct scan_info *scan_info_array;
ZebraScanEntry *glist;
- int ords[32], ord_no = 0;
- int ptr[32];
-
- int bases_ok = 0; /* no of databases with OK attribute */
- int errCode = 0; /* err code (if any is not OK) */
- char *errString = 0; /* addinfo */
+ 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[128];
int complete_flag;
AttrType termset;
int termset_value_numeric;
const char *termset_value_string;
- attr_init(&termset, zapt, 8);
+ attr_init_APT(&termset, zapt, 8);
termset_value_numeric =
attr_find_ex(&termset, NULL, &termset_value_string);
if (termset_value_numeric != -1)
yaz_log(YLOG_DEBUG, "position = %d, num = %d set=%d",
pos, num, attributeset);
- attr_init(&use, zapt, 1);
- use_value = attr_find_ex(&use, &attributeset, &use_string);
-
- if (zebra_maps_attr(zh->reg->zebra_maps, zapt, ®_id, &search_type,
+ if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type,
rank_type, &complete_flag, &sort_flag))
{
*num_entries = 0;
zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_TYPE, 0);
return ZEBRA_FAIL;
}
- yaz_log(YLOG_DEBUG, "use_value = %d", use_value);
-
- 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++)
{
- data1_local_attribute *local_attr;
- attent attp;
int ord;
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
*num_entries = 0;
return ZEBRA_FAIL;
}
-
- if (use_string &&
- (ord = zebraExplain_lookup_attr_str(zh->reg->zei, reg_id,
- use_string)) >= 0)
- {
- /* we have a match for a raw string attribute */
- if (ord > 0)
- ords[ord_no++] = ord;
- attp.local_attributes = 0; /* no more attributes */
- }
- else
- {
- int r;
-
- if ((r = att_getentbyatt (zh, &attp, attributeset, use_value,
- use_string)))
- {
- yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d",
- attributeset, use_value);
- if (r == -1)
- {
- errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE;
- if (use_string)
- zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
- use_string);
- else
- zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
- use_value);
- }
- else
- {
- zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_SET, 0);
- }
- continue;
- }
- }
- bases_ok++;
- for (local_attr = attp.local_attributes; local_attr && ord_no < 32;
- local_attr = local_attr->next)
- {
- ord = zebraExplain_lookup_attr_su(zh->reg->zei, reg_id,
- attp.attset_ordinal,
- local_attr->local);
- if (ord > 0)
- ords[ord_no++] = ord;
- }
- }
- if (!bases_ok && errCode)
- {
- zebra_setError(zh, errCode, errString);
- *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)
{
struct scan_info *scan_info = scan_info_array + i;
struct rpn_char_map_info rcmi;
- rpn_char_map_prepare (zh->reg, reg_id, &rcmi);
+ rpn_char_map_prepare (zh->reg, index_type, &rcmi);
scan_info->before = before;
scan_info->after = after;
scan_info->list[j].term = NULL;
prefix_len += key_SU_encode (ords[i], termz + prefix_len);
-#if REG_TYPE_PREFIX
- termz[prefix_len++] = reg_id;
-#endif
termz[prefix_len] = 0;
strcpy(scan_info->prefix, termz);
- if (trans_scan_term(zh, zapt, termz+prefix_len, reg_id) == ZEBRA_FAIL)
+ 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,
if (lo >= 0)
{
/* get result set for first term */
- zebra_term_untrans_iconv(zh, stream->mem, reg_id,
+ 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, reg_id, 0 /* hits_limit */,
+ kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */);
}
ptr[j0]++; /* move index for this set .. */
glist[lo].term,
strlen(glist[lo].term), NULL, 0,
zapt->term->which,rset_nmem,
- kc, kc->scope, 0, reg_id, 0 /* hits_limit */,
+ kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */ );
- rset = rsmulti_or_create(rset_nmem, kc,
- kc->scope, 0 /* termid */,
- 2, rsets);
+ rset = rset_create_or(rset_nmem, kc,
+ kc->scope, 0 /* termid */,
+ 2, rsets);
}
ptr[j]++;
}
rsets[0] = rset;
rsets[1] = rset_dup(limit_set);
- rset = rsmulti_and_create(rset_nmem, kc,
- kc->scope,
- 2, rsets);
+ rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets);
}
/* count it */
count_set(zh, rset, &count);
if (j0 == -1)
break;
- zebra_term_untrans_iconv(zh, stream->mem, reg_id,
+ 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, reg_id, 0 /* hits_limit */,
+ kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */);
ptr[j0]++;
glist[lo].term,
strlen(glist[lo].term), NULL, 0,
zapt->term->which, rset_nmem,
- kc, kc->scope, 0, reg_id, 0 /* hits_limit */,
+ kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */);
- rset = rsmulti_or_create(rset_nmem, kc,
- kc->scope, 0 /* termid */, 2, rsets);
+ rset = rset_create_or(rset_nmem, kc,
+ kc->scope, 0 /* termid */, 2, rsets);
ptr[j]++;
}
rsets[0] = rset;
rsets[1] = rset_dup(limit_set);
- rset = rsmulti_and_create(rset_nmem, kc,
- kc->scope, 2, rsets);
+ rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets);
}
count_set(zh, rset, &count);
glist[lo].occurrences = count;
return ZEBRA_OK;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+