-/* $Id: zrpn.c,v 1.201 2005-06-22 19:42:38 adam Exp $
+/* $Id: zrpn.c,v 1.205 2005-08-26 10:13:31 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
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,
/* 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;
return ZEBRA_OK;
}
-static char *nmem_strdup_i(NMEM nmem, int v)
-{
- char val_str[64];
- sprintf(val_str, "%d", v);
- return nmem_strdup(nmem, val_str);
-}
-
static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
const char **term_sub,
oid_value attributeSet, NMEM stream,
int space_split = complete_flag ? 0 : 1;
int bases_ok = 0; /* no of databases with OK attribute */
- int errCode = 0; /* err code (if any is not OK) */
- char *errString = 0; /* addinfo */
-
*ol = ord_list_create(stream);
}
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 */
if (r == -1)
{
/* set was found, but value wasn't defined */
- errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE;
if (use_string)
- errString = nmem_strdup(stream, use_string);
+ zebra_setError(zh,
+ YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
+ use_string);
else
- errString = nmem_strdup_i (stream, use_value);
+ zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
+ use_value);
}
else
{
oident.value = curAttributeSet;
oid_ent_to_oid (&oident, oid);
- errCode = YAZ_BIB1_UNSUPP_ATTRIBUTE_SET;
- errString = nmem_strdup(stream, oident.desc);
+ zebra_setError(zh,
+ YAZ_BIB1_UNSUPP_ATTRIBUTE_SET,
+ oident.desc);
+
}
continue;
}
int i, ord_len;
ord = zebraExplain_lookup_attr_su(zh->reg->zei,
+ reg_type,
attp.attset_ordinal,
local_attr->local);
if (ord < 0)
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)
}
}
if (!bases_ok)
- {
- zebra_setError(zh, errCode, errString);
return ZEBRA_FAIL;
- }
*term_sub = termp;
yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx);
return ZEBRA_OK;
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;
struct rpn_char_map_info rcmi;
int bases_ok = 0; /* no of databases with OK attribute */
- int errCode = 0; /* err code (if any is not OK) */
- char *errString = 0; /* addinfo */
rpn_char_map_prepare (zh->reg, reg_type, &rcmi);
attr_init(&use, zapt, 1);
else
{
if ((r = att_getentbyatt (zh, &attp, curAttributeSet, use_value,
- use_string)))
+ use_string)))
{
yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d",
curAttributeSet, use_value, r);
if (r == -1)
{
- errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE;
if (use_string)
- errString = nmem_strdup(stream, use_string);
+ zebra_setError(zh,
+ YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
+ use_string);
else
- errString = nmem_strdup_i (stream, use_value);
+ zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
+ use_value);
}
else
- errCode = YAZ_BIB1_UNSUPP_ATTRIBUTE_SET;
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_SET, 0);
continue;
}
}
int i, ord_len;
ord = zebraExplain_lookup_attr_su(zh->reg->zei,
+ reg_type,
attp.attset_ordinal,
local_attr->local);
if (ord < 0)
continue;
}
bases_ok++;
- term_dict[prefix_len++] = ')';
+ 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,
}
}
if (!bases_ok)
- {
- zebra_setError(zh, errCode, errString);
return ZEBRA_FAIL;
- }
*term_sub = termp;
yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx);
return ZEBRA_OK;
char term_dict[2048];
char ord_buf[32];
int prefix_len = 0;
- int ord = zebraExplain_lookup_attr_su(zh->reg->zei, curAttributeSet, use);
+ int ord = zebraExplain_lookup_attr_su(zh->reg->zei, reg_type,
+ curAttributeSet, use);
int ord_len, i, r, max_pos;
int term_type = Z_Term_characterString;
const char *flags = "void";
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;
}
if (use_string &&
- (ord = zebraExplain_lookup_attr_str(zh->reg->zei,
+ (ord = zebraExplain_lookup_attr_str(zh->reg->zei, reg_id,
use_string)) >= 0)
{
/* we have a match for a raw string attribute */
for (local_attr = attp.local_attributes; local_attr && ord_no < 32;
local_attr = local_attr->next)
{
- ord = zebraExplain_lookup_attr_su(zh->reg->zei,
+ ord = zebraExplain_lookup_attr_su(zh->reg->zei, reg_id,
attp.attset_ordinal,
local_attr->local);
if (ord > 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);