/* Little helper to extract a string attribute */
/* Gets the first string, there is usually only one */
/* in case of errors, returns null */
+
+void facet_struct_init(struct attrvalues *attr_values) {
+ attr_values->errcode = 0;
+ attr_values->errstring = 0;
+ attr_values->relation = 0;
+ attr_values->useattr = 0;
+ attr_values->useattrbuff[0] = 0;
+ attr_values->limit = 0;
+}
+
const char *stringattr( Z_ComplexAttribute *c ) {
int i;
Z_StringOrNumeric *son;
const char *s;
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)
av->useattr = s;
/* TODO - check numeric first, then value! */
if ( ae->which == Z_AttributeValue_numeric ) {
av->limit = *ae->value.numeric;
+ yaz_log(YLOG_DEBUG, "limitattr %d ", av->limit);
} else {
av->errcode = YAZ_BIB1_UNSUPP_ATTRIBUTE;
av->errstring = "non-numeric limit attribute";
{
int i;
Z_AttributeElement *ae;
+ yaz_log(YLOG_DEBUG, "Attribute num attributes: %d", attributes->num_attributes);
for ( i=0; i < attributes->num_attributes; i++ ) {
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);
} else if ( *ae->attributeType == 2 ) { /* sortorder */
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_DEBUG, "Unsupported attribute type %s", av->useattrbuff);
/* would like to give a better message, but the standard */
/* tells me to return the attribute type */
}
Z_FacetList *extract_facet_request(ODR odr, Z_OtherInformation *search_input) {
- Z_OtherInformation **oi;
- Z_FacetList *facet_list = yaz_oi_get_facetlist_oid(oi, odr, yaz_oid_userinfo_facet_1, 1, 0);
-
+ Z_FacetList *facet_list = yaz_oi_get_facetlist_oid(&search_input, odr, yaz_oid_userinfo_facet_1, 1, 0);
return facet_list;
}
Z_FacetTerm* facet_term_create(ODR odr, Z_Term *term, int freq) {
Z_FacetTerm *facet_term = odr_malloc(odr, sizeof(*facet_term));
facet_term->count = odr_malloc(odr, sizeof(*facet_term->count));
+ facet_term->term = term;
*facet_term->count = freq;
return facet_term;
}