X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fattribute.c;h=a637f992a4e3c873743665091605013f2576f0fb;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hp=51a5be086c23689cc53da675782b7b0f84a3c36e;hpb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4;p=idzebra-moved-to-github.git diff --git a/index/attribute.c b/index/attribute.c index 51a5be0..a637f99 100644 --- a/index/attribute.c +++ b/index/attribute.c @@ -1,4 +1,4 @@ -/* $Id: attribute.c,v 1.20 2005-03-30 09:25:23 adam Exp $ +/* $Id: attribute.c,v 1.22 2006-05-10 08:13:20 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -56,11 +56,24 @@ int att_getentbyatt(ZebraHandle zi, attent *res, oid_value set, int att, zebraExplain_loadAttsets (zi->reg->dh, zi->res); p = data1_attset_search_id (zi->reg->dh, set); } - if (!p) - return -2; + if (!p) /* set undefined */ + { + if (sattr) + return -1; /* return bad string attribute */ + else + return -2; /* return bad set */ + } if (!(r = getatt(p, att, sattr))) return -1; res->attset_ordinal = r->parent->reference; res->local_attributes = r->locals; return 0; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +