/*
- * Copyright (C) 1995-1998, Index Data I/S
+ * Copyright (C) 1995-1998, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zebraapi.c,v $
- * Revision 1.1 1998-03-05 08:45:13 adam
+ * Revision 1.10 1998-09-22 10:03:42 adam
+ * Changed result sets to be persistent in the sense that they can
+ * be re-searched if needed.
+ * Fixed memory leak in rsm_or.
+ *
+ * Revision 1.9 1998/09/02 13:53:17 adam
+ * Extra parameter decode added to search routines to implement
+ * persistent queries.
+ *
+ * Revision 1.8 1998/08/24 17:29:23 adam
+ * Minor changes.
+ *
+ * Revision 1.7 1998/06/24 12:16:13 adam
+ * Support for relations on text operands. Open range support in
+ * DFA module (i.e. [-j], [g-]).
+ *
+ * Revision 1.6 1998/06/22 11:36:47 adam
+ * Added authentication check facility to zebra.
+ *
+ * Revision 1.5 1998/06/13 00:14:08 adam
+ * Minor changes.
+ *
+ * Revision 1.4 1998/06/12 12:22:12 adam
+ * Work on Zebra API.
+ *
+ * Revision 1.3 1998/05/27 16:57:44 adam
+ * Zebra returns surrogate diagnostic for single records when
+ * appropriate.
+ *
+ * Revision 1.2 1998/05/20 10:12:19 adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.1 1998/03/05 08:45:13 adam
* New result set model and modular ranking system. Moved towards
* descent server API. System information stored as "SGML" records.
*
#include <unistd.h>
#endif
+#include <diagbib1.h>
#include "zserver.h"
static int zebra_register_lock (ZebraHandle zh)
zh->registerChange = lastChange;
if (zh->records)
{
- zebraExplain_close (zh->zei, 0);
+ zebraExplain_close (zh->zei, 0, 0);
dict_close (zh->dict);
sortIdx_close (zh->sortIdx);
if (zh->isam)
zh->registerState = state;
zh->records = rec_open (zh->bfs, 0);
if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0)))
+ {
+ logf (LOG_WARN, "dict_open");
return -1;
+ }
if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0)))
+ {
+ logf (LOG_WARN, "sortIdx_open");
return -1;
+ }
zh->isam = NULL;
zh->isamc = NULL;
if (!res_get_match (zh->res, "isam", "i", NULL))
{
if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC,
0, key_isamc_m(zh->res))))
+ {
+ logf (LOG_WARN, "isc_open");
return -1;
+ }
}
else
{
if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
sizeof (struct it_key), zh->res)))
+ {
+ logf (LOG_WARN, "is_open");
return -1;
+ }
}
- zh->zei = zebraExplain_open (zh->records, zh->dh, 0);
+ zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0);
return 0;
}
zebra_server_unlock (zh, zh->registerState);
}
-ZebraHandle zebra_open (const char *host, const char *configName)
+ZebraHandle zebra_open (const char *configName)
{
ZebraHandle zh = xmalloc (sizeof(*zh));
zh->registerChange = 0;
zh->records = NULL;
- zh->registered_sets = NULL;
zh->zebra_maps = zebra_maps_open (zh->res);
zh->rank_classes = NULL;
+ zh->errCode = 0;
+ zh->errString = 0;
zebraRankInstall (zh, rank1_class);
+
+ if (!res_get (zh->res, "passwd"))
+ zh->passwd_db = NULL;
+ else
+ {
+ zh->passwd_db = passwd_db_open ();
+ if (!zh->passwd_db)
+ logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed");
+ else
+ passwd_db_file (zh->passwd_db, res_get (zh->res, "passwd"));
+ }
return zh;
}
if (zh->records)
{
resultSetDestroy (zh);
- zebraExplain_close (zh->zei, 0);
+ zebraExplain_close (zh->zei, 0, 0);
dict_close (zh->dict);
sortIdx_close (zh->sortIdx);
if (zh->isam)
data1_destroy (zh->dh);
zebra_server_lock_destroy (zh);
+ if (zh->passwd_db)
+ passwd_db_close (zh->passwd_db);
res_close (zh->res);
xfree (zh);
}
-void zebra_search_rpn (ZebraHandle zh, ODR stream,
+void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode,
Z_RPNQuery *query, int num_bases, char **basenames,
const char *setname)
{
zh->errCode = 0;
zh->errString = NULL;
zh->hits = 0;
- rpn_search (zh, stream, query, num_bases, basenames, setname);
+
+ resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname);
+
zebra_register_unlock (zh);
}
ZebraPosSet poset;
int i, *pos_array;
- pos_array = xmalloc (sizeof(*pos_array));
+ zh->errCode = 0;
+ zh->errString = NULL;
+ pos_array = xmalloc (num_recs * sizeof(*pos_array));
for (i = 0; i<num_recs; i++)
pos_array[i] = recs[i].position;
}
else
{
- zh->errCode =
+ recs[i].errCode =
zebra_record_fetch (zh, poset[i].sysno, poset[i].score,
stream, input_format, comp,
&recs[i].format, &recs[i].buf,
&recs[i].len,
&recs[i].base);
+ recs[i].errString = NULL;
}
}
zebraPosSetDestroy (zh, poset, num_recs);
int *position, int *num_entries, ZebraScanEntry **entries,
int *is_partial)
{
+ zh->errCode = 0;
+ zh->errString = NULL;
zebra_register_lock (zh);
rpn_scan (zh, stream, zapt, attributeset,
num_bases, basenames, position,
}
void zebra_sort (ZebraHandle zh, ODR stream,
- int num_input_setnames, char **input_setnames,
- char *output_setname, Z_SortKeySpecList *sort_sequence,
+ int num_input_setnames, const char **input_setnames,
+ const char *output_setname, Z_SortKeySpecList *sort_sequence,
int *sort_status)
{
+ zh->errCode = 0;
+ zh->errString = NULL;
zebra_register_lock (zh);
- resultSetSort (zh, stream, num_input_setnames, input_setnames,
+ resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
output_setname, sort_sequence, sort_status);
zebra_register_unlock (zh);
}
+int zebra_errCode (ZebraHandle zh)
+{
+ return zh->errCode;
+}
+
+const char *zebra_errString (ZebraHandle zh)
+{
+ return diagbib1_str (zh->errCode);
+}
+
+char *zebra_errAdd (ZebraHandle zh)
+{
+ return zh->errString;
+}
+
+int zebra_hits (ZebraHandle zh)
+{
+ return zh->hits;
+}
+
+int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
+{
+ if (!zh->passwd_db || !passwd_db_auth (zh->passwd_db, user, pass))
+ return 0;
+ return 1;
+}
+
void zebra_setDB (ZebraHandle zh, int num_bases, char **basenames)
{