X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fattribute.c;h=92f7fc0661da4f39cebf5dfd4626d10c223626e6;hp=bf69af218ade19c33741499ea2a63ff3736a7ba6;hb=c3ff843e467932c6027a8b3b2ebda7b44612447e;hpb=a030c87bc444608639905eca95e29f84a4f1d991 diff --git a/index/attribute.c b/index/attribute.c index bf69af2..92f7fc0 100644 --- a/index/attribute.c +++ b/index/attribute.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2011 Index Data + Copyright (C) Index Data 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 @@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -86,7 +89,7 @@ ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh, { /* we have a use attribute and attribute set */ int r; - + r = att_getentbyatt(zh, curAttributeSet, use_value, &use_string); if (r == -2) { @@ -104,12 +107,12 @@ ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh, zebra_setError(zh, YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, 0); return ZEBRA_FAIL; } - *ord = zebraExplain_lookup_attr_str(zh->reg->zei, cat, + *ord = zebraExplain_lookup_attr_str(zh->reg->zei, cat, index_type, use_string); if (*ord == -1) { - /* attribute 14=1 does not issue a diagnostic even - 1) the attribute is numeric but listed in .att + /* attribute 14=1 does not issue a diagnostic even + 1) the attribute is numeric but listed in .att 2) the use attribute is string */ AttrType unsup; @@ -146,7 +149,7 @@ ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, if (relation_value == 103) /* always matches */ cat = zinfo_index_category_alwaysmatches; - + if (!xpath_use) { res = zebra_attr_list_get_ord(zh, zapt->attributes, @@ -155,10 +158,10 @@ ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, /* 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 && + if (res != ZEBRA_OK && relation_value == 103 && zebra_attr_list_get_ord( - zh, zapt->attributes, + zh, zapt->attributes, zinfo_index_category_index, index_type, curAttributeSet, ord) == ZEBRA_OK) zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE, 103); @@ -178,7 +181,7 @@ ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh, { yaz_log(YLOG_LOG, "zebra_apt_get_ord OK xpath=%s index_type=%s", xpath_use, index_type); - + } } return res;