* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zebraapi.c,v $
- * Revision 1.3 1998-05-27 16:57:44 adam
+ * 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.
*
#include <unistd.h>
#endif
+#include <diagbib1.h>
#include "zserver.h"
static int zebra_register_lock (ZebraHandle zh)
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->records = 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"));
+ }
+ zh->bfs = bfs_create (res_get (zh->res, "register"));
+ bf_lockDir (zh->bfs, res_get (zh->res, "lockDir"));
+ data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath"));
+
return zh;
}
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);
}
int i, *pos_array;
zh->errCode = 0;
- pos_array = xmalloc (sizeof(*pos_array));
+ zh->errString = NULL;
+ pos_array = xmalloc (num_recs * sizeof(*pos_array));
for (i = 0; i<num_recs; i++)
pos_array[i] = recs[i].position;
int *is_partial)
{
zh->errCode = 0;
+ zh->errString = NULL;
zebra_register_lock (zh);
rpn_scan (zh, stream, zapt, attributeset,
num_bases, basenames, position,
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,
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)
{