}
static Z_AttributeList *yaz_solr_use_atttribute_create(ODR o, const char *name) {
- // TODO IMPLEMENT
- return 0;
+ Z_AttributeList *attributes= (Z_AttributeList *) odr_malloc(o, sizeof(*attributes));
+ Z_AttributeElement ** elements;
+ attributes->num_attributes = 1;
+ /* TODO check on name instead
+ if (!attributes->num_attributes) {
+ attributes->attributes = (Z_AttributeElement**)odr_nullval();
+ return attributes;
+ }
+ */
+ elements = (Z_AttributeElement**) odr_malloc (o, attributes->num_attributes * sizeof(*elements));
+ elements[0] = (Z_AttributeElement*)odr_malloc(o,sizeof(**elements));
+ elements[0]->attributeType = odr_malloc(o, sizeof(*elements[0]->attributeType));
+ *elements[0]->attributeType = 1;
+ elements[0]->attributeSet = odr_nullval();
+ elements[0]->which = Z_AttributeValue_complex;
+ elements[0]->value.complex = (Z_ComplexAttribute *) odr_malloc(o, sizeof(Z_ComplexAttribute));
+ elements[0]->value.complex->num_list = 1;
+ elements[0]->value.complex->list = (Z_StringOrNumeric **) odr_malloc(o, 1 * sizeof(Z_StringOrNumeric *));
+ elements[0]->value.complex->list[0] = (Z_StringOrNumeric *) odr_malloc(o, sizeof(Z_StringOrNumeric));
+ elements[0]->value.complex->list[0]->which = Z_StringOrNumeric_string;
+ elements[0]->value.complex->list[0]->u.string = (Z_InternationalString *) odr_strdup(o, name);
+ elements[0]->value.complex->semanticAction = 0;
+ elements[0]->value.complex->num_semanticAction = 0;
+ attributes->attributes = elements;
+ return attributes;
}
{
// USE attribute
const char* name = xml_node_attribute_value_get(ptr, "lst", "name");
+ char *pos = strstr(name, "_exact");
+ /* HACK */
+ if (pos) {
+ pos[0] = 0;
+ }
Z_AttributeList *list = yaz_solr_use_atttribute_create(o, name);
Z_FacetField *facet_field;
int num_terms = 0;
yaz_facet_attr_get_z_attributes(attribute_list, &attr_values);
// TODO do we want to support server decided
if (!attr_values.errcode && attr_values.useattr) {
- yaz_add_name_value_str(encode, name, value, i, "facet.field", (char *) attr_values.useattr);
- // TODO max(attr_values, *limit);
- if (attr_values.limit > 0 && attr_values.limit > *limit) {
- *limit = attr_values.limit;
+ WRBUF wrbuf = wrbuf_alloc();
+ wrbuf_puts(wrbuf, (char *) attr_values.useattr);
+ /* Skip date field */
+ if (strcmp("date", attr_values.useattr) != 0)
+ wrbuf_puts(wrbuf, "_exact");
+ yaz_add_name_value_str(encode, name, value, i, "facet.field", odr_strdup(encode, wrbuf_cstr(wrbuf)));
+ if (attr_values.limit > 0) {
+ WRBUF wrbuf2 = wrbuf_alloc();
+ wrbuf_puts(wrbuf2, "f.");
+ wrbuf_puts(wrbuf2, wrbuf_cstr(wrbuf));
+ wrbuf_puts(wrbuf2, ".facet.limit");
+ Odr_int olimit = attr_values.limit;
+ yaz_add_name_value_int(encode, name, value, i, odr_strdup(encode, wrbuf_cstr(wrbuf2)), &olimit);
+ wrbuf_destroy(wrbuf2);
}
+ wrbuf_destroy(wrbuf);
}
}
if (request->facetList) {
Z_FacetList *facet_list = request->facetList;
- int limit;
+ int limit = 0;
Odr_int olimit;
yaz_add_name_value_str(encode, name, value, &i, "facet", "true");
yaz_solr_encode_facet_list(encode, name, value, &i, facet_list, &limit);
+ /*
olimit = limit;
yaz_add_name_value_int(encode, name, value, &i, "facet.limit", &olimit);
+ */
}
break;