projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed zebra_clearError. The scheme is meant to be .. Return
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
d23ea47
..
9a24d0e
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.194 2005-11-09 11:51:29 adam Exp $
+/* $Id: zebraapi.c,v 1.199 2005-12-09 11:33:32 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
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");
{
ASSERTZH;
yaz_log(log_level, "zebra_flush_reg");
- zebra_clearError(zh);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
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");
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_shutdown");
- zebra_clearError(zh);
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
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");
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);
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");
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
- zebra_clearError(zh);
zh->hits = 0;
*hits = 0;
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);
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,
if (!zh->res)
{
zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
@@
-1099,7
+1094,7
@@
ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
assert(is_partial);
assert(entries);
yaz_log(log_level, "zebra_scan");
assert(is_partial);
assert(entries);
yaz_log(log_level, "zebra_scan");
- zebra_clearError(zh);
+
if (zebra_begin_read (zh) == ZEBRA_FAIL)
{
*entries = 0;
if (zebra_begin_read (zh) == ZEBRA_FAIL)
{
*entries = 0;
@@
-1139,7
+1134,7
@@
ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream,
assert(sort_sequence);
assert(sort_status);
yaz_log(log_level, "zebra_sort");
assert(sort_sequence);
assert(sort_status);
yaz_log(log_level, "zebra_sort");
- zebra_clearError(zh);
+
if (zebra_begin_read(zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames,
if (zebra_begin_read(zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames,
@@
-1156,7
+1151,7
@@
int zebra_deleteResultSet(ZebraHandle zh, int function,
ASSERTZH;
assert(statuses);
yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
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)
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
@@
-1207,15
+1202,6
@@
char *zebra_errAdd (ZebraHandle zh)
return a;
}
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;
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;
ZebraService zs;
ASSERTZH;
- zebra_clearError(zh);
+
zs= zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
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);
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);
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");
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_end");
- zebra_clearError(zh);
return zebra_end_trans(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");
int i;
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_segment");
- zebra_clearError(zh);
+
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
@@
-1321,10
+1305,13
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
assert(rec_buf);
yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
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))
if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
+ {
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "no record ID or empty record ID");
return ZEBRA_FAIL;
return ZEBRA_FAIL;
+ }
memcpy (recid_z, recid_buf, recid_len);
recid_z[recid_len] = 0;
memcpy (recid_z, recid_buf, recid_len);
recid_z[recid_len] = 0;
@@
-1337,8
+1324,10
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
{
if (action == 1) /* fail if insert */
{
{
if (action == 1) /* fail if insert */
{
- zebra_end_trans(zh);
- return ZEBRA_FAIL;
+ zebra_end_trans(zh);
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Cannot insert record: already exist");
+ return ZEBRA_FAIL;
}
memcpy (&sysno, rinfo+1, sizeof(sysno));
}
memcpy (&sysno, rinfo+1, sizeof(sysno));
@@
-1348,6
+1337,8
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
if (action == 2 || action == 3) /* fail if delete or update */
{
zebra_end_trans(zh);
if (action == 2 || action == 3) /* fail if delete or update */
{
zebra_end_trans(zh);
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Cannot delete/update record: does not exist");
return ZEBRA_FAIL;
}
action = 1; /* make it an insert (if it's an update).. */
return ZEBRA_FAIL;
}
action = 1; /* make it an insert (if it's an update).. */
@@
-1359,9
+1350,14
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
&sysno,
0, /* match */
0, /* fname */
&sysno,
0, /* match */
0, /* fname */
- 0, /* force update */
+ 0, /* force update */
1 /* allow update */
);
1 /* allow update */
);
+ if (res == ZEBRA_FAIL)
+ {
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Unable to parse record");
+ }
if (action == 1)
{
dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
if (action == 1)
{
dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
@@
-1408,7
+1404,6
@@
ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
ZEBRA_RES ret = ZEBRA_OK;
ASSERTZH;
yaz_log(log_level, "zebra_drop_database %s", db);
ZEBRA_RES ret = ZEBRA_OK;
ASSERTZH;
yaz_log(log_level, "zebra_drop_database %s", db);
- zebra_clearError(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
@@
-1424,6
+1419,8
@@
ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
else
{
yaz_log(YLOG_WARN, "drop database only supported for isam:b");
else
{
yaz_log(YLOG_WARN, "drop database only supported for isam:b");
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "drop database only supported for isam:b");
ret = ZEBRA_FAIL;
}
zebra_end_trans (zh);
ret = ZEBRA_FAIL;
}
zebra_end_trans (zh);
@@
-1435,7
+1432,6
@@
ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
assert(db);
ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
assert(db);
- zebra_clearError(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
@@
-1462,7
+1458,7
@@
int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
assert(input_str);
assert(output_str);
yaz_log(log_level, "zebra_string_norm ");
assert(input_str);
assert(output_str);
yaz_log(log_level, "zebra_string_norm ");
- zebra_clearError(zh);
+
if (!zh->reg->zebra_maps)
return -1;
wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
if (!zh->reg->zebra_maps)
return -1;
wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
@@
-1485,7
+1481,6
@@
static void zebra_set_state (ZebraHandle zh, int val, int seqno)
FILE *f;
ASSERTZH;
yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
FILE *f;
ASSERTZH;
yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
- zebra_clearError(zh);
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
@@
-1505,7
+1500,7
@@
static void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
ASSERTZH;
yaz_log(log_level, "zebra_get_state ");
ASSERTZH;
yaz_log(log_level, "zebra_get_state ");
- zebra_clearError(zh);
+
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "r");
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "r");
@@
-1611,8
+1606,6
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
}
zh->trans_w_no = zh->trans_no;
}
zh->trans_w_no = zh->trans_no;
- zebra_clearError(zh);
-
zh->records_inserted = 0;
zh->records_updated = 0;
zh->records_deleted = 0;
zh->records_inserted = 0;
zh->records_updated = 0;
zh->records_deleted = 0;
@@
-1706,7
+1699,6
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
zebra_flush_reg (zh);
return ZEBRA_OK;
}
zebra_flush_reg (zh);
return ZEBRA_OK;
}
- zebra_clearError(zh);
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
@@
-1872,20
+1864,18
@@
int zebra_repository_update (ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
{
ASSERTZH;
assert(path);
- zebra_clearError(zh);
yaz_log (log_level, "updating %s", path);
repositoryUpdate (zh, path);
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);
}
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);
yaz_log (log_level, "deleting %s", path);
repositoryDelete (zh, path);
- return zh->errCode;
+ return 0;
}
int zebra_repository_show (ZebraHandle zh, const char *path)
}
int zebra_repository_show (ZebraHandle zh, const char *path)
@@
-1893,31
+1883,29
@@
int zebra_repository_show (ZebraHandle zh, const char *path)
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
- zebra_clearError(zh);
repositoryShow (zh, path);
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;
{
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;
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");
}
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);
}
zebra_lock_w (zh->lock_normal);
@@
-1956,7
+1944,7
@@
static int zebra_commit_ex(ZebraHandle zh, int clean_only)
zebra_unlock (zh->lock_shadow);
zebra_unlock (zh->lock_normal);
zebra_unlock (zh->lock_shadow);
zebra_unlock (zh->lock_normal);
- return 0;
+ return ZEBRA_OK;
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
@@
-1979,7
+1967,6
@@
ZEBRA_RES zebra_init(ZebraHandle zh)
BFiles bfs = 0;
ASSERTZH;
yaz_log(log_level, "zebra_init");
BFiles bfs = 0;
ASSERTZH;
yaz_log(log_level, "zebra_init");
- zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
zebra_select_default_database(zh);
if (!zh->res)
@@
-2010,7
+1997,6
@@
ZEBRA_RES zebra_compact(ZebraHandle zh)
BFiles bfs;
ASSERTZH;
yaz_log(log_level, "zebra_compact");
BFiles bfs;
ASSERTZH;
yaz_log(log_level, "zebra_compact");
- zebra_clearError(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@
-2034,7
+2020,6
@@
void zebra_shadow_enable(ZebraHandle zh, int value)
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
- zebra_clearError(zh);
zh->shadow_enable = value;
}
zh->shadow_enable = value;
}
@@
-2043,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);
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);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
@@
-2066,7
+2050,6
@@
ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
{
ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
- zebra_clearError(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
@@
-2080,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);
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
- zebra_clearError(zh);
res_set(zh->res, name, value);
}
res_set(zh->res, name, value);
}
@@
-2091,7
+2073,6
@@
const char *zebra_get_resource(ZebraHandle zh,
ASSERTZH;
assert(name);
v = res_get_def (zh->res, name, (char *)defaultvalue);
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;
}
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
return v;
}
@@
-2144,8
+2125,7
@@
NOTE: Now returns 0 at success and updates sysno, which is an int*
int zebra_add_record(ZebraHandle zh,
const char *buf, int buf_size)
{
int zebra_add_record(ZebraHandle zh,
const char *buf, int buf_size)
{
- SYSNO sysno = 0;
- return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0);
+ return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0);
}
ZEBRA_RES zebra_insert_record (ZebraHandle zh,
}
ZEBRA_RES zebra_insert_record (ZebraHandle zh,
@@
-2186,10
+2166,11
@@
ZEBRA_RES zebra_update_record (ZebraHandle zh,
{
ZEBRA_RES res;
ASSERTZH;
{
ZEBRA_RES res;
ASSERTZH;
- assert(sysno);
assert(buf);
assert(buf);
- yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(log_level, "zebra_update_record");
+ if (sysno)
+ yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
if (buf_size < 1) buf_size = strlen(buf);