-/* $Id: zebraapi.c,v 1.103 2003-05-22 16:16:22 heikki Exp $
+/* $Id: zebraapi.c,v 1.109 2003-06-30 19:37:12 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
assert (res);
yaz_log (LOG_LOG|LOG_API, "zebra_register_open rw = %d useshadow=%d p=%p,n=%s,rp=%s",
- rw, useshadow, reg, name, reg_path);
+ rw, useshadow, reg, name, reg_path ? reg_path : "(none)");
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
return reg;
}
-void zebra_admin_shutdown (ZebraHandle zh)
+int zebra_admin_shutdown (ZebraHandle zh)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_admin_shutdown");
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
zebra_mutex_cond_unlock (&zh->service->session_lock);
+ return 0;
}
-void zebra_admin_start (ZebraHandle zh)
+int zebra_admin_start (ZebraHandle zh)
{
ZebraService zs;
ASSERTZH;
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&zs->session_lock);
+ return 0;
}
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
xfree (reg);
}
-void zebra_stop(ZebraService zs)
+int zebra_stop(ZebraService zs)
{
if (!zs)
- return ;
+ return 0;
yaz_log (LOG_LOG|LOG_API, "zebra_stop");
while (zs->sessions)
xfree (zs->configName);
xfree (zs->path_root);
xfree (zs);
+ return 0;
}
-void zebra_close (ZebraHandle zh)
+int zebra_close (ZebraHandle zh)
{
ZebraService zs;
struct zebra_session **sp;
yaz_log(LOG_API,"zebra_close");
if (!zh)
- return;
+ return 0;
ASSERTZH;
zh->errCode=0;
zs = zh->service;
yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
- if (!zh)
- return ;
resultSetDestroy (zh, -1, 0, 0);
if (zh->reg)
xfree (zh->reg_name);
zh->service=0; /* more likely to trigger an assert */
xfree (zh);
+ return 0;
}
struct map_baseinfo {
return 0;
}
-void zebra_search_RPN (ZebraHandle zh,
+int zebra_search_RPN (ZebraHandle zh, ODR o,
Z_RPNQuery *query, const char *setname, int *hits)
{
ASSERTZH;
*hits = 0;
if (zebra_begin_read (zh))
- return;
+ return 1;
zebra_livcode_transform(zh, query);
- resultSetAddRPN (zh, query,
+ resultSetAddRPN (zh, odr_extract_mem(o), query,
zh->num_basenames, zh->basenames, setname);
zebra_end_read (zh);
*hits = zh->hits;
+ return 0;
}
-void zebra_records_retrieve (ZebraHandle zh, ODR stream,
+int zebra_records_retrieve (ZebraHandle zh, ODR stream,
const char *setname, Z_RecordComposition *comp,
oid_value input_format, int num_recs,
ZebraRetrievalRecord *recs)
{
zh->errCode = 30;
zh->errString = odr_strdup (stream, setname);
- return;
+ return 1;
}
zh->errCode = 0;
if (zebra_begin_read (zh))
- return;
+ return 1;
pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
for (i = 0; i<num_recs; i++)
}
zebra_end_read (zh);
xfree (pos_array);
+ return 0;
}
-void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
+int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
oid_value attributeset,
int *position, int *num_entries, ZebraScanEntry **entries,
int *is_partial)
{
*entries = 0;
*num_entries = 0;
- return;
+ return 1;
}
rpn_scan (zh, stream, zapt, attributeset,
zh->num_basenames, zh->basenames, position,
num_entries, entries, is_partial, 0, 0);
zebra_end_read (zh);
+ return 0;
}
-void zebra_sort (ZebraHandle zh, ODR stream,
+int zebra_sort (ZebraHandle zh, ODR stream,
int num_input_setnames, const char **input_setnames,
const char *output_setname, Z_SortKeySpecList *sort_sequence,
int *sort_status)
yaz_log(LOG_API,"zebra_sort");
zh->errCode=0;
if (zebra_begin_read (zh))
- return;
+ return 1;
resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
output_setname, sort_sequence, sort_status);
zebra_end_read(zh);
+ return 0;
}
int zebra_deleleResultSet(ZebraHandle zh, int function,
return a;
}
+void zebra_clearError(ZebraHandle zh)
+{
+ if (zh)
+ {
+ zh->errCode=0;
+ zh->errString="";
+ }
+}
+
int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
{
ZebraService zs;
return 1;
}
-void zebra_admin_import_begin (ZebraHandle zh, const char *database,
+int zebra_admin_import_begin (ZebraHandle zh, const char *database,
const char *record_type)
{
ASSERTZH;
database, record_type);
zh->errCode=0;
if (zebra_select_database(zh, database))
- return;
+ return 1;
zebra_begin_trans (zh, 1);
xfree (zh->admin_databaseName);
zh->admin_databaseName = xstrdup(database);
+ return 0;
}
-void zebra_admin_import_end (ZebraHandle zh)
+int zebra_admin_import_end (ZebraHandle zh)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_admin_import_end");
zh->errCode=0;
zebra_end_trans (zh);
+ return 0;
}
-void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
+int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
{
int sysno;
int i;
}
}
}
+ return 0;
}
int zebra_admin_exchange_record (ZebraHandle zh,
memcpy (recid_z, recid_buf, recid_len);
recid_z[recid_len] = 0;
+ zebra_begin_trans(zh,1);
+
rinfo = dict_lookup (zh->reg->matchDict, recid_z);
if (rinfo)
{
if (action == 1) /* fail if insert */
- return -1;
+ {
+ zebra_end_trans(zh);
+ return -1;
+ }
+
memcpy (&sysno, rinfo+1, sizeof(sysno));
}
else
{
if (action == 2 || action == 3) /* fail if delete or update */
+ {
+ zebra_end_trans(zh);
return -1;
+ }
}
extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database,
action == 3 ? 1 : 0 /* delete flag */,
{
dict_delete (zh->reg->matchDict, recid_z);
}
+ zebra_end_trans(zh);
return 0;
}
-void zebra_create_database (ZebraHandle zh, const char *database)
+int delete_w_handle(const char *info, void *handle)
+{
+ ZebraHandle zh = (ZebraHandle) handle;
+ ISAMC_P pos;
+
+ if (*info == sizeof(pos))
+ {
+ memcpy (&pos, info+1, sizeof(pos));
+ isamb_unlink(zh->reg->isamb, pos);
+ }
+ return 0;
+}
+
+static int delete_SU_handle(void *handle, int ord)
+{
+ ZebraHandle zh = (ZebraHandle) handle;
+ char ord_buf[20];
+ int ord_len;
+
+ ord_len = key_SU_encode (ord, ord_buf);
+ ord_buf[ord_len] = '\0';
+
+ assert (zh->reg->isamb);
+ dict_delete_subtree(zh->reg->dict, ord_buf,
+ zh, delete_w_handle);
+ return 0;
+}
+
+int zebra_drop_database (ZebraHandle zh, const char *database)
+{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_drop_database");
+ zh->errCode = 0;
+
+ if (zebra_select_database (zh, database))
+ return -1;
+ if (zebra_begin_trans (zh, 1))
+ return -1;
+ if (zh->reg->isamb)
+ {
+ zebraExplain_curDatabase (zh->reg->zei, database);
+
+ zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
+ zebraExplain_removeDatabase(zh->reg->zei, zh);
+ }
+ zebra_end_trans (zh);
+ return 0;
+}
+
+int zebra_create_database (ZebraHandle zh, const char *database)
{
- ZebraService zs;
ASSERTZH;
- yaz_log(LOG_API,"zebra_admin_create");
+ yaz_log(LOG_API,"zebra_create_database");
zh->errCode=0;
if (zebra_select_database (zh, database))
- return;
+ return -1;
if (zebra_begin_trans (zh, 1))
- return;
+ return -1;
- zs = zh->service;
/* announce database */
if (zebraExplain_newDatabase (zh->reg->zei, database, 0
/* explainDatabase */))
{
+ zebra_end_trans (zh);
zh->errCode = 224;
zh->errString = "database already exist";
+ return -1;
}
zebra_end_trans (zh);
+ return 0;
}
int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
}
-void zebra_set_state (ZebraHandle zh, int val, int seqno)
+int zebra_set_state (ZebraHandle zh, int val, int seqno)
{
char state_fname[256];
char *fname;
long p = getpid();
FILE *f;
ASSERTZH;
- yaz_log(LOG_API,"zebra_set_state v=%d seq=%s", val, seqno);
+ yaz_log(LOG_API,"zebra_set_state v=%d seq=%d", val, seqno);
zh->errCode=0;
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fprintf (f, "%c %d %ld\n", val, seqno, p);
fclose (f);
xfree (fname);
+ return 0;
}
-void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
+int zebra_get_state (ZebraHandle zh, char *val, int *seqno)
{
char state_fname[256];
char *fname;
fclose (f);
}
xfree (fname);
+ return 0;
}
int zebra_begin_read (ZebraHandle zh)
return zebra_begin_trans(zh, 0);
}
-void zebra_end_read (ZebraHandle zh)
+int zebra_end_read (ZebraHandle zh)
{
- zebra_end_trans(zh);
+ return zebra_end_trans(zh);
}
int zebra_begin_trans (ZebraHandle zh, int rw)
return -1;
}
if (zh->reg)
+ {
+ resultSetInvalidate (zh);
zebra_register_close (zh->service, zh->reg);
-
+ }
zh->trans_w_no = zh->trans_no;
zh->errCode=0;
return 0;
}
-void zebra_repository_update (ZebraHandle zh)
+int zebra_repository_update (ZebraHandle zh)
{
ASSERTZH;
zh->errCode=0;
logf (LOG_LOG|LOG_API, "updating %s", zh->rGroup.path);
repositoryUpdate (zh);
+ return zh->errCode;
}
-void zebra_repository_delete (ZebraHandle zh)
+int zebra_repository_delete (ZebraHandle zh)
{
ASSERTZH;
zh->errCode=0;
logf (LOG_LOG|LOG_API, "deleting %s", zh->rGroup.path);
repositoryDelete (zh);
+ return zh->errCode;
}
-void zebra_repository_show (ZebraHandle zh)
+int zebra_repository_show (ZebraHandle zh)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_repository_show");
zh->errCode=0;
repositoryShow (zh);
+ return zh->errCode;
}
static int zebra_commit_ex (ZebraHandle zh, int clean_only)
return 0;
}
-int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
+int zebra_record_insert (ZebraHandle zh, const char *buf, int len, int *sysno)
{
- int sysno = 0;
+ int sysn=0;
ASSERTZH;
yaz_log(LOG_API,"zebra_record_insert");
+ if (sysno)
+ *sysno=0;
zh->errCode=0;
if (zebra_begin_trans (zh, 1))
- return 0;
+ return -1;
extract_rec_in_mem (zh, "grs.sgml",
buf, len,
"Default", /* database */
0 /* delete_flag */,
0 /* test_mode */,
- &sysno /* sysno */,
+ &sysn /* sysno */,
1 /* store_keys */,
1 /* store_data */,
0 /* match criteria */);
if (zebra_end_trans (zh))
- return 0;
- return sysno;
+ return -1;
+ if (sysno)
+ *sysno=sysn;
+ return 0;
}
-void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
+int zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_set_group");
zh->errCode=0;
memcpy (&zh->rGroup, rg, sizeof(*rg));
+ return 0;
}
-void zebra_result (ZebraHandle zh, int *code, char **addinfo)
+int zebra_result (ZebraHandle zh, int *code, char **addinfo)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_result");
*code = zh->errCode;
*addinfo = zh->errString;
+ return 0;
}
-void zebra_shadow_enable (ZebraHandle zh, int value)
+int zebra_shadow_enable (ZebraHandle zh, int value)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_shadow_enable");
zh->errCode=0;
zh->shadow_enable = value;
+ return 0;
}
int zebra_record_encoding (ZebraHandle zh, const char *encoding)
/*
* Fixme!
+ * Something about charset aliases. Oleg???
*/
if (zh->iconv_to_utf8 != 0)
return 0;
}
-void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
+int zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value);
zh->errCode=0;
res_put(zh->res, name, value);
+ return 0;
}
const char *zebra_get_resource(ZebraHandle zh,
}
/* moved from zebra_api_ext.c by pop */
+/* FIXME: Should this really be public??? -Heikki */
-int zebra_trans_no (ZebraHandle zh) {
- ASSERTZH;
- yaz_log(LOG_API,"zebra_trans_no");
- return (zh->trans_no);
+int zebra_trans_no (ZebraHandle zh)
+{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_trans_no");
+ return zh->trans_no;
}
-
-
-int zebra_get_shadow_enable (ZebraHandle zh) {
+int zebra_get_shadow_enable (ZebraHandle zh)
+{
yaz_log(LOG_API,"zebra_get_shadow_enable");
return (zh->shadow_enable);
}
-void zebra_set_shadow_enable (ZebraHandle zh, int value) {
+int zebra_set_shadow_enable (ZebraHandle zh, int value)
+{
yaz_log(LOG_API,"zebra_set_shadow_enable %d",value);
zh->shadow_enable = value;
+ return 0;
}
-void init_recordGroup (struct recordGroup *rg) {
+int init_recordGroup (struct recordGroup *rg)
+{
assert(rg);
yaz_log(LOG_API,"init_recordGroup");
rg->groupName = NULL;
rg->explainDatabase = 0;
rg->fileVerboseLimit = 100000;
rg->followLinks = -1;
+ return 0;
}
called... and in general... Should be moved to somewhere else */
void res_get_recordGroup (ZebraHandle zh,
struct recordGroup *rGroup,
- const char *ext) {
- char gprefix[128];
- char ext_res[128];
+ const char *ext)
+{
+ char gprefix[128];
+ char ext_res[128];
+
+ yaz_log(LOG_API,"res_get_recordGroup e=%s",ext);
+ if (!rGroup->groupName || !*rGroup->groupName)
+ *gprefix = '\0';
+ else
+ sprintf (gprefix, "%s.", rGroup->groupName);
+
+ /* determine file type - depending on extension */
+ if (!rGroup->recordType) {
+ sprintf (ext_res, "%srecordType.%s", gprefix, ext);
+ if (!(rGroup->recordType = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%srecordType", gprefix);
+ rGroup->recordType = res_get (zh->res, ext_res);
+ }
+ }
+ /* determine match criteria */
+ if (!rGroup->recordId) {
+ sprintf (ext_res, "%srecordId.%s", gprefix, ext);
+ if (!(rGroup->recordId = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%srecordId", gprefix);
+ rGroup->recordId = res_get (zh->res, ext_res);
+ }
+ }
+
+ /* determine database name */
+ if (!rGroup->databaseName) {
+ sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
+ if (!(rGroup->databaseName = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%sdatabase", gprefix);
+ rGroup->databaseName = res_get (zh->res, ext_res);
+ }
+ }
+ if (!rGroup->databaseName)
+ rGroup->databaseName = "Default";
- yaz_log(LOG_API,"res_get_recordGroup e=%s",ext);
- if (!rGroup->groupName || !*rGroup->groupName)
- *gprefix = '\0';
- else
- sprintf (gprefix, "%s.", rGroup->groupName);
-
- /* determine file type - depending on extension */
- if (!rGroup->recordType) {
- sprintf (ext_res, "%srecordType.%s", gprefix, ext);
- if (!(rGroup->recordType = res_get (zh->res, ext_res))) {
- sprintf (ext_res, "%srecordType", gprefix);
- rGroup->recordType = res_get (zh->res, ext_res);
- }
- }
- /* determine match criteria */
- if (!rGroup->recordId) {
- sprintf (ext_res, "%srecordId.%s", gprefix, ext);
- if (!(rGroup->recordId = res_get (zh->res, ext_res))) {
- sprintf (ext_res, "%srecordId", gprefix);
- rGroup->recordId = res_get (zh->res, ext_res);
- }
- }
-
- /* determine database name */
- if (!rGroup->databaseName) {
- sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
- if (!(rGroup->databaseName = res_get (zh->res, ext_res))) {
- sprintf (ext_res, "%sdatabase", gprefix);
- rGroup->databaseName = res_get (zh->res, ext_res);
- }
- }
- if (!rGroup->databaseName)
- rGroup->databaseName = "Default";
-
- /* determine if explain database */
- sprintf (ext_res, "%sexplainDatabase", gprefix);
- rGroup->explainDatabase =
- atoi (res_get_def (zh->res, ext_res, "0"));
-
- /* storeData */
- if (rGroup->flagStoreData == -1) {
- const char *sval;
- sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
- if (!(sval = res_get (zh->res, ext_res))) {
- sprintf (ext_res, "%sstoreData", gprefix);
- sval = res_get (zh->res, ext_res);
- }
- if (sval)
- rGroup->flagStoreData = atoi (sval);
- }
- if (rGroup->flagStoreData == -1) rGroup->flagStoreData = 0;
-
- /* storeKeys */
- if (rGroup->flagStoreKeys == -1) {
- const char *sval;
+ /* determine if explain database */
+ sprintf (ext_res, "%sexplainDatabase", gprefix);
+ rGroup->explainDatabase =
+ atoi (res_get_def (zh->res, ext_res, "0"));
- sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
- sval = res_get (zh->res, ext_res);
- if (!sval) {
- sprintf (ext_res, "%sstoreKeys", gprefix);
- sval = res_get (zh->res, ext_res);
- }
- if (!sval) sval = res_get (zh->res, "storeKeys");
- if (sval) rGroup->flagStoreKeys = atoi (sval);
- }
- if (rGroup->flagStoreKeys == -1) rGroup->flagStoreKeys = 0;
-
+ /* storeData */
+ if (rGroup->flagStoreData == -1)
+ {
+ const char *sval;
+ sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
+ if (!(sval = res_get (zh->res, ext_res)))
+ {
+ sprintf (ext_res, "%sstoreData", gprefix);
+ sval = res_get (zh->res, ext_res);
+ }
+ if (sval)
+ rGroup->flagStoreData = atoi (sval);
+ }
+ if (rGroup->flagStoreData == -1)
+ rGroup->flagStoreData = 0;
+
+ /* storeKeys */
+ if (rGroup->flagStoreKeys == -1)
+ {
+ const char *sval;
+
+ sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
+ sval = res_get (zh->res, ext_res);
+ if (!sval)
+ {
+ sprintf (ext_res, "%sstoreKeys", gprefix);
+ sval = res_get (zh->res, ext_res);
+ }
+ if (!sval)
+ sval = res_get (zh->res, "storeKeys");
+ if (sval)
+ rGroup->flagStoreKeys = atoi (sval);
+ }
+ if (rGroup->flagStoreKeys == -1)
+ rGroup->flagStoreKeys = 0;
}
If sysno is provided, then it's used to identify the reocord.
If not, and match_criteria is provided, then sysno is guessed
If not, and a record is provided, then sysno is got from there
+NOTE: Now returns 0 at success and updates sysno, which is an int*
+ 20-jun-2003 Heikki
*/
int zebra_insert_record (ZebraHandle zh,
struct recordGroup *rGroup,
const char *recordType,
- int sysno, const char *match, const char *fname,
+ int *sysno, const char *match, const char *fname,
const char *buf, int buf_size,
int force_update) /* This one is ignored */
{
int res;
- yaz_log(LOG_API,"zebra_insert_record sysno=%d",sysno);
+ yaz_log(LOG_API,"zebra_insert_record sysno=%d", *sysno);
if (buf_size < 1) buf_size = strlen(buf);
0, /* delete_flag */
0, /* test_mode */
recordType,
- &sysno,
+ sysno,
match, fname,
force_update,
0); /* allow_update */
zebra_end_trans(zh);
if (res < 0) return (res);
- return sysno;
+ return res;
}
int zebra_update_record (ZebraHandle zh,
struct recordGroup *rGroup,
const char *recordType,
- int sysno, const char *match, const char *fname,
+ int* sysno, const char *match, const char *fname,
const char *buf, int buf_size,
int force_update)
-
{
int res;
- yaz_log(LOG_API,"zebra_update_record sysno=%d",sysno);
+
+ yaz_log(LOG_API,"zebra_update_record sysno=%d", *sysno);
if (buf_size < 1) buf_size = strlen(buf);
0, /* delete_flag */
0, /* test_mode */
recordType,
- &sysno,
+ sysno,
match, fname,
force_update,
1); /* allow_update */
zebra_end_trans(zh);
- return sysno;
+ return res;
}
-
-
int zebra_delete_record (ZebraHandle zh,
struct recordGroup *rGroup,
const char *recordType,
- int sysno, const char *match, const char *fname,
+ int *sysno, const char *match, const char *fname,
const char *buf, int buf_size,
int force_update)
{
int res;
- yaz_log(LOG_API,"zebra_delete_record sysno=%d",sysno);
+ yaz_log(LOG_API,"zebra_delete_record sysno=%d", *sysno);
if (buf_size < 1) buf_size = strlen(buf);
1, /* delete_flag */
0, /* test_mode */
recordType,
- &sysno,
+ sysno,
match,fname,
force_update,
1); /* allow_update */
zebra_end_trans(zh);
- return sysno;
+ return res;
}
/* ---------------------------------------------------------------------------
*/
int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
- const char *setname)
+ const char *setname, int *numhits)
{
int hits = 0;
+ int res=-1;
Z_RPNQuery *query;
ODR odr = odr_createmem(ODR_ENCODE);
+
yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query);
query = p_query_rpn (odr, PROTO_Z3950, pqf_query);
if (!query)
yaz_log (LOG_WARN, "bad query %s\n", pqf_query);
else
- zebra_search_RPN (zh, query, setname, &hits);
+ res=zebra_search_RPN (zh, odr, query, setname, &hits);
odr_destroy(odr);
- return hits;
+ if (numhits)
+ *numhits=hits;
+
+ return res;
}
/* ---------------------------------------------------------------------------
Sort - a simplified interface, with optional read locks.
FIXME - This is a horrible name, will conflict with half the applications
*/
-int sort (ZebraHandle zh,
- ODR stream,
- const char *sort_spec,
- const char *output_setname,
- const char **input_setnames
- )
+int zebra_sort_2 (ZebraHandle zh,
+ ODR stream,
+ const char *sort_spec,
+ const char *output_setname,
+ const char **input_setnames)
{
int num_input_setnames = 0;
int sort_status = 0;
Z_SortKeySpecList *sort_sequence = yaz_sort_spec (stream, sort_spec);
yaz_log(LOG_API,"sort (FIXME) ");
- if (!sort_sequence) {
+ if (!sort_sequence)
+ {
logf(LOG_WARN,"invalid sort specs '%s'", sort_spec);
zh->errCode = 207;
- return (-1);
+ return -1;
}
/* we can do this, since the perl typemap code for char** will
output_setname, sort_sequence, &sort_status);
zebra_end_read(zh);
- return (sort_status);
+ return sort_status;
}
projects / idzebra-moved-to-github.git / blobdiff