X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.h;h=2935fef2d563d77917d0c4fe87fcb1d7d01b35db;hb=b9ba556f29428d79db2a874b1a33504290125216;hp=f092167cd6810f0b4451809df6e30895ea6d4ff7;hpb=b718b0a9f4aaf52d38031bfb82d0d539e50332d6;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.h b/index/zebraapi.h
index f092167..2935fef 100644
--- a/index/zebraapi.h
+++ b/index/zebraapi.h
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.h,v $
- * Revision 1.7  1999-11-04 15:00:45  adam
+ * Revision 1.12  2000-04-05 09:49:35  adam
+ * On Unix, zebra/z'mbol uses automake.
+ *
+ * Revision 1.11  2000/03/20 19:08:36  adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * Revision 1.10  2000/03/15 15:00:31  adam
+ * First work on threaded version.
+ *
+ * Revision 1.9  2000/02/24 12:31:17  adam
+ * Added zebra_string_norm.
+ *
+ * Revision 1.8  1999/11/30 13:48:03  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.7  1999/11/04 15:00:45  adam
  * Implemented delete result set(s).
  *
  * Revision 1.6  1999/02/17 11:29:57  adam
@@ -28,13 +44,11 @@
  *
  */
 
-#include <odr.h>
-#include <oid.h>
-#include <proto.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
+#include <yaz/proto.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 /* Retrieval Record Descriptor */
 typedef struct {
@@ -53,10 +67,11 @@ typedef struct {
     char *term;          /* scan term string */
 } ZebraScanEntry;
 
-typedef struct zebra_info *ZebraHandle;
+typedef struct zebra_session *ZebraHandle;
+typedef struct zebra_service *ZebraService;
 
 /* Open Zebra using file 'configName' (usually zebra.cfg) */
-YAZ_EXPORT ZebraHandle zebra_open (const char *configName);
+YAZ_EXPORT ZebraHandle zebra_open (ZebraService zs);
 
 /* Search using RPN-Query */
 YAZ_EXPORT void zebra_search_rpn (ZebraHandle zh, ODR input, ODR output,
@@ -98,8 +113,28 @@ YAZ_EXPORT char *zebra_errAdd (ZebraHandle zh);
 YAZ_EXPORT int zebra_hits (ZebraHandle zh);
 
 /* do authentication */
-YAZ_EXPORT int zebra_auth (ZebraHandle zh, const char *user, const char *pass);
+YAZ_EXPORT int zebra_auth (ZebraService zh, const char *user, const char *pass);
+
+/* Character normalisation on specific register .
+   This routine is subject to change - do not use. */
+YAZ_EXPORT int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
+				  const char *input_str, int input_len,
+				  char *output_str, int output_len);
+
+YAZ_EXPORT void zebra_admin_create (ZebraHandle zh, const char *db);
+
+YAZ_EXPORT ZebraService zebra_start (const char *configName);
+YAZ_EXPORT void zebra_stop (ZebraService zs);
+
+YAZ_EXPORT void zebra_admin_shutdown (ZebraHandle zh);
+YAZ_EXPORT void zebra_admin_start (ZebraHandle zh);
+
+YAZ_EXPORT void zebra_shutdown (ZebraService zs);
+
+YAZ_EXPORT void zebra_admin_import_begin (ZebraHandle zh, const char *database);
+
+YAZ_EXPORT void zebra_admin_import_segment (ZebraHandle zh,
+					    Z_Segment *segment);
 
-#ifdef __cplusplus
-}
-#endif
+void zebra_admin_import_end (ZebraHandle zh);
+YAZ_END_CDECL