/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
-
/** \file
* \brief yaz-ztest Generic Frontend Server
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
-#include <ctype.h>
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#include <yaz/ill.h>
#include <yaz/diagbib1.h>
#include <yaz/otherinfo.h>
+#include <yaz/facet.h>
#include "ztest.h"
Sleep( (DWORD) (d * 1000));
#else
struct timeval tv;
- tv.tv_sec = floor(d);
- tv.tv_usec = (d - floor(d)) * 1000000;
+ tv.tv_sec = d;
+ tv.tv_usec = (d - (long) d) * 1000000;
select(0, 0, 0, 0, &tv);
#endif
}
}
}
-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);
-
- return facet_list;
-}
-
-Z_Term *term_new(ODR odr, const char *cstr) {
- Z_Term *term = odr_malloc(odr, sizeof(*term));
- term->which = Z_Term_characterString;
- term->u.characterString = odr_strdup(odr, cstr);
- return term;
-}
-
-static void addterms(ODR odr, Z_FacetField *facet_field) {
+static void addterms(ODR odr, Z_FacetField *facet_field, const char *facet_name)
+{
int index;
- int count = 100;
- facet_field->num_terms = 3;
- facet_field->terms = odr_malloc(odr, facet_field->num_terms * sizeof(*facet_field->terms));
- for (index = 0; index < facet_field->num_terms; index++) {
- Z_FacetTerm *facet_term = odr_malloc(odr, sizeof(*facet_term));
- facet_term->count = odr_malloc(odr, sizeof(*facet_term->count));
- *facet_term->count = count;
- facet_term->term = term_new(odr, "key");
- count = count - 10 ;
- facet_field->terms[index] = facet_term;
+ int freq = 100;
+ int length = strlen(facet_name) + 10;
+ char *key = odr_malloc(odr, length);
+ key[0] = '\0';
+ for (index = 0; index < facet_field->num_terms; index++)
+ {
+ Z_FacetTerm *facet_term;
+ sprintf(key, "%s%d", facet_name, index);
+ yaz_log(YLOG_DEBUG, "facet add term %s %d %s", facet_name, index, key);
+
+ facet_term = facet_term_create_cstr(odr, key, freq);
+ freq = freq - 10 ;
+ facet_field_term_set(odr, facet_field, facet_term, index);
}
}
+
Z_OtherInformation *build_facet_response(ODR odr, Z_FacetList *facet_list) {
- int index;
- Z_OtherInformation *oi = odr_malloc(odr, sizeof(*oi));
- Z_OtherInformationUnit *oiu = odr_malloc(odr, sizeof(*oiu));
+ int index, new_index = 0;
+ Z_FacetList *new_list = facet_list_create(odr, facet_list->num);
+
for (index = 0; index < facet_list->num; index++) {
- addterms(odr, facet_list->elements[index]);
+ struct yaz_facet_attr attrvalues;
+ yaz_facet_attr_init(&attrvalues);
+ attrvalues.limit = 10;
+ yaz_facet_attr_get_z_attributes(facet_list->elements[index]->attributes,
+ &attrvalues);
+ yaz_log(YLOG_LOG, "Attributes: %s %d ", attrvalues.useattr, attrvalues.limit);
+ if (attrvalues.errstring)
+ yaz_log(YLOG_LOG, "Error parsing attributes: %s", attrvalues.errstring);
+ if (attrvalues.limit > 0 && attrvalues.useattr) {
+ new_list->elements[new_index] = facet_field_create(odr, facet_list->elements[index]->attributes, attrvalues.limit);
+ addterms(odr, new_list->elements[new_index], attrvalues.useattr);
+ new_index++;
+ }
+ else {
+ yaz_log(YLOG_DEBUG, "Facet: skipping %s due to 0 limit.", attrvalues.useattr);
+ }
+
+ }
+ new_list->num = new_index;
+ if (new_index > 0) {
+ Z_OtherInformation *oi = odr_malloc(odr, sizeof(*oi));
+ Z_OtherInformationUnit *oiu = odr_malloc(odr, sizeof(*oiu));
+ oi->num_elements = 1;
+ oi->list = odr_malloc(odr, oi->num_elements * sizeof(*oi->list));
+ oiu->category = 0;
+ oiu->which = Z_OtherInfo_externallyDefinedInfo;
+ oiu->information.externallyDefinedInfo = odr_malloc(odr, sizeof(*oiu->information.externallyDefinedInfo));
+ oiu->information.externallyDefinedInfo->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1);
+ oiu->information.externallyDefinedInfo->descriptor = 0;
+ oiu->information.externallyDefinedInfo->indirect_reference = 0;
+ oiu->information.externallyDefinedInfo->which = Z_External_userFacets;
+ oiu->information.externallyDefinedInfo->u.facetList = new_list;
+ oi->list[0] = oiu;
+ return oi;
}
- oi->list = odr_malloc(odr, sizeof(*oi->list));
- oiu->category = 0;
- oiu->which = Z_OtherInfo_externallyDefinedInfo;
- oiu->information.externallyDefinedInfo = odr_malloc(odr, sizeof(*oiu->information.externallyDefinedInfo));
- oiu->information.externallyDefinedInfo->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1);
-
- oiu->information.externallyDefinedInfo->u.facetList = facet_list;
- oi->list[0] = oiu;
- return oi;
+ return 0;
}
int ztest_search(void *handle, bend_search_rr *rr)
if (1)
{
- /* TODO Not general. Only handles one (Facet) OtherInformation. Overwrite */
- Z_FacetList *facet_list = extract_facet_request(rr->stream, rr->search_input);
+ Z_FacetList *facet_list = yaz_oi_get_facetlist(&rr->search_input);
if (facet_list) {
+ yaz_log(YLOG_LOG, "%d Facets in search request.", facet_list->num);
rr->search_info = build_facet_response(rr->stream, facet_list);
}
+ else
+ yaz_log(YLOG_DEBUG, "No facets parsed search request.");
+
}
do_delay(&new_set->search_delay);
new_set->hits = rr->hits;
strcpy(term, "0");
for (p = term; *p; p++)
- if (islower(*(unsigned char *) p))
- *p = toupper(*p);
+ if (yaz_islower(*p))
+ *p = yaz_toupper(*p);
fseek(f, 0, SEEK_SET);
q->num_entries = 0;