X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=0b49c28a777844bfda6d7840b63e4a6fa661e5b9;hb=43506dd0ff92373604bb7288e2dcc943b2c1d524;hp=0c2f050f57a0095658290a671df25d8473b6d597;hpb=e19bd45069a282b054015f9cf88e109968b9fa7f;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 0c2f050..0b49c28 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,26 @@
 /*
- * Copyright (C) 1994-1998, Index Data 
+ * Copyright (C) 1994-1999, Index Data 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.40  1998-11-16 16:03:45  adam
+ * Revision 1.45  1999-11-30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.44  1999/11/04 15:00:45  adam
+ * Implemented delete result set(s).
+ *
+ * Revision 1.43  1999/07/14 10:59:27  adam
+ * Changed functions isc_getmethod, isams_getmethod.
+ * Improved fatal error handling (such as missing EXPLAIN schema).
+ *
+ * Revision 1.42  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.41  1999/05/12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.40  1998/11/16 16:03:45  adam
  * Moved loggin utilities to Yaz. Was implemented in file zlogs.c.
  *
  * Revision 1.39  1998/10/16 08:14:35  adam
@@ -143,20 +159,11 @@
  *
  */
 
-
-#ifndef USE_TIMES
-#ifdef __linux__
-#define USE_TIMES 1
-#else
-#define USE_TIMES 0
-#endif
-#endif
-
-#if USE_TIMES
+#if HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
 
-#include <backend.h>
+#include <yaz/backend.h>
 #include <rset.h>
 
 #include <sortidx.h>
@@ -165,6 +172,10 @@
 #include "zebraapi.h"
 #include "zinfo.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     int sysno;
     int score;
@@ -185,8 +196,11 @@ struct zebra_info {
     ZebraSet sets;
     Dict dict;
     SortIdx sortIdx;
+    ISAMS isams;
+#if ZMBOL
     ISAM isam;
     ISAMC isamc;
+#endif
     Records records;
     int errCode;
     int hits;
@@ -199,7 +213,7 @@ struct zebra_info {
     ZebraLockHandle server_lock_cmt;
     ZebraLockHandle server_lock_org;
     char *server_path_prefix;
-#if USE_TIMES
+#if HAVE_SYS_TIMES_H
     struct tms tms1;
     struct tms tms2;    
 #endif
@@ -209,7 +223,6 @@ struct zebra_info {
     Passwd_db passwd_db;
 };
 
-
 struct rank_control {
     char *name;
     void *(*create)(ZebraHandle zh);
@@ -231,7 +244,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	       int *position, int *num_entries, ZebraScanEntry **list,
 	       int *is_partial);
 
-RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no,
+RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
 		 const char *term, int length_term, const char *flags);
 
 ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov);
@@ -239,7 +252,8 @@ ZebraSet resultSetGet (ZebraHandle zh, const char *name);
 ZebraSet resultSetAddRPN (ZebraHandle zh, ODR stream, ODR decode,                                         Z_RPNQuery *rpn, int num_bases, char **basenames,
                           const char *setname);
 RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId);
-void resultSetDestroy (ZebraHandle zh);
+void resultSetDestroy (ZebraHandle zh, int num_names, char **names,
+		       int *statuses);
 
 ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
 			       int num, int *positions);
@@ -284,3 +298,6 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
 			oid_value *output_format, char **rec_bufp,
 			int *rec_lenp, char **basenamep);
 
+#ifdef __cplusplus
+}
+#endif