-/* $Id: zrpn.c,v 1.202 2005-06-23 06:45:46 adam Exp $
+/* $Id: zrpn.c,v 1.209 2006-02-20 12:38:42 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
}
static int attr_find_ex(AttrType *src, oid_value *attributeSetP,
- const char **string_value)
+ const char **string_value)
{
int num_attributes;
{
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++;
const char *db;
int set, use;
char term_tmp[IT_MAX_WORD];
- int su_code = 0;
- int len = key_SU_decode (&su_code, name);
+ int ord = 0;
+ int len = key_SU_decode (&ord, (const unsigned char *) name);
zebra_term_untrans (p->zh, p->reg_type, term_tmp, name+len+1);
- yaz_log(log_level_rpn, "grep: %d %c %s", su_code, name[len], term_tmp);
+ yaz_log(log_level_rpn, "grep: %d %c %s", ord, name[len], term_tmp);
zebraExplain_lookup_ord (p->zh->reg->zei,
- su_code, &db, &set, &use);
+ ord, 0 /* index_type */, &db, &set, &use);
yaz_log(log_level_rpn, "grep: set=%d use=%d db=%s", set, use, db);
resultSetAddTerm(p->zh, p->termset, name[len], db,
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);
*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);
+ 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 */
*hits_limit_value = zh->approx_limit;
}
- yaz_log(YLOG_LOG, "term_limits_APT ref_id=%s limit=" ZINT_FORMAT,
+ yaz_log(YLOG_DEBUG, "term_limits_APT ref_id=%s limit=" ZINT_FORMAT,
*term_ref_id_str ? *term_ref_id_str : "none",
*hits_limit_value);
return ZEBRA_OK;
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,
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 Z_Term_general:
if (zh->iconv_to_utf8 != 0)
{
- char *inbuf = term->u.general->buf;
+ char *inbuf = (char *) term->u.general->buf;
size_t inleft = term->u.general->len;
char *outbuf = termz;
size_t outleft = IT_MAX_WORD-1;
}
bases_ok++;
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,
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)
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;
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);