X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=9e943b184c5b75f94113f9974f9b065ce060e90c;hb=6cb032fd2ece4742e3516e0941507143f677e5cd;hp=3537873e4e0048baf9a60d208646731d01095b79;hpb=a6c6ab1a43cc3bbe1dd7f233ead8a24e8eba4b56;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 3537873..9e943b1 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,6 +1,6 @@ -/* $Id: zserver.c,v 1.124 2004-11-29 21:45:11 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: zserver.c,v 1.132 2005-05-11 12:39:37 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -20,8 +20,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include +#include +#include #include #ifdef WIN32 #include @@ -32,9 +33,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include -#include +#include #include #include +#include #include @@ -76,7 +78,7 @@ bend_initresult *bend_init (bend_initrequest *q) if (!(zh = zebra_open (sob->handle))) { yaz_log (YLOG_WARN, "Failed to read config `%s'", sob->configname); - r->errcode = 1; + r->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR; return r; } r->handle = zh; @@ -102,9 +104,9 @@ bend_initresult *bend_init (bend_initrequest *q) passwd = idPass->password; } } - if (zebra_auth (zh, user, passwd)) + if (zebra_auth(zh, user, passwd) != ZEBRA_OK) { - r->errcode = 222; + r->errcode = YAZ_BIB1_INIT_AC_BAD_USERID_AND_OR_PASSWORD; r->errstring = user; return r; } @@ -153,7 +155,8 @@ bend_initresult *bend_init (bend_initrequest *q) charsets[i], right_name); odr_set_charset (q->stream, right_name, "UTF-8"); if (selected) - zebra_record_encoding (zh, right_name); + 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); @@ -260,13 +263,12 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) int bend_search (void *handle, bend_search_rr *r) { ZebraHandle zh = (ZebraHandle) handle; + zint zhits = 0; + ZEBRA_RES res; - r->hits = 0; - r->errcode = 0; - r->errstring = NULL; - - if (zebra_select_databases (zh, r->num_bases, - (const char **) r->basenames)) + res = zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames); + if (res != ZEBRA_OK) { zebra_result (zh, &r->errcode, &r->errstring); return 0; @@ -275,18 +277,25 @@ int bend_search (void *handle, bend_search_rr *r) switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: - zebra_search_RPN (zh, r->stream, r->query->u.type_1, - r->setname, &r->hits); - zebra_result (zh, &r->errcode, &r->errstring); - if (!r->errcode) + res = zebra_search_RPN(zh, r->stream, r->query->u.type_1, + r->setname, &zhits); + if (res != ZEBRA_OK) + zebra_result(zh, &r->errcode, &r->errstring); + else + { + if (zhits > 2147483646) + r->hits = 2147483647; + else + r->hits = (int) zhits; search_terms (zh, r); + } break; case Z_Query_type_2: - r->errcode = 107; + r->errcode = YAZ_BIB1_QUERY_TYPE_UNSUPP; r->errstring = "type-2"; break; default: - r->errcode = 107; + r->errcode = YAZ_BIB1_QUERY_TYPE_UNSUPP; } return 0; } @@ -296,24 +305,28 @@ int bend_fetch (void *handle, bend_fetch_rr *r) { ZebraHandle zh = (ZebraHandle) handle; ZebraRetrievalRecord retrievalRecord; + ZEBRA_RES res; retrievalRecord.position = r->number; r->last_in_set = 0; - zebra_records_retrieve (zh, r->stream, r->setname, r->comp, + res = zebra_records_retrieve (zh, r->stream, r->setname, r->comp, r->request_format, 1, &retrievalRecord); - zebra_result (zh, &r->errcode, &r->errstring); - /* non Surrogate Diagnostic OR Surrogate Diagnostic */ - if (r->errcode == 0 && retrievalRecord.errCode) + if (res != ZEBRA_OK) + { + /* non-surrogate diagnostic */ + zebra_result (zh, &r->errcode, &r->errstring); + } + else if (retrievalRecord.errCode) { + /* surrogate diagnostic (diagnostic per record) */ r->surrogate_flag = 1; r->errcode = retrievalRecord.errCode; r->errstring = retrievalRecord.errString; r->basename = retrievalRecord.base; } - else if (r->errcode == 0) /* Database Record */ + else { - r->errcode = 0; r->basename = retrievalRecord.base; r->record = retrievalRecord.buf; r->len = retrievalRecord.len; @@ -327,34 +340,43 @@ static int bend_scan (void *handle, bend_scan_rr *r) ZebraScanEntry *entries; ZebraHandle zh = (ZebraHandle) handle; int is_partial, i; + ZEBRA_RES res; - if (zebra_select_databases (zh, r->num_bases, - (const char **) r->basenames)) + res = zebra_select_databases(zh, r->num_bases, + (const char **) r->basenames); + if (res != ZEBRA_OK) { zebra_result (zh, &r->errcode, &r->errstring); return 0; } if (r->step_size != 0 && *r->step_size != 0) { - r->errcode = 205; /* "Only zero step size supported for Scan" */ + r->errcode = YAZ_BIB1_ONLY_ZERO_STEP_SIZE_SUPPORTED_FOR_SCAN; r->errstring = 0; return 0; } r->entries = (struct scan_entry *) odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries); - zebra_scan (zh, r->stream, r->term, - r->attributeset, - &r->term_position, - &r->num_entries, &entries, &is_partial); - if (is_partial) - r->status = BEND_SCAN_PARTIAL; + res = zebra_scan(zh, r->stream, r->term, + r->attributeset, + &r->term_position, + &r->num_entries, &entries, &is_partial); + if (res == ZEBRA_OK) + { + if (is_partial) + r->status = BEND_SCAN_PARTIAL; + else + r->status = BEND_SCAN_SUCCESS; + for (i = 0; i < r->num_entries; i++) + { + r->entries[i].term = entries[i].term; + r->entries[i].occurrences = entries[i].occurrences; + } + } else - r->status = BEND_SCAN_SUCCESS; - for (i = 0; i < r->num_entries; i++) { - r->entries[i].term = entries[i].term; - r->entries[i].occurrences = entries[i].occurrences; + r->status = BEND_SCAN_PARTIAL; + zebra_result(zh, &r->errcode, &r->errstring); } - zebra_result (zh, &r->errcode, &r->errstring); return 0; } @@ -380,7 +402,7 @@ int bend_delete (void *handle, bend_delete_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; - rr->delete_status = zebra_deleleResultSet(zh, rr->function, + rr->delete_status = zebra_deleteResultSet(zh, rr->function, rr->num_setnames, rr->setnames, rr->statuses); return 0; @@ -534,7 +556,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) else { yaz_log (YLOG_WARN, "no database supplied for ES Update"); - rr->errcode = 1008; + rr->errcode = + YAZ_BIB1_ES_MISSING_MANDATORY_PARAMETER_FOR_SPECIFIED_FUNCTION_; rr->errstring = "database"; return 0; } @@ -592,7 +615,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) } if (oident && oident->value != VAL_TEXT_XML) { - rr->errcode = 224; + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "only XML update supported"; break; } @@ -615,7 +638,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) if (!action) { - rr->errcode = 224; + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "unsupported ES Update action"; break; } @@ -629,14 +653,15 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) action); if (r) { - rr->errcode = 224; + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "record exchange failed"; break; } } else { - int r = -1; + ZEBRA_RES r = ZEBRA_FAIL; switch(action) { case 1: r = zebra_insert_record( @@ -648,9 +673,10 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, 0); - if (r) + if (r == ZEBRA_FAIL) { - rr->errcode = 224; + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "insert_record failed"; } break; @@ -665,9 +691,10 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, 1); - if (r) + if (r == ZEBRA_FAIL) { - rr->errcode = 224; + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "update_record failed"; } break; @@ -681,9 +708,10 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, 0); - if (r) + if (r == ZEBRA_FAIL) { - rr->errcode = 224; + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "delete_record failed"; } break; @@ -699,7 +727,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) { yaz_log (YLOG_WARN, "Unknown Extended Service(%d)", rr->esr->taskSpecificParameters->which); - rr->errcode = 221; + rr->errcode = YAZ_BIB1_ES_EXTENDED_SERVICE_TYPE_UNSUPP; } return 0;