X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=4df48fe7f0d2dbdd24b4089a1270f55fb4bee916;hb=ff83da9583191588c5816189b55966a6bb057d71;hp=4456e8ecbb97fc23417b99d9e75f86878f7af3f6;hpb=6b0d7bc3eb2a61f75cf002b16944717bcc716fb1;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 4456e8e..4df48fe 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $Id: zserver.c,v 1.133 2005-05-12 10:17:07 adam Exp $ +/* $Id: zserver.c,v 1.141 2005-11-02 11:43:26 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -28,7 +28,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#else +#endif +#if HAVE_UNISTD_H #include #endif @@ -75,7 +76,7 @@ bend_initresult *bend_init (bend_initrequest *q) yaz_log (YLOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); - if (!(zh = zebra_open (sob->handle))) + if (!(zh = zebra_open (sob->handle, 0))) { yaz_log (YLOG_WARN, "Failed to read config `%s'", sob->configname); r->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR; @@ -171,18 +172,15 @@ bend_initresult *bend_init (bend_initrequest *q) return r; } -static void search_terms (ZebraHandle zh, bend_search_rr *r) +static void search_terms(ZebraHandle zh, bend_search_rr *r) { - zint count = 0; int no_terms; int i; int type = Z_Term_general; struct Z_External *ext; Z_SearchInfoReport *sr; - /* get no of terms for result set */ - no_terms = 0; /* zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0); */ - /* FIXME - Rsets don't know number of terms no more ??? */ + zebra_result_set_term_no(zh, r->setname, &no_terms); if (!no_terms) return; @@ -209,36 +207,37 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) sizeof(*sr->elements)); for (i = 0; isetname, i, - &count, &type, outbuf, &len); - */ - sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements)); - sr->elements[i]->subqueryId = 0; - sr->elements[i]->fullQuery = odr_malloc (r->stream, - sizeof(bool_t)); - *sr->elements[i]->fullQuery = 0; - sr->elements[i]->subqueryExpression = + const char *term_ref_id = 0; + + zebra_result_set_term_info(zh, r->setname, i, + &count, &approx, outbuf, &len, + &term_ref_id); + se = sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements)); + se->subqueryId = term_ref_id ? + odr_strdup(r->stream, term_ref_id) : 0; + + se->fullQuery = odr_intdup(r->stream, 0); + se->subqueryExpression = odr_malloc (r->stream, sizeof(Z_QueryExpression)); - sr->elements[i]->subqueryExpression->which = + se->subqueryExpression->which = Z_QueryExpression_term; - sr->elements[i]->subqueryExpression->u.term = + se->subqueryExpression->u.term = odr_malloc (r->stream, sizeof(Z_QueryExpressionTerm)); term = odr_malloc (r->stream, sizeof(Z_Term)); - sr->elements[i]->subqueryExpression->u.term->queryTerm = term; + se->subqueryExpression->u.term->queryTerm = term; switch (type) { case Z_Term_characterString: - yaz_log (YLOG_DEBUG, "term as characterString"); term->which = Z_Term_characterString; term->u.characterString = odr_strdup (r->stream, outbuf); break; case Z_Term_general: - yaz_log (YLOG_DEBUG, "term as general"); term->which = Z_Term_general; term->u.general = odr_malloc (r->stream, sizeof(*term->u.general)); term->u.general->size = term->u.general->len = len; @@ -249,14 +248,14 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) term->which = Z_Term_general; term->u.null = odr_nullval(); } - sr->elements[i]->subqueryExpression->u.term->termComment = 0; - sr->elements[i]->subqueryInterpretation = 0; - sr->elements[i]->subqueryRecommendation = 0; + se->subqueryExpression->u.term->termComment = 0; + se->subqueryInterpretation = 0; + se->subqueryRecommendation = 0; if (count > 2000000000) count = 2000000000; - sr->elements[i]->subqueryCount = odr_intdup (r->stream, (int) count); - sr->elements[i]->subqueryWeight = 0; - sr->elements[i]->resultsByDB = 0; + se->subqueryCount = odr_intdup(r->stream, (int) count); + se->subqueryWeight = 0; + se->resultsByDB = 0; } } @@ -311,7 +310,7 @@ int bend_fetch (void *handle, bend_fetch_rr *r) r->last_in_set = 0; res = zebra_records_retrieve (zh, r->stream, r->setname, r->comp, - r->request_format, 1, &retrievalRecord); + r->request_format, 1, &retrievalRecord); if (res != ZEBRA_OK) { /* non-surrogate diagnostic */ @@ -359,7 +358,8 @@ static int bend_scan (void *handle, bend_scan_rr *r) 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) { if (is_partial) @@ -649,9 +649,10 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) { int r = zebra_admin_exchange_record ( zh, - rec->u.octet_aligned->buf, + (const char *) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, - opaque_recid->buf, opaque_recid->len, + (const char *) opaque_recid->buf, + opaque_recid->len, action); if (r) { @@ -672,7 +673,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) &sysno, 0, /* match */ 0, /* fname */ - rec->u.octet_aligned->buf, + (const char *) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, 0); if (r == ZEBRA_FAIL) @@ -690,7 +691,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) &sysno, 0, /* match */ 0, /* fname */ - rec->u.octet_aligned->buf, + (const char *) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, 1); if (r == ZEBRA_FAIL) @@ -707,7 +708,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) &sysno, 0, /* match */ 0, /* fname */ - rec->u.octet_aligned->buf, + (const char *) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, 0); if (r == ZEBRA_FAIL)