X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fattribute.c;h=9e8f327581d662cbabca6df2298e31ed7414eb52;hp=5b5c8866429ed62e85dead2c9b5b9fc71524152b;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=1cd8e47d53d94462ab3a96f01ab200222004b901 diff --git a/index/attribute.c b/index/attribute.c index 5b5c886..9e8f327 100644 --- a/index/attribute.c +++ b/index/attribute.c @@ -1,86 +1,210 @@ -/* - * Copyright (C) 1994-1995, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: attribute.c,v $ - * Revision 1.3 1996-05-09 07:28:54 quinn - * Work towards phrases and multiple registers - * - * Revision 1.2 1995/11/15 19:13:07 adam - * Work on record management. - * - * - * This interface is used by other modules (the Z-server in particular) - * to normalize the attributes given in queries. - */ +/* $Id: attribute.c,v 1.26 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS -#include +This file is part of the Zebra server. -#include -#include -#include -#include +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. -#include "attribute.h" +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -static int initialized = 0; +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#include -static data1_attset *registered_sets = 0; +#include +#include +#include +#include +#include +#include "index.h" -static void att_loadset(const char *n, const char *name) +static data1_att *getatt(data1_attset *p, int att) { - data1_attset *new; + data1_att *a; + data1_attset_child *c; - if (!(new = data1_read_attset((char*) name))) - { - logf(LOG_WARN|LOG_ERRNO, "%s", name); - return; - } - new->next = registered_sets; - registered_sets = new; - return; + /* scan local set */ + for (a = p->atts; a; a = a->next) + if (a->value == att) + return a; + /* scan included sets */ + for (c = p->children; c; c = c->next) + if ((a = getatt(c->child, att))) + return a; + return 0; } -static void load_atts() +static int att_getentbyatt(ZebraHandle zi, oid_value set, int att, + const char **name) { - res_trav(common_resource, "attset", att_loadset); + data1_att *r; + data1_attset *p; + + if (!(p = data1_attset_search_id (zi->reg->dh, set))) + { + zebraExplain_loadAttsets (zi->reg->dh, zi->res); + p = data1_attset_search_id (zi->reg->dh, set); + } + if (!p) /* set undefined */ + return -2; + if (!(r = getatt(p, att))) + return -1; + *name = r->name; + return 0; } -static data1_att *getatt(data1_attset *p, int att) + +ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh, + Z_AttributeList *attr_list, + zinfo_index_category_t cat, + int index_type, + oid_value curAttributeSet, + int *ord) { - data1_att *a; + int use_value = -1; + const char *use_string = 0; + AttrType use; + + attr_init_AttrList(&use, attr_list, 1); + use_value = attr_find_ex(&use, &curAttributeSet, &use_string); - for (; p; p = p->next) + if (use_value < 0) { - /* scan local set */ - for (a = p->atts; a; a = a->next) - if (a->value == att) - return a; - /* scan included sets */ - if (p->children && (a = getatt(p->children, att))) - return a; + if (!use_string) + use_string = "any"; } - return 0; + else + { + /* we have a use attribute and attribute set */ + int r; + + r = att_getentbyatt(zh, curAttributeSet, use_value, &use_string); + if (r == -2) + { + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_SET, 0); + return ZEBRA_FAIL; + } + if (r == -1) + { + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value); + return ZEBRA_FAIL; + } + } + if (!use_string) + { + zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, 0); + return ZEBRA_FAIL; + } + *ord = zebraExplain_lookup_attr_str(zh->reg->zei, cat, + index_type, use_string); + if (*ord == -1) + { + if (use_value < 0) + zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_string); + else + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, use_value); + return ZEBRA_FAIL; + } + return ZEBRA_OK; } -attent *att_getentbyatt(oid_value set, int att) +ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + int index_type, + const char *xpath_use, + oid_value curAttributeSet, + int *ord) { - static attent res; - data1_att *r; - data1_attset *p; + ZEBRA_RES res = ZEBRA_OK; + AttrType relation; + int relation_value; + zinfo_index_category_t cat = zinfo_index_category_index; + + attr_init_APT(&relation, zapt, 2); + relation_value = attr_find(&relation, NULL); - if (!initialized) + if (relation_value == 103) /* always matches */ + cat = zinfo_index_category_alwaysmatches; + + if (!xpath_use) { - initialized = 1; - load_atts(); + res = zebra_attr_list_get_ord(zh, zapt->attributes, + cat, index_type, + curAttributeSet, ord); + /* use attribute not found. But it the relation is + always matches and the regulare index attribute is found + return a different diagnostic */ + if (res != ZEBRA_OK && + relation_value == 103 + && zebra_attr_list_get_ord( + zh, zapt->attributes, + zinfo_index_category_index, index_type, + curAttributeSet, ord) == ZEBRA_OK) + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE, 103); } - for (p = registered_sets; p; p = p->next) - if (p->reference == set && (r = getatt(p, att))) - break;; - if (!p) - return 0; - res.attset_ordinal = r->parent->ordinal; - res.local_attributes = r->locals; - return &res; + else + { + *ord = zebraExplain_lookup_attr_str(zh->reg->zei, cat, index_type, + xpath_use); + if (*ord == -1) + { + yaz_log(YLOG_LOG, "zebra_apt_get_ord FAILED xpath=%s index_type=%c", + xpath_use, index_type); + zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, 0); + res = ZEBRA_FAIL; + } + else + { + yaz_log(YLOG_LOG, "zebra_apt_get_ord OK xpath=%s index_type=%c", + xpath_use, index_type); + + } + } + return res; +} + +ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh, + Z_SortAttributes *sortAttributes, + int *ord, + int *numerical) +{ + AttrType structure; + int structure_value; + attr_init_AttrList(&structure, sortAttributes->list, 4); + + *numerical = 0; + structure_value = attr_find(&structure, 0); + if (structure_value == 109) + *numerical = 1; + + if (zebra_attr_list_get_ord(zh, sortAttributes->list, + zinfo_index_category_sort, + 's', VAL_BIB1, ord)== ZEBRA_OK) + return ZEBRA_OK; + if (zebra_attr_list_get_ord(zh, sortAttributes->list, + zinfo_index_category_sort, + 'S', VAL_BIB1, ord)== ZEBRA_OK) + return ZEBRA_OK; + return ZEBRA_FAIL; } + + +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +