projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat
[yaz-moved-to-github.git]
/
src
/
facet.c
diff --git
a/src/facet.c
b/src/facet.c
index
b83972c
..
a9a5625
100644
(file)
--- a/
src/facet.c
+++ b/
src/facet.c
@@
-51,9
+51,8
@@
Z_FacetList *yaz_oi_get_facetlist(Z_OtherInformation **otherInformation)
return 0;
z_external = oi->information.externallyDefinedInfo;
return 0;
z_external = oi->information.externallyDefinedInfo;
- if (z_external && z_external->which == Z_External_userFacets) {
+ if (z_external && z_external->which == Z_External_userFacets)
return z_external->u.facetList;
return z_external->u.facetList;
- }
return 0;
}
return 0;
}
@@
-91,7
+90,6
@@
static void useattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
if (ae->which == Z_AttributeValue_complex)
{
s = stringattr(ae->value.complex);
if (ae->which == Z_AttributeValue_complex)
{
s = stringattr(ae->value.complex);
- yaz_log(YLOG_DEBUG, "useattr %s %s", s, av->useattr);
if (s)
{
if (!av->useattr)
if (s)
{
if (!av->useattr)
@@
-147,7
+145,6
@@
static void limitattr(Z_AttributeElement *ae, struct yaz_facet_attr *av)
if (ae->which == Z_AttributeValue_numeric)
{
av->limit = *ae->value.numeric;
if (ae->which == Z_AttributeValue_numeric)
{
av->limit = *ae->value.numeric;
- yaz_log(YLOG_DEBUG, "limitattr %d ", av->limit);
}
else
{
}
else
{
@@
-171,12
+168,10
@@
void yaz_facet_attr_get_z_attributes(const Z_AttributeList *attributes,
{
int i;
Z_AttributeElement *ae;
{
int i;
Z_AttributeElement *ae;
- yaz_log(YLOG_DEBUG, "Attribute num attributes: %d",
- attributes->num_attributes);
- for (i=0; i < attributes->num_attributes; i++) {
+ for (i = 0; i < attributes->num_attributes; i++)
+ {
ae = attributes->attributes[i];
/* ignoring the attributeSet here */
ae = attributes->attributes[i];
/* ignoring the attributeSet here */
- yaz_log(YLOG_DEBUG, "Attribute type %d", (int) *ae->attributeType);
if (*ae->attributeType == 1)
{ /* use attribute */
useattr(ae, av);
if (*ae->attributeType == 1)
{ /* use attribute */
useattr(ae, av);
@@
-195,7
+190,7
@@
void yaz_facet_attr_get_z_attributes(const Z_AttributeList *attributes,
sprintf(av->useattrbuff, ODR_INT_PRINTF,
*ae-> attributeType);
av->errstring = av->useattrbuff;
sprintf(av->useattrbuff, ODR_INT_PRINTF,
*ae-> attributeType);
av->errstring = av->useattrbuff;
- yaz_log(YLOG_DEBUG, "Unsupported attribute type %s", av->useattrbuff);
+ yaz_log(YLOG_WARN, "Unsupported attribute type %s", av->useattrbuff);
/* would like to give a better message, but the standard */
/* tells me to return the attribute type */
}
/* would like to give a better message, but the standard */
/* tells me to return the attribute type */
}