-/* $Id: zrpn.c,v 1.188 2005-05-03 14:04:31 adam Exp $
+/* $Id: zrpn.c,v 1.192 2005-05-24 11:35:42 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
strcat(term_tmp, ")");
break;
default:
- *error_code = 117;
+ *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE;
return 0;
}
return 1;
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
{
- zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
- zh->errString = basenames[base_no];
+ zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
+ basenames[base_no]);
return ZEBRA_FAIL;
}
if (xpath_use > 0 && use_value == -2)
{
if (relation_error)
{
- zh->errCode = relation_error;
+ zebra_setError(zh, relation_error, 0);
return ZEBRA_FAIL;
}
*term_sub = 0;
strcat(term_dict, ")");
break;
default:
- zh->errCode = YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE;
- zh->errString = nmem_strdup_i(stream, truncation_value);
+ zebra_setError_zint(zh,
+ YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE,
+ truncation_value);
return ZEBRA_FAIL;
}
if (attr_ok)
}
if (!bases_ok)
{
- zh->errCode = errCode;
- zh->errString = errString;
+ zebra_setError(zh, errCode, errString);
return ZEBRA_FAIL;
}
*term_sub = termp;
if (ret == (size_t)(-1))
{
ret = yaz_iconv(zh->iconv_to_utf8, 0, 0, 0, 0);
- zh->errCode =
- YAZ_BIB1_QUERY_TERM_INCLUDES_CHARS_THAT_DO_NOT_TRANSLATE_INTO_;
- return -1;
+ zebra_setError(
+ zh,
+ YAZ_BIB1_QUERY_TERM_INCLUDES_CHARS_THAT_DO_NOT_TRANSLATE_INTO_,
+ 0);
+ return ZEBRA_FAIL;
}
*outbuf = 0;
}
termz[sizez] = '\0';
break;
default:
- zh->errCode = YAZ_BIB1_UNSUPP_CODED_VALUE_FOR_TERM;
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_CODED_VALUE_FOR_TERM, 0);
return ZEBRA_FAIL;
}
return ZEBRA_OK;
xfree(grep_info->isam_p_buf);
}
-static int grep_info_prepare(ZebraHandle zh,
- Z_AttributesPlusTerm *zapt,
- struct grep_info *grep_info,
- int reg_type,
- NMEM stream)
+static ZEBRA_RES grep_info_prepare(ZebraHandle zh,
+ Z_AttributesPlusTerm *zapt,
+ struct grep_info *grep_info,
+ int reg_type)
{
AttrType termset;
int termset_value_numeric;
grep_info->termset = 0;
if (!zapt)
- return 0;
+ return ZEBRA_OK;
attr_init(&termset, zapt, 8);
termset_value_numeric =
attr_find_ex(&termset, NULL, &termset_value_string);
grep_info->termset = resultSetAdd(zh, termset_name, 1);
if (!grep_info->termset)
{
- zh->errCode = YAZ_BIB1_ILLEGAL_RESULT_SET_NAME;
- zh->errString = nmem_strdup(stream, termset_name);
- return -1;
+ zebra_setError(zh, YAZ_BIB1_ILLEGAL_RESULT_SET_NAME, termset_name);
+ return ZEBRA_FAIL;
}
}
- return 0;
+ return ZEBRA_OK;
}
*num_result_sets = 0;
*term_dst = 0;
- if (grep_info_prepare(zh, zapt, &grep_info, reg_type, stream))
+ if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL)
return ZEBRA_FAIL;
while(1)
{
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc);
+ *rset = rsnull_create (rset_nmem, kc, 0);
else if (num_result_sets == 1)
*rset = result_sets[0];
else
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc);
+ *rset = rsnull_create (rset_nmem, kc, 0);
else if (num_result_sets == 1)
*rset = result_sets[0];
else
- *rset = rsmulti_or_create(rset_nmem, kc, kc->scope,
+ *rset = rsmulti_or_create(rset_nmem, kc, kc->scope, 0 /* termid */,
num_result_sets, result_sets);
if (!*rset)
return ZEBRA_FAIL;
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc);
+ *rset = rsnull_create (rset_nmem, kc, 0);
else if (num_result_sets == 1)
*rset = result_sets[0];
else
sprintf(term_tmp, "(0*%d)", term_value);
break;
default:
- *error_code = 117;
+ *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE;
return 0;
}
yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp);
}
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
{
- zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
- zh->errString = basenames[base_no];
- return -1;
+ 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)
}
if (!prefix_len)
{
- errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE;
- errString = nmem_strdup_i(stream, use_value);
+ zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value);
continue;
}
bases_ok++;
{
if (relation_error)
{
- zh->errCode = relation_error;
- zh->errString = 0;
+ zebra_setError(zh, relation_error, 0);
return ZEBRA_FAIL;
}
*term_sub = 0;
}
if (!bases_ok)
{
- zh->errCode = errCode;
- zh->errString = errString;
+ zebra_setError(zh, errCode, errString);
return ZEBRA_FAIL;
}
*term_sub = termp;
int alloc_sets = 0;
yaz_log(log_level_rpn, "APT_numeric t='%s'", termz);
- if (grep_info_prepare(zh, zapt, &grep_info, reg_type, stream))
+ if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL)
return ZEBRA_FAIL;
while (1)
{
return ZEBRA_FAIL;
}
if (num_result_sets == 0)
- *rset = rsnull_create(rset_nmem, kc);
+ *rset = rsnull_create(rset_nmem, kc, 0);
if (num_result_sets == 1)
*rset = result_sets[0];
else
oid_value attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
const char *rank_type,
+ NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
{
int i;
int sort_relation_value;
AttrType sort_relation_type;
- int use_value;
- AttrType use_type;
Z_SortKeySpec *sks;
Z_SortKey *sk;
- Z_AttributeElement *ae;
int oid[OID_SIZE];
oident oe;
char termz[20];
attr_init(&sort_relation_type, zapt, 7);
sort_relation_value = attr_find(&sort_relation_type, &attributeSet);
- attr_init(&use_type, zapt, 1);
- use_value = attr_find(&use_type, &attributeSet);
-
if (!sort_sequence->specs)
{
sort_sequence->num_specs = 10;
nmem_malloc(stream, sizeof(*sk->u.sortAttributes));
sk->u.sortAttributes->id = oid;
- sk->u.sortAttributes->list = (Z_AttributeList *)
- nmem_malloc(stream, sizeof(*sk->u.sortAttributes->list));
- sk->u.sortAttributes->list->num_attributes = 1;
- sk->u.sortAttributes->list->attributes = (Z_AttributeElement **)
- nmem_malloc(stream, sizeof(*sk->u.sortAttributes->list->attributes));
- ae = *sk->u.sortAttributes->list->attributes = (Z_AttributeElement *)
- nmem_malloc(stream, sizeof(**sk->u.sortAttributes->list->attributes));
- ae->attributeSet = 0;
- ae->attributeType = (int *)
- nmem_malloc(stream, sizeof(*ae->attributeType));
- *ae->attributeType = 1;
- ae->which = Z_AttributeValue_numeric;
- ae->value.numeric = (int *)
- nmem_malloc(stream, sizeof(*ae->value.numeric));
- *ae->value.numeric = use_value;
+ sk->u.sortAttributes->list = zapt->attributes;
sks->sortRelation = (int *)
nmem_malloc(stream, sizeof(*sks->sortRelation));
sks->which = Z_SortKeySpec_null;
sks->u.null = odr_nullval ();
sort_sequence->specs[i] = sks;
- *rset = rsnull_create (NULL, kc);
+ *rset = rsnull_create (rset_nmem, kc, 0);
return ZEBRA_OK;
}
int term_type = Z_Term_characterString;
const char *flags = "void";
- if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, '0', stream))
- return rsnull_create(rset_nmem, kc);
+ if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, '0') == ZEBRA_FAIL)
+ return rsnull_create(rset_nmem, kc, 0);
if (ord < 0)
- return rsnull_create(rset_nmem, kc);
+ return rsnull_create(rset_nmem, kc, 0);
if (prefix_len)
term_dict[prefix_len++] = '|';
else
return rset;
}
-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,
- NMEM rset_nmem,
- struct rset_key_control *kc)
+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,
+ NMEM rset_nmem,
+ RSET *rset_out,
+ struct rset_key_control *kc)
{
oid_value curAttributeSet = attributeSet;
int base_no;
int i;
if (xpath_len < 0)
- return rset;
+ {
+ *rset_out = rset;
+ return ZEBRA_OK;
+ }
yaz_log(YLOG_DEBUG, "xpath len=%d", xpath_len);
for (i = 0; i<xpath_len; i++)
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
{
- zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
- zh->errString = basenames[base_no];
- return rset;
+ zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
+ basenames[base_no]);
+ *rset_out = rset;
+ return ZEBRA_FAIL;
}
while (--level >= 0)
{
first_path = 0;
}
}
-
- return rset;
+ *rset_out = rset;
+ return ZEBRA_OK;
}
static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
if (sort_flag)
return rpn_sort_spec(zh, zapt, attributeSet, stream, sort_sequence,
- rank_type, rset, kc);
+ rank_type, rset_nmem, rset, kc);
xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, 10, stream);
if (xpath_len >= 0)
{
}
else
{
- zh->errCode = YAZ_BIB1_UNSUPP_STRUCTURE_ATTRIBUTE;
- return ZEBRA_FAIL;
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_STRUCTURE_ATTRIBUTE, 0);
+ res = ZEBRA_FAIL;
}
if (res != ZEBRA_OK)
return res;
if (!*rset)
return ZEBRA_FAIL;
- *rset = rpn_search_xpath(zh, attributeSet, num_bases, basenames,
- stream, rank_type, *rset,
- xpath_len, xpath, rset_nmem, kc);
- if (!*rset)
- return ZEBRA_FAIL;
- return ZEBRA_OK;
+ return rpn_search_xpath(zh, attributeSet, num_bases, basenames,
+ stream, rank_type, *rset,
+ xpath_len, xpath, rset_nmem, rset, kc);
}
static ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,
for (i = 0; i<num_result_sets; i++)
rset_delete(result_sets[i]);
*result_set = 0;
- return res;
}
- assert(num_result_sets == 1);
- assert(result_sets);
- assert(*result_sets);
- *result_set = *result_sets;
-
+ else
+ {
+ assert(num_result_sets == 1);
+ assert(result_sets);
+ assert(*result_sets);
+ *result_set = *result_sets;
+ }
(*kc->dec)(kc);
- return ZEBRA_OK;
+ return res;
}
ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,
break;
case Z_Operator_or:
rset = rsmulti_or_create(rset_nmem, kc,
- kc->scope,
+ kc->scope, 0, /* termid */
*num_result_sets, *result_sets);
break;
case Z_Operator_and_not:
case Z_Operator_prox:
if (zop->u.prox->which != Z_ProximityOperator_known)
{
- zh->errCode = YAZ_BIB1_UNSUPP_PROX_UNIT_CODE;
+ zebra_setError(zh,
+ YAZ_BIB1_UNSUPP_PROX_UNIT_CODE,
+ 0);
return ZEBRA_FAIL;
}
if (*zop->u.prox->u.known != Z_ProxUnit_word)
{
- char *val = (char *) nmem_malloc(stream, 16);
- zh->errCode = YAZ_BIB1_UNSUPP_PROX_UNIT_CODE;
- zh->errString = val;
- sprintf(val, "%d", *zop->u.prox->u.known);
+ zebra_setError_zint(zh,
+ YAZ_BIB1_UNSUPP_PROX_UNIT_CODE,
+ *zop->u.prox->u.known);
return ZEBRA_FAIL;
}
else
}
break;
default:
- zh->errCode = YAZ_BIB1_OPERATOR_UNSUPP;
+ zebra_setError(zh, YAZ_BIB1_OPERATOR_UNSUPP, 0);
return ZEBRA_FAIL;
}
*num_result_sets = 1;
rset = resultSetRef(zh, zs->u.simple->u.resultSetId);
if (!rset)
{
- zh->errCode = YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST;
- zh->errString =
- nmem_strdup(stream, zs->u.simple->u.resultSetId);
+ zebra_setError(zh,
+ YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ zs->u.simple->u.resultSetId);
return ZEBRA_FAIL;
}
rset_dup(rset);
}
else
{
- zh->errCode = YAZ_BIB1_UNSUPP_SEARCH;
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0);
return ZEBRA_FAIL;
}
*num_result_sets = 1;
}
else
{
- zh->errCode = YAZ_BIB1_UNSUPP_SEARCH;
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0);
return ZEBRA_FAIL;
}
return ZEBRA_OK;
rank_type, &complete_flag, &sort_flag))
{
*num_entries = 0;
- zh->errCode = YAZ_BIB1_UNSUPP_ATTRIBUTE_TYPE;
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_TYPE, 0);
return ZEBRA_FAIL;
}
yaz_log(YLOG_DEBUG, "use_value = %d", use_value);
if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no]))
{
- zh->errString = basenames[base_no];
- zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
+ basenames[base_no]);
*num_entries = 0;
return ZEBRA_FAIL;
}
{
errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE;
if (use_string)
- errString = odr_strdup(stream, use_string);
+ zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE,
+ use_string);
else
- {
- char val_str[32];
- sprintf(val_str, "%d", use_value);
- errString = odr_strdup(stream, val_str);
- }
+ 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;
}
}
}
if (!bases_ok && errCode)
{
- zh->errCode = errCode;
- zh->errString = errString;
+ zebra_setError(zh, errCode, errString);
*num_entries = 0;
return ZEBRA_FAIL;
}
zapt->term->which,rset_nmem,
kc, kc->scope);
rset = rsmulti_or_create(rset_nmem, kc,
- 2, kc->scope, rsets);
+ kc->scope, 0 /* termid */,
+ 2, rsets);
}
ptr[j]++;
}
rsets[1] = rset_dup(limit_set);
rset = rsmulti_and_create(rset_nmem, kc,
- kc->scope, 2, rsets);
+ kc->scope,
+ 2, rsets);
}
/* count it */
count_set(rset, &glist[lo].occurrences);
zapt->term->which, rset_nmem,
kc, kc->scope);
rset = rsmulti_or_create(rset_nmem, kc,
- 2, kc->scope, rsets);
+ kc->scope, 0 /* termid */, 2, rsets);
ptr[j]++;
}
projects / idzebra-moved-to-github.git / blobdiff