X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=ceeb56f684d417faad174494389fc89f1b12b774;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=4df48fe7f0d2dbdd24b4089a1270f55fb4bee916;hpb=ff83da9583191588c5816189b55966a6bb057d71;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 4df48fe..ceeb56f 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,5 +1,5 @@ -/* $Id: zserver.c,v 1.141 2005-11-02 11:43:26 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: zserver.c,v 1.149 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include @@ -251,15 +251,15 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r) se->subqueryExpression->u.term->termComment = 0; se->subqueryInterpretation = 0; se->subqueryRecommendation = 0; - if (count > 2000000000) - count = 2000000000; - se->subqueryCount = odr_intdup(r->stream, (int) count); + if (count > 2147483646) + count = 2147483647; + se->subqueryCount = odr_intdup(r->stream, CAST_ZINT_TO_INT(count)); se->subqueryWeight = 0; se->resultsByDB = 0; } } -int bend_search (void *handle, bend_search_rr *r) +int bend_search(void *handle, bend_search_rr *r) { ZebraHandle zh = (ZebraHandle) handle; zint zhits = 0; @@ -282,10 +282,9 @@ int bend_search (void *handle, bend_search_rr *r) zebra_result(zh, &r->errcode, &r->errstring); else { - if (zhits > 2147483646) - r->hits = 2147483647; - else - r->hits = (int) zhits; + if (zhits > 2147483646) + zhits = 2147483647; + r->hits = CAST_ZINT_TO_INT(zhits); search_terms (zh, r); } break; @@ -369,7 +368,8 @@ 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].occurrences = entries[i].occurrences; + r->entries[i].occurrences = + CAST_ZINT_TO_INT(entries[i].occurrences); } } else @@ -391,10 +391,11 @@ int bend_sort (void *handle, bend_sort_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; - zebra_sort (zh, rr->stream, - rr->num_input_setnames, (const char **) rr->input_setnames, - rr->output_setname, rr->sort_sequence, &rr->sort_status); - zebra_result (zh, &rr->errcode, &rr->errstring); + if (zebra_sort (zh, rr->stream, + rr->num_input_setnames, (const char **) rr->input_setnames, + rr->output_setname, rr->sort_sequence, &rr->sort_status) + != ZEBRA_OK) + zebra_result (zh, &rr->errcode, &rr->errstring); return 0; } @@ -408,8 +409,9 @@ int bend_delete (void *handle, bend_delete_rr *rr) return 0; } -static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) +static void es_admin_request (bend_esrequest_rr *rr, ZebraHandle zh, Z_AdminEsRequest *r) { + ZEBRA_RES res = ZEBRA_OK; if (r->toKeep->databaseName) { yaz_log(YLOG_LOG, "adm request database %s", r->toKeep->databaseName); @@ -418,22 +420,26 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) { case Z_ESAdminOriginPartToKeep_reIndex: yaz_log(YLOG_LOG, "adm-reindex"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-reindex not implemented yet"; break; case Z_ESAdminOriginPartToKeep_truncate: + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-reindex not implemented yet"; yaz_log(YLOG_LOG, "adm-truncate"); break; case Z_ESAdminOriginPartToKeep_drop: yaz_log(YLOG_LOG, "adm-drop"); - zebra_drop_database (zh, r->toKeep->databaseName); + res = zebra_drop_database (zh, r->toKeep->databaseName); break; case Z_ESAdminOriginPartToKeep_create: yaz_log(YLOG_LOG, "adm-create %s", r->toKeep->databaseName); - zebra_create_database (zh, r->toKeep->databaseName); + res = zebra_create_database (zh, r->toKeep->databaseName); break; case Z_ESAdminOriginPartToKeep_import: yaz_log(YLOG_LOG, "adm-import"); - zebra_admin_import_begin (zh, r->toKeep->databaseName, - r->toKeep->u.import->recordType); + res = zebra_admin_import_begin (zh, r->toKeep->databaseName, + r->toKeep->u.import->recordType); break; case Z_ESAdminOriginPartToKeep_refresh: yaz_log(YLOG_LOG, "adm-refresh"); @@ -441,12 +447,17 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) case Z_ESAdminOriginPartToKeep_commit: yaz_log(YLOG_LOG, "adm-commit"); if (r->toKeep->databaseName) - zebra_select_database(zh, r->toKeep->databaseName); + { + if (zebra_select_database(zh, r->toKeep->databaseName) != + ZEBRA_OK) + yaz_log(YLOG_WARN, "zebra_select_database failed in " + "adm-commit"); + } zebra_commit(zh); break; case Z_ESAdminOriginPartToKeep_shutdown: yaz_log(YLOG_LOG, "shutdown"); - zebra_admin_shutdown(zh); + res = zebra_admin_shutdown(zh); break; case Z_ESAdminOriginPartToKeep_start: yaz_log(YLOG_LOG, "start"); @@ -454,24 +465,26 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) break; default: yaz_log(YLOG_LOG, "unknown admin"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-reindex not implemented yet"; } - return 0; + if (res != ZEBRA_OK) + zebra_result(zh, &rr->errcode, &rr->errstring); } -static int es_admin (ZebraHandle zh, Z_Admin *r) +static void es_admin (bend_esrequest_rr *rr, ZebraHandle zh, Z_Admin *r) { switch (r->which) { case Z_Admin_esRequest: - es_admin_request (zh, r->u.esRequest); - break; - case Z_Admin_taskPackage: - yaz_log (YLOG_LOG, "adm taskpackage (unhandled)"); - break; + es_admin_request (rr, zh, r->u.esRequest); + return; default: break; } - return 0; + yaz_log (YLOG_WARN, "adm taskpackage (unhandled)"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-task package (unhandled)"; } int bend_segment (void *handle, bend_segment_rr *rr) @@ -501,9 +514,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) } else if (rr->esr->taskSpecificParameters->which == Z_External_ESAdmin) { - es_admin (zh, rr->esr->taskSpecificParameters->u.adminService); - - zebra_result (zh, &rr->errcode, &rr->errstring); + es_admin(rr, zh, rr->esr->taskSpecificParameters->u.adminService); } else if (rr->esr->taskSpecificParameters->which == Z_External_update) { @@ -572,7 +583,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) Z_External *rec = notToKeep->elements[i]->record; struct oident *oident = 0; Odr_oct *opaque_recid = 0; - SYSNO sysno = 0; + SYSNO *sysno = 0; + SYSNO sysno_tmp; if (notToKeep->elements[i]->u.opaque) { @@ -582,7 +594,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) opaque_recid = notToKeep->elements[i]->u.opaque; break; /* OK, recid already set */ case Z_IUSuppliedRecords_elem_number: - sysno = *notToKeep->elements[i]->u.number; + sysno_tmp = *notToKeep->elements[i]->u.number; + sysno = &sysno_tmp; break; } } @@ -656,9 +669,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) action); if (r) { - rr->errcode = - YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; - rr->errstring = "record exchange failed"; + zebra_result(zh, &rr->errcode, + &rr->errstring); break; } } @@ -670,7 +682,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) r = zebra_insert_record( zh, 0, /* recordType */ - &sysno, + sysno, 0, /* match */ 0, /* fname */ (const char *) rec->u.octet_aligned->buf, @@ -688,7 +700,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) r = zebra_update_record( zh, 0, /* recordType */ - &sysno, + sysno, 0, /* match */ 0, /* fname */ (const char *) rec->u.octet_aligned->buf, @@ -705,7 +717,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) r = zebra_delete_record( zh, 0, /* recordType */ - &sysno, + sysno, 0, /* match */ 0, /* fname */ (const char *) rec->u.octet_aligned->buf, @@ -722,7 +734,11 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) } } } - zebra_end_trans (zh); + if (zebra_end_trans (zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed for" + " extended service operation"); + } } } } @@ -825,3 +841,11 @@ int main (int argc, char **argv) return statserv_main (argc, argv, bend_init, bend_close); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +