projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #1142: Non-indexed but listed attributes issues diagnostic.
[idzebra-moved-to-github.git]
/
util
/
attrfind.c
diff --git
a/util/attrfind.c
b/util/attrfind.c
index
80f9912
..
b981034
100644
(file)
--- a/
util/attrfind.c
+++ b/
util/attrfind.c
@@
-1,5
+1,5
@@
-/* $Id: attrfind.c,v 1.1 2006-05-19 13:49:38 adam Exp $
- Copyright (C) 2005-2006
+/* $Id: attrfind.c,v 1.4 2007-05-08 12:50:06 adam Exp $
+ Copyright (C) 2005-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-42,7
+42,7
@@
void attr_init_AttrList(AttrType *src, Z_AttributeList *list, int type)
src->minor = 0;
}
src->minor = 0;
}
-int attr_find_ex(AttrType *src, oid_value *attributeSetP,
+int attr_find_ex(AttrType *src, const Odr_oid **attribute_set_oid,
const char **string_value)
{
int num_attributes;
const char **string_value)
{
int num_attributes;
@@
-59,25
+59,15
@@
int attr_find_ex(AttrType *src, oid_value *attributeSetP,
{
case Z_AttributeValue_numeric:
++(src->major);
{
case Z_AttributeValue_numeric:
++(src->major);
- if (element->attributeSet && attributeSetP)
- {
- oident *attrset;
-
- attrset = oid_getentbyoid(element->attributeSet);
- *attributeSetP = attrset->value;
- }
+ if (element->attributeSet && attribute_set_oid)
+ *attribute_set_oid = element->attributeSet;
return *element->value.numeric;
break;
case Z_AttributeValue_complex:
if (src->minor >= element->value.complex->num_list)
break;
return *element->value.numeric;
break;
case Z_AttributeValue_complex:
if (src->minor >= element->value.complex->num_list)
break;
- if (element->attributeSet && attributeSetP)
- {
- oident *attrset;
-
- attrset = oid_getentbyoid(element->attributeSet);
- *attributeSetP = attrset->value;
- }
+ if (element->attributeSet && attribute_set_oid)
+ *attribute_set_oid = element->attributeSet;
if (element->value.complex->list[src->minor]->which ==
Z_StringOrNumeric_numeric)
{
if (element->value.complex->list[src->minor]->which ==
Z_StringOrNumeric_numeric)
{
@@
-106,9
+96,9
@@
int attr_find_ex(AttrType *src, oid_value *attributeSetP,
return -1;
}
return -1;
}
-int attr_find(AttrType *src, oid_value *attributeSetP)
+int attr_find(AttrType *src, const Odr_oid **attribute_set_id)
{
{
- return attr_find_ex(src, attributeSetP, 0);
+ return attr_find_ex(src, attribute_set_id, 0);
}
}