-/* $Id: zebrasrv.c,v 1.21 2007-10-29 09:25:41 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.h>
+#include <yaz/yaz-version.h>
#include <yaz/diagbib1.h>
-
+#include <yaz/querytowrbuf.h>
+#include <yaz/pquery.h>
#include <sys/types.h>
#include <yaz/backend.h>
se->subqueryId = term_ref_id ?
odr_strdup(r->stream, term_ref_id) : 0;
- se->fullQuery = odr_intdup(r->stream, 0);
+ se->fullQuery = odr_booldup(r->stream, 0);
se->subqueryExpression =
odr_malloc(r->stream, sizeof(Z_QueryExpression));
se->subqueryExpression->which =
se->subqueryExpression->u.term->termComment = 0;
se->subqueryInterpretation = 0;
se->subqueryRecommendation = 0;
- if (count > 2147483646)
- count = 2147483647;
- se->subqueryCount = odr_intdup(r->stream, CAST_ZINT_TO_INT(count));
+ se->subqueryCount = odr_intdup(r->stream, count);
se->subqueryWeight = 0;
se->resultsByDB = 0;
}
}
-
static int break_handler(void *client_data)
{
bend_association assoc =(bend_association) client_data;
return 0;
}
+static Z_RPNQuery *query_add_sortkeys(ODR o, Z_RPNQuery *query,
+ const char *sortKeys)
+{
+#if YAZ_VERSIONL >= 0x40200
+ /* sortkey layour: path,schema,ascending,caseSensitive,missingValue */
+ /* see cql_sortby_to_sortkeys of YAZ. */
+ char **sortspec;
+ int num_sortspec = 0;
+ int i;
+
+ if (sortKeys)
+ nmem_strsplit_blank(odr_getmem(o), sortKeys, &sortspec, &num_sortspec);
+ if (num_sortspec > 0)
+ {
+ Z_RPNQuery *nquery;
+ WRBUF w = wrbuf_alloc();
+
+ /* left operand 'd' will be replaced by original query */
+ wrbuf_puts(w, "@or d");
+ for (i = 0; i < num_sortspec; i++)
+ {
+ char **arg;
+ int num_arg;
+ int ascending = 1;
+ nmem_strsplitx(odr_getmem(o), ",", sortspec[i], &arg, &num_arg, 0);
+
+ if (num_arg > 5 || num_arg < 1)
+ {
+ yaz_log(YLOG_WARN, "Invalid sort spec '%s' num_arg=%d",
+ sortspec[i], num_arg);
+ break;
+ }
+ if (num_arg > 2 && arg[2][0])
+ ascending = atoi(arg[2]);
+
+ if (i < num_sortspec-1)
+ wrbuf_puts(w, " @or");
+ wrbuf_puts(w, " @attr 1=");
+ yaz_encode_pqf_term(w, arg[0], strlen(arg[0]));
+ wrbuf_printf(w, "@attr 7=%d %d", ascending ? 1 : 2, i);
+ }
+ nquery = p_query_rpn(o, wrbuf_cstr(w));
+ if (!nquery)
+ {
+ yaz_log(YLOG_WARN, "query_add_sortkeys: bad RPN: '%s'",
+ wrbuf_cstr(w));
+ }
+ else
+ {
+ Z_RPNStructure *s = nquery->RPNStructure;
+
+ if (s->which != Z_RPNStructure_complex)
+ {
+ yaz_log(YLOG_WARN, "query_add_sortkeys: not complex operand");
+ }
+ else
+ {
+ /* left operand 'd' is replaced by origial query */
+ s->u.complex->s1 = query->RPNStructure;
+ /* and original query points to our new or+sort things */
+ query->RPNStructure = s;
+ }
+ }
+ wrbuf_destroy(w);
+ }
+#else
+ if (sortKeys)
+ {
+ yaz_log(YLOG_WARN, "sortkeys ignored because YAZ version < 4.2.0");
+ }
+#endif
+ return query;
+}
+
int bend_search(void *handle, bend_search_rr *r)
{
ZebraHandle zh = (ZebraHandle) handle;
zint zhits = 0;
ZEBRA_RES res;
+ Z_RPNQuery *q2;
res = zebra_select_databases(zh, r->num_bases,
(const char **) r->basenames);
switch (r->query->which)
{
case Z_Query_type_1: case Z_Query_type_101:
- res = zebra_search_RPN_x(zh, r->stream, r->query->u.type_1,
+ q2 = query_add_sortkeys(r->stream, r->query->u.type_1, r->srw_sortKeys);
+ res = zebra_search_RPN_x(zh, r->stream, q2,
r->setname, &zhits,
&r->estimated_hit_count,
&r->partial_resultset);
zebra_result(zh, &r->errcode, &r->errstring);
else
{
- if (zhits > 2147483646)
- zhits = 2147483647;
- r->hits = CAST_ZINT_TO_INT(zhits);
+ r->hits = zhits;
search_terms(zh, r);
}
break;
{
r->entries[i].term = entries[i].term;
r->entries[i].display_term = entries[i].display_term;
- r->entries[i].occurrences =
- CAST_ZINT_TO_INT(entries[i].occurrences);
+ r->entries[i].occurrences = entries[i].occurrences;
}
}
else
{
ZebraHandle zh = (ZebraHandle) handle;
- yaz_log(YLOG_LOG, "function: %d", *rr->esr->function);
+ yaz_log(YLOG_LOG, "function: " ODR_INT_PRINTF, *rr->esr->function);
if (rr->esr->packageName)
yaz_log(YLOG_LOG, "packagename: %s", rr->esr->packageName);
- yaz_log(YLOG_LOG, "Waitaction: %d", *rr->esr->waitAction);
+ yaz_log(YLOG_LOG, "Waitaction: " ODR_INT_PRINTF, *rr->esr->waitAction);
if (!rr->esr->taskSpecificParameters)
{
yaz_log(YLOG_LOG, "start");
break;
default:
- yaz_log(YLOG_LOG, " unknown (%d)", *toKeep->action);
+ yaz_log(YLOG_LOG, " unknown (" ODR_INT_PRINTF ")",
+ *toKeep->action);
}
}
if (toKeep->databaseName)
char pidstr[30];
sprintf(pidstr, "%ld", (long) getpid());
- write(fd, pidstr, strlen(pidstr));
+ if (write(fd, pidstr, strlen(pidstr)) != strlen(pidstr))
+ {
+ yaz_log(YLOG_ERRNO|YLOG_FATAL, "write fail %s", pidfname);
+ exit(1);
+ }
}
}
#endif
sob->bend_start = bend_start;
sob->bend_stop = bend_stop;
#ifdef WIN32
+ strcpy(sob->service_name, "zebrasrv");
strcpy(sob->service_display_name, "Zebra Server");
#endif
statserv_setcontrol(sob);
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab