X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrasrv.c;h=f35c05148003d4dc0b4a4bbcb11e295c2c8ca51e;hb=2de23570d27a0d5f4683e4c9ebd9c13eab2fc2a1;hp=cf3a4db86ec9a143281deb136f2aacadc83500bd;hpb=21f90a8618faec6bee8d125c12088b74db8eb8b9;p=idzebra-moved-to-github.git diff --git a/index/zebrasrv.c b/index/zebrasrv.c index cf3a4db..f35c051 100644 --- a/index/zebrasrv.c +++ b/index/zebrasrv.c @@ -1,4 +1,4 @@ -/* $Id: zebrasrv.c,v 1.12 2007-03-14 11:48:32 adam Exp $ +/* $Id: zebrasrv.c,v 1.19 2007-08-27 17:22:22 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -61,6 +61,7 @@ bend_initresult *bend_init (bend_initrequest *q) struct statserv_options_block *sob; char *user = NULL; char *passwd = NULL; + char version_str[16]; r->errcode = 0; r->errstring = 0; @@ -72,8 +73,10 @@ bend_initresult *bend_init (bend_initrequest *q) q->bend_fetch = bend_fetch; q->bend_scan = bend_scan; + zebra_get_version(version_str, 0); + q->implementation_name = "Zebra Information Server"; - q->implementation_version = "Zebra " ZEBRAVER; + q->implementation_version = odr_strdup(q->stream, version_str); yaz_log (YLOG_DEBUG, "bend_init"); @@ -85,6 +88,8 @@ bend_initresult *bend_init (bend_initrequest *q) return r; } r->handle = zh; + + q->query_charset = odr_strdup(q->stream, zebra_get_encoding(zh)); if (q->auth) { if (q->auth->which == Z_IdAuthentication_open) @@ -113,7 +118,7 @@ bend_initresult *bend_init (bend_initrequest *q) r->errstring = user; return r; } - if (q->charneg_request) /* characater set and langauge negotiation? */ + if (q->charneg_request) /* characater set and language negotiation? */ { char **charsets = 0; int num_charsets; @@ -123,11 +128,9 @@ bend_initresult *bend_init (bend_initrequest *q) int i; NMEM nmem = nmem_create(); - yaz_log (YLOG_LOG, "character set and language negotiation"); - - 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++) { @@ -152,21 +155,21 @@ bend_initresult *bend_init (bend_initrequest *q) } else { right_name = charsets[i]; } - if (odr_set_charset (q->decode, "UTF-8", right_name) == 0) + if (odr_set_charset(q->decode, "UTF-8", right_name) == 0) { - yaz_log (YLOG_LOG, "charset %d %s (proper name %s): OK", i, - charsets[i], right_name); - odr_set_charset (q->stream, right_name, "UTF-8"); + yaz_log(YLOG_LOG, "charset %d %s (proper name %s): OK", i, + charsets[i], right_name); + odr_set_charset(q->stream, right_name, "UTF-8"); if (selected) zebra_record_encoding(zh, right_name); zebra_octet_term_encoding(zh, right_name); q->charneg_response = - yaz_set_response_charneg (q->stream, charsets[i], - 0, selected); + yaz_set_response_charneg(q->stream, charsets[i], + 0, selected); break; } else { - yaz_log (YLOG_LOG, "charset %d %s (proper name %s): unsupported", i, - charsets[i], right_name); + yaz_log(YLOG_LOG, "charset %d %s (proper name %s): unsupported", i, + charsets[i], right_name); } } nmem_destroy(nmem); @@ -197,8 +200,8 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r) r->search_info->list[0]->which = Z_OtherInfo_externallyDefinedInfo; ext = odr_malloc (r->stream, sizeof(*ext)); r->search_info->list[0]->information.externallyDefinedInfo = ext; - ext->direct_reference = - yaz_oidval_to_z3950oid (r->stream, CLASS_USERINFO, VAL_SEARCHRES1); + ext->direct_reference = odr_oiddup(r->stream, + yaz_oid_userinfo_searchresult_1); ext->indirect_reference = 0; ext->descriptor = 0; ext->which = Z_External_searchResult1; @@ -314,7 +317,7 @@ int bend_search(void *handle, bend_search_rr *r) } -int bend_fetch (void *handle, bend_fetch_rr *r) +int bend_fetch(void *handle, bend_fetch_rr *r) { ZebraHandle zh = (ZebraHandle) handle; ZebraRetrievalRecord retrievalRecord; @@ -343,7 +346,7 @@ int bend_fetch (void *handle, bend_fetch_rr *r) r->basename = retrievalRecord.base; r->record = retrievalRecord.buf; r->len = retrievalRecord.len; - r->output_format = retrievalRecord.format; + r->output_format = odr_oiddup(r->stream, retrievalRecord.format); } return 0; } @@ -367,8 +370,6 @@ static int bend_scan (void *handle, bend_scan_rr *r) r->errstring = 0; return 0; } - r->entries = (struct scan_entry *) - odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries); res = zebra_scan(zh, r->stream, r->term, r->attributeset, &r->term_position, @@ -383,6 +384,7 @@ static int bend_scan (void *handle, bend_scan_rr *r) for (i = 0; i < r->num_entries; i++) { 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); } @@ -399,7 +401,6 @@ void bend_close (void *handle) { zebra_close ((ZebraHandle) handle); xmalloc_trav("bend_close"); - nmem_print_list(); } int bend_sort (void *handle, bend_sort_rr *rr) @@ -596,7 +597,6 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) for (i = 0; notToKeep && i < notToKeep->num; i++) { Z_External *rec = notToKeep->elements[i]->record; - struct oident *oident = 0; Odr_oct *opaque_recid = 0; zint *sysno = 0; zint sysno_tmp; @@ -616,10 +616,14 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) } if (rec->direct_reference) { - oident = oid_getentbyoid(rec->direct_reference); - if (oident) + char oid_name_str[OID_STR_MAX]; + const char *oid_name = + yaz_oid_to_string_buf( + rec->direct_reference, + 0, oid_name_str); + if (oid_name) yaz_log (YLOG_LOG, "record %d type %s", i, - oident->desc); + oid_name); } switch (rec->which) { @@ -643,13 +647,6 @@ 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 - && oident->value != VAL_SUTRS) - { - rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; - rr->errstring = "only XML update supported"; - break; - } if (rec->which == Z_External_octet) { enum zebra_recctrl_action_t action = action_update;