From c944571888712854653be0d2debf903b8651c8e2 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 9 Dec 2005 11:33:32 +0000 Subject: [PATCH] Removed zebra_clearError. The scheme is meant to be .. Return ZEBRA_FAIL on failure. Only then it is meaningful to check for error code. It is therefore no longer necessary to clear it (reset it). --- include/idzebra/api.h | 10 +--------- index/zebraapi.c | 50 +++++++++++-------------------------------------- index/zebrash.c | 5 ++--- index/zserver.c | 41 ++++++++++++++++++++++------------------ 4 files changed, 37 insertions(+), 69 deletions(-) diff --git a/include/idzebra/api.h b/include/idzebra/api.h index c505c90..88d9fec 100644 --- a/include/idzebra/api.h +++ b/include/idzebra/api.h @@ -1,4 +1,4 @@ -/* $Id: api.h,v 1.30 2005-09-13 11:51:05 adam Exp $ +/* $Id: api.h,v 1.31 2005-12-09 11:33:32 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -168,14 +168,6 @@ char *zebra_errAdd(ZebraHandle zh); YAZ_EXPORT void zebra_result(ZebraHandle zh, int *code, char **addinfo); -/** - \brief Clears last error. - \param zh zebra session handle. -*/ -YAZ_EXPORT -void zebra_clearError(ZebraHandle zh); - - /** \brief Set limit before Zebra does approx hit count \param zh session handle diff --git a/index/zebraapi.c b/index/zebraapi.c index 32b4793..9a24d0e 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.198 2005-12-09 10:56:59 adam Exp $ +/* $Id: zebraapi.c,v 1.199 2005-12-09 11:33:32 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -72,7 +72,6 @@ static void zebra_flush_reg (ZebraHandle zh) { ASSERTZH; yaz_log(log_level, "zebra_flush_reg"); - zebra_clearError(zh); zebraExplain_flush (zh->reg->zei, zh); extract_flushWriteKeys (zh, 1 /* final */); @@ -446,7 +445,6 @@ ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh) { ASSERTZH; yaz_log(log_level, "zebra_admin_shutdown"); - zebra_clearError(zh); zebra_mutex_cond_lock (&zh->service->session_lock); zh->service->stop_flag = 1; @@ -459,7 +457,6 @@ ZEBRA_RES zebra_admin_start (ZebraHandle zh) ZebraService zs; ASSERTZH; yaz_log(log_level, "zebra_admin_start"); - zebra_clearError(zh); zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); zebra_mutex_cond_unlock (&zs->session_lock); @@ -939,7 +936,6 @@ ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, assert(hits); assert(setname); yaz_log(log_level, "zebra_search_rpn"); - zebra_clearError(zh); zh->hits = 0; *hits = 0; @@ -971,7 +967,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs); - zebra_clearError(zh); if (!zh->res) { zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, @@ -1156,7 +1151,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function, ASSERTZH; assert(statuses); yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames); - zebra_clearError(zh);; + if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) @@ -1207,15 +1202,6 @@ char *zebra_errAdd (ZebraHandle zh) return a; } -void zebra_clearError(ZebraHandle zh) -{ - if (zh) - { - zh->errCode = 0; - zh->errString = 0; - } -} - ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) { const char *p; @@ -1224,7 +1210,7 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) ZebraService zs; ASSERTZH; - zebra_clearError(zh); + zs= zh->service; sprintf(u, "perm.%.30s", user ? user : "anonymous"); @@ -1254,7 +1240,6 @@ ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database, ASSERTZH; yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", database, record_type); - zebra_clearError(zh); if (zebra_select_database(zh, database) == ZEBRA_FAIL) return ZEBRA_FAIL; return zebra_begin_trans(zh, 1); @@ -1264,7 +1249,6 @@ ZEBRA_RES zebra_admin_import_end (ZebraHandle zh) { ASSERTZH; yaz_log(log_level, "zebra_admin_import_end"); - zebra_clearError(zh); return zebra_end_trans(zh); } @@ -1275,7 +1259,7 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) int i; ASSERTZH; yaz_log(log_level, "zebra_admin_import_segment"); - zebra_clearError(zh); + for (i = 0; inum_segmentRecords; i++) { Z_NamePlusRecord *npr = segment->segmentRecords[i]; @@ -1321,7 +1305,6 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, assert(rec_buf); yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action); - zebra_clearError(zh); if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) { @@ -1881,20 +1864,18 @@ int zebra_repository_update (ZebraHandle zh, const char *path) { ASSERTZH; assert(path); - zebra_clearError(zh); yaz_log (log_level, "updating %s", path); repositoryUpdate (zh, path); - return zh->errCode; + return 0; } int zebra_repository_delete (ZebraHandle zh, const char *path) { ASSERTZH; assert(path); - zebra_clearError(zh); yaz_log (log_level, "deleting %s", path); repositoryDelete (zh, path); - return zh->errCode; + return 0; } int zebra_repository_show (ZebraHandle zh, const char *path) @@ -1902,31 +1883,29 @@ int zebra_repository_show (ZebraHandle zh, const char *path) ASSERTZH; assert(path); yaz_log(log_level, "zebra_repository_show"); - zebra_clearError(zh); repositoryShow (zh, path); - return zh->errCode; + return 0; } -static int zebra_commit_ex(ZebraHandle zh, int clean_only) +static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) { int seqno; char val; const char *rval; BFiles bfs; ASSERTZH; - zebra_clearError(zh); zebra_select_default_database(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; - return -1; + return ZEBRA_FAIL; } rval = res_get (zh->res, "shadow"); if (!rval) { yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined"); - return 0; + return ZEBRA_OK; } zebra_lock_w (zh->lock_normal); @@ -1965,7 +1944,7 @@ static int zebra_commit_ex(ZebraHandle zh, int clean_only) zebra_unlock (zh->lock_shadow); zebra_unlock (zh->lock_normal); - return 0; + return ZEBRA_OK; } ZEBRA_RES zebra_clean(ZebraHandle zh) @@ -1988,7 +1967,6 @@ ZEBRA_RES zebra_init(ZebraHandle zh) BFiles bfs = 0; ASSERTZH; yaz_log(log_level, "zebra_init"); - zebra_clearError(zh); zebra_select_default_database(zh); if (!zh->res) @@ -2019,7 +1997,6 @@ ZEBRA_RES zebra_compact(ZebraHandle zh) BFiles bfs; ASSERTZH; yaz_log(log_level, "zebra_compact"); - zebra_clearError(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -2043,7 +2020,6 @@ void zebra_shadow_enable(ZebraHandle zh, int value) { ASSERTZH; yaz_log(log_level, "zebra_shadow_enable"); - zebra_clearError(zh); zh->shadow_enable = value; } @@ -2052,7 +2028,6 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) ASSERTZH; assert(encoding); yaz_log(log_level, "zebra_octet_term_encoding %s", encoding); - zebra_clearError(zh); if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); @@ -2075,7 +2050,6 @@ ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding) { ASSERTZH; yaz_log(log_level, "zebra_record_encoding"); - zebra_clearError(zh); xfree(zh->record_encoding); zh->record_encoding = 0; if (encoding) @@ -2089,7 +2063,6 @@ void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) assert(name); assert(value); yaz_log(log_level, "zebra_set_resource %s:%s", name, value); - zebra_clearError(zh); res_set(zh->res, name, value); } @@ -2100,7 +2073,6 @@ const char *zebra_get_resource(ZebraHandle zh, ASSERTZH; assert(name); v = res_get_def (zh->res, name, (char *)defaultvalue); - zebra_clearError(zh); yaz_log(log_level, "zebra_get_resource %s:%s", name, v); return v; } diff --git a/index/zebrash.c b/index/zebrash.c index b11a63e..462bfda 100644 --- a/index/zebrash.c +++ b/index/zebrash.c @@ -1,4 +1,4 @@ -/* $Id: zebrash.c,v 1.35 2005-09-13 11:51:06 adam Exp $ +/* $Id: zebrash.c,v 1.36 2005-12-09 11:33:32 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -743,7 +743,7 @@ static int cmd_help( char *args[], WRBUF outbuff) /* If Zebra reports an error after an operation, * append it to the outbuff and log it */ -static void Zerrors ( WRBUF outbuff) +static void Zerrors (WRBUF outbuff) { int ec; if (!zh) @@ -757,7 +757,6 @@ static void Zerrors ( WRBUF outbuff) wrbuf_printf(outbuff, " Zebra error %d: %s, (%s)\n", ec, zebra_errString (zh), zebra_errAdd (zh) ); - zebra_clearError(zh); } } diff --git a/index/zserver.c b/index/zserver.c index aeddd41..62e3387 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $Id: zserver.c,v 1.143 2005-12-09 10:45:05 adam Exp $ +/* $Id: zserver.c,v 1.144 2005-12-09 11:33:32 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -408,8 +408,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 +419,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"); @@ -446,7 +451,7 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) 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 +459,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 +508,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) { -- 1.7.10.4