/* 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>
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
}
}
}
-static void addterms(ODR odr, Z_FacetField *facet_field, const char *facet_name) {
+static void addterms(ODR odr, Z_FacetField *facet_field, const char *facet_name)
+{
int index;
int freq = 100;
int length = strlen(facet_name) + 10;
- char key[length];
+ char *key = odr_malloc(odr, length);
key[0] = '\0';
- for (index = 0; index < facet_field->num_terms; index++) {
- Z_Term *term;
+ 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);
- term = term_create(odr, key);
- facet_term = facet_term_create(odr, term, freq);
+
+ facet_term = facet_term_create_cstr(odr, key, freq);
freq = freq - 10 ;
facet_field_term_set(odr, facet_field, facet_term, index);
}
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);
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;