-/* $Id: zebraapi.c,v 1.106 2003-06-20 14:21:23 heikki Exp $
+/* $Id: zebraapi.c,v 1.114 2003-09-05 10:51:17 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
02111-1307, USA.
*/
-
-
#include <assert.h>
#include <stdio.h>
#ifdef WIN32
return 0;
}
+
+void zebra_pidfname(ZebraService zs, char *path)
+{
+ zebra_lock_prefix (zs->global_res, path);
+ strcat(path, "zebrasrv.pid");
+}
+
static
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
int rw, int useshadow, Res res,
int zebra_stop(ZebraService zs)
{
if (!zs)
- return ;
+ return 0;
yaz_log (LOG_LOG|LOG_API, "zebra_stop");
while (zs->sessions)
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)
ZebraRetrievalRecord *recs)
{
ZebraPosSet poset;
- int i, *pos_array;
+ int i, *pos_array, ret = 0;
ASSERTZH;
yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs);
zh->errCode=0;
{
zh->errCode = 30;
zh->errString = odr_strdup (stream, setname);
- return 1;
+ return -1;
}
zh->errCode = 0;
if (zebra_begin_read (zh))
- return 1;
+ return -1;
pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
for (i = 0; i<num_recs; i++)
logf (LOG_DEBUG, "zebraPosSetCreate error");
zh->errCode = 30;
zh->errString = nmem_strdup (stream->mem, setname);
+ ret = -1;
}
else
{
sprintf (num_str, "%d", pos_array[i]);
zh->errCode = 13;
zh->errString = odr_strdup (stream, num_str);
+ ret = -1;
break;
}
}
}
zebra_end_read (zh);
xfree (pos_array);
- return 0;
+ return ret;
}
int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
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;
+}
+
+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)
+{
+ int ret = 0;
+ 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);
+ }
+ else
+ {
+ yaz_log(LOG_WARN, "drop database only supported for isam:b");
+ ret = -1;
+ }
+ zebra_end_trans (zh);
+ return ret;
+}
+
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))
if (zebra_begin_trans (zh, 1))
return -1;
- zs = zh->service;
/* announce database */
if (zebraExplain_newDatabase (zh->reg->zei, database, 0
/* explainDatabase */))
int zebra_begin_trans (ZebraHandle zh, int rw)
{
- yaz_log(LOG_LOG, "zebra_begin_trans rw=%d trans=%d", rw, zh->trans_no);
if (!zh->res)
{
zh->errCode = 2;
/* 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);
}
-int 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;
}
-int init_recordGroup (struct recordGroup *rg) {
+int init_recordGroup (struct recordGroup *rg)
+{
assert(rg);
yaz_log(LOG_API,"init_recordGroup");
rg->groupName = NULL;
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);
- 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 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);
+ }
+ }
- 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;
-
+ /* 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;
+
+ 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;
}
{
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);
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);
return res;
}
-
-
int zebra_delete_record (ZebraHandle zh,
struct recordGroup *rGroup,
const char *recordType,
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);
int res=-1;
Z_RPNQuery *query;
ODR odr = odr_createmem(ODR_ENCODE);
- assert(numhits);
+
yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query);
query = p_query_rpn (odr, PROTO_Z3950, pqf_query);
odr_destroy(odr);
- *numhits=hits;
+ yaz_log(LOG_API,"Hits: %d",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 zebra_sort_2 (ZebraHandle zh,
- ODR stream,
- const char *sort_spec,
- const char *output_setname,
- const char **input_setnames
- )
+int zebra_sort_by_specstr (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;
}