projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat: delete trailing whitespace
[idzebra-moved-to-github.git]
/
index
/
zebrasrv.c
diff --git
a/index/zebrasrv.c
b/index/zebrasrv.c
index
7ef4cd2
..
182f265
100644
(file)
--- a/
index/zebrasrv.c
+++ b/
index/zebrasrv.c
@@
-37,6
+37,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/log.h>
#include <yaz/ill.h>
#include <yaz/yaz-util.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 <yaz/diagbib1.h>
#include <yaz/querytowrbuf.h>
#include <yaz/pquery.h>
@@
-132,7
+133,7
@@
bend_initresult *bend_init(bend_initrequest *q)
yaz_get_proposal_charneg(nmem, q->charneg_request,
&charsets, &num_charsets,
&langs, &num_langs, &selected);
yaz_get_proposal_charneg(nmem, q->charneg_request,
&charsets, &num_charsets,
&langs, &num_langs, &selected);
-
+
for (i = 0; i < num_charsets; i++)
{
const char *right_name = "";
for (i = 0; i < num_charsets; i++)
{
const char *right_name = "";
@@
-142,7
+143,7
@@
bend_initresult *bend_init(bend_initrequest *q)
* because a lot servers in Russia to use own in during
* character set and language negotiation still.
*/
* because a lot servers in Russia to use own in during
* character set and language negotiation still.
*/
-
+
if (!yaz_matchstr(charsets[i], "win")) {
right_name = "WINDOWS-1251";
} else if (!yaz_matchstr(charsets[i], "koi")) {
if (!yaz_matchstr(charsets[i], "win")) {
right_name = "WINDOWS-1251";
} else if (!yaz_matchstr(charsets[i], "koi")) {
@@
-225,13
+226,13
@@
static void search_terms(ZebraHandle zh, bend_search_rr *r)
&count, &approx, outbuf, &len,
&term_ref_id);
se = sr->elements[i] = odr_malloc(r->stream, sizeof(**sr->elements));
&count, &approx, outbuf, &len,
&term_ref_id);
se = sr->elements[i] = odr_malloc(r->stream, sizeof(**sr->elements));
- se->subqueryId = term_ref_id ?
+ se->subqueryId = term_ref_id ?
odr_strdup(r->stream, term_ref_id) : 0;
odr_strdup(r->stream, term_ref_id) : 0;
-
+
se->fullQuery = odr_booldup(r->stream, 0);
se->fullQuery = odr_booldup(r->stream, 0);
- se->subqueryExpression =
+ se->subqueryExpression =
odr_malloc(r->stream, sizeof(Z_QueryExpression));
odr_malloc(r->stream, sizeof(Z_QueryExpression));
- se->subqueryExpression->which =
+ se->subqueryExpression->which =
Z_QueryExpression_term;
se->subqueryExpression->u.term =
odr_malloc(r->stream, sizeof(Z_QueryExpressionTerm));
Z_QueryExpression_term;
se->subqueryExpression->u.term =
odr_malloc(r->stream, sizeof(Z_QueryExpressionTerm));
@@
-265,7
+266,7
@@
static void search_terms(ZebraHandle zh, bend_search_rr *r)
static int break_handler(void *client_data)
{
static int break_handler(void *client_data)
{
- bend_association assoc =(bend_association) client_data;
+ bend_association assoc =(bend_association) client_data;
if (!bend_assoc_is_alive(assoc))
return 1;
return 0;
if (!bend_assoc_is_alive(assoc))
return 1;
return 0;
@@
-274,6
+275,7
@@
static int break_handler(void *client_data)
static Z_RPNQuery *query_add_sortkeys(ODR o, Z_RPNQuery *query,
const char *sortKeys)
{
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;
/* sortkey layour: path,schema,ascending,caseSensitive,missingValue */
/* see cql_sortby_to_sortkeys of YAZ. */
char **sortspec;
@@
-295,16
+297,16
@@
static Z_RPNQuery *query_add_sortkeys(ODR o, Z_RPNQuery *query,
int num_arg;
int ascending = 1;
nmem_strsplitx(odr_getmem(o), ",", sortspec[i], &arg, &num_arg, 0);
int num_arg;
int ascending = 1;
nmem_strsplitx(odr_getmem(o), ",", sortspec[i], &arg, &num_arg, 0);
-
- if (num_arg != 5)
+
+ if (num_arg > 5 || num_arg < 1)
{
yaz_log(YLOG_WARN, "Invalid sort spec '%s' num_arg=%d",
sortspec[i], num_arg);
break;
}
{
yaz_log(YLOG_WARN, "Invalid sort spec '%s' num_arg=%d",
sortspec[i], num_arg);
break;
}
- if (arg[2][0])
+ if (num_arg > 2 && arg[2][0])
ascending = atoi(arg[2]);
ascending = atoi(arg[2]);
-
+
if (i < num_sortspec-1)
wrbuf_puts(w, " @or");
wrbuf_puts(w, " @attr 1=");
if (i < num_sortspec-1)
wrbuf_puts(w, " @or");
wrbuf_puts(w, " @attr 1=");
@@
-320,7
+322,7
@@
static Z_RPNQuery *query_add_sortkeys(ODR o, Z_RPNQuery *query,
else
{
Z_RPNStructure *s = nquery->RPNStructure;
else
{
Z_RPNStructure *s = nquery->RPNStructure;
-
+
if (s->which != Z_RPNStructure_complex)
{
yaz_log(YLOG_WARN, "query_add_sortkeys: not complex operand");
if (s->which != Z_RPNStructure_complex)
{
yaz_log(YLOG_WARN, "query_add_sortkeys: not complex operand");
@@
-335,6
+337,12
@@
static Z_RPNQuery *query_add_sortkeys(ODR o, Z_RPNQuery *query,
}
wrbuf_destroy(w);
}
}
wrbuf_destroy(w);
}
+#else
+ if (sortKeys)
+ {
+ yaz_log(YLOG_WARN, "sortkeys ignored because YAZ version < 4.2.0");
+ }
+#endif
return query;
}
return query;
}
@@
-389,7
+397,7
@@
int bend_fetch(void *handle, bend_fetch_rr *r)
ZEBRA_RES res;
retrievalRecord.position = r->number;
ZEBRA_RES res;
retrievalRecord.position = r->number;
-
+
r->last_in_set = 0;
res = zebra_records_retrieve(zh, r->stream, r->setname, r->comp,
r->request_format, 1, &retrievalRecord);
r->last_in_set = 0;
res = zebra_records_retrieve(zh, r->stream, r->setname, r->comp,
r->request_format, 1, &retrievalRecord);
@@
-423,7
+431,7
@@
static int bend_scan(void *handle, bend_scan_rr *r)
int is_partial, i;
ZEBRA_RES res;
int is_partial, i;
ZEBRA_RES res;
- res = zebra_select_databases(zh, r->num_bases,
+ res = zebra_select_databases(zh, r->num_bases,
(const char **) r->basenames);
if (res != ZEBRA_OK)
{
(const char **) r->basenames);
if (res != ZEBRA_OK)
{
@@
-438,7
+446,7
@@
static int bend_scan(void *handle, bend_scan_rr *r)
res = zebra_scan(zh, r->stream, r->term,
r->attributeset,
&r->term_position,
res = zebra_scan(zh, r->stream, r->term,
r->attributeset,
&r->term_position,
- &r->num_entries, &entries, &is_partial,
+ &r->num_entries, &entries, &is_partial,
0 /* setname */);
if (res == ZEBRA_OK)
{
0 /* setname */);
if (res == ZEBRA_OK)
{
@@
-582,7
+590,7
@@
int bend_segment(void *handle, bend_segment_rr *rr)
int bend_esrequest(void *handle, bend_esrequest_rr *rr)
{
ZebraHandle zh = (ZebraHandle) handle;
int bend_esrequest(void *handle, bend_esrequest_rr *rr)
{
ZebraHandle zh = (ZebraHandle) handle;
-
+
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, "function: " ODR_INT_PRINTF, *rr->esr->function);
if (rr->esr->packageName)
yaz_log(YLOG_LOG, "packagename: %s", rr->esr->packageName);
@@
-605,7
+613,7
@@
int bend_esrequest(void *handle, bend_esrequest_rr *rr)
Z_IUUpdateEsRequest *esRequest = up->u.esRequest;
Z_IUOriginPartToKeep *toKeep = esRequest->toKeep;
Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep;
Z_IUUpdateEsRequest *esRequest = up->u.esRequest;
Z_IUOriginPartToKeep *toKeep = esRequest->toKeep;
Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep;
-
+
yaz_log(YLOG_LOG, "action");
if (toKeep->action)
{
yaz_log(YLOG_LOG, "action");
if (toKeep->action)
{
@@
-738,7
+746,7
@@
int bend_esrequest(void *handle, bend_esrequest_rr *rr)
rr->errstring = "unsupported ES Update action";
break;
}
rr->errstring = "unsupported ES Update action";
break;
}
-
+
if (opaque_recid)
{
size_t l = opaque_recid->len;
if (opaque_recid)
{
size_t l = opaque_recid->len;
@@
-779,7
+787,7
@@
int bend_esrequest(void *handle, bend_esrequest_rr *rr)
yaz_log(YLOG_WARN, "Unknown Extended Service(%d)",
rr->esr->taskSpecificParameters->which);
rr->errcode = YAZ_BIB1_ES_EXTENDED_SERVICE_TYPE_UNSUPP;
yaz_log(YLOG_WARN, "Unknown Extended Service(%d)",
rr->esr->taskSpecificParameters->which);
rr->errcode = YAZ_BIB1_ES_EXTENDED_SERVICE_TYPE_UNSUPP;
-
+
}
return 0;
}
}
return 0;
}
@@
-800,9
+808,9
@@
static void bend_start(struct statserv_options_block *sob)
exit(1);
}
#ifdef WIN32
exit(1);
}
#ifdef WIN32
-
+
#else
#else
- if (!sob->inetd && !sob->background)
+ if (!sob->inetd && !sob->background)
{
char pidfname[4096];
struct flock area;
{
char pidfname[4096];
struct flock area;
@@
-836,7
+844,7
@@
static void bend_start(struct statserv_options_block *sob)
else
{
char pidstr[30];
else
{
char pidstr[30];
-
+
sprintf(pidstr, "%ld", (long) getpid());
if (write(fd, pidstr, strlen(pidstr)) != strlen(pidstr))
{
sprintf(pidstr, "%ld", (long) getpid());
if (write(fd, pidstr, strlen(pidstr)) != strlen(pidstr))
{
@@
-853,7
+861,7
@@
static void bend_stop(struct statserv_options_block *sob)
#ifdef WIN32
#else
#ifdef WIN32
#else
- if (!sob->inetd && !sob->background && sob->handle)
+ if (!sob->inetd && !sob->background && sob->handle)
{
char pidfname[4096];
zebra_pidfname(sob->handle, pidfname);
{
char pidfname[4096];
zebra_pidfname(sob->handle, pidfname);