X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrasrv.c;h=234fae042e703ef6f6d623dcf740302388b676b1;hb=e1352999e1be86b0ce5c2698bb62f9fc7d598a4f;hp=613febbd3f425d33b1b9b2b16bc5423356ebce1f;hpb=4c112f15503aebed494fab8aa5296c3661bfb31c;p=idzebra-moved-to-github.git diff --git a/index/zebrasrv.c b/index/zebrasrv.c index 613febb..234fae0 100644 --- a/index/zebrasrv.c +++ b/index/zebrasrv.c @@ -1,5 +1,5 @@ -/* $Id: zebrasrv.c,v 1.3 2006-12-05 09:26:37 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: zebrasrv.c,v 1.6 2007-01-16 15:01:15 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -278,8 +278,10 @@ int bend_search(void *handle, bend_search_rr *r) switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: - res = zebra_search_RPN(zh, r->stream, r->query->u.type_1, - r->setname, &zhits); + res = zebra_search_RPN_x(zh, r->stream, r->query->u.type_1, + r->setname, &zhits, + &r->estimated_hit_count, + &r->partial_resultset); if (res != ZEBRA_OK) zebra_result(zh, &r->errcode, &r->errstring); else @@ -630,7 +632,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.octet_aligned->len, rec->u.octet_aligned->buf); } - if (oident && oident->value != VAL_TEXT_XML) + if (oident && oident->value != VAL_TEXT_XML + && oident->value != VAL_SUTRS) { rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "only XML update supported";