Improved installation. Updated for inclusion of YAZ header files.

[idzebra-moved-to-github.git] / index / zserver.h

diff --git a/index/zserver.h b/index/zserver.h
index 7bebbad..0b49c28 100644 (file)
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,32 @@
 /*
- * 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.38  1998-09-22 10:03:44  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
+ * Updated record control system.
+ *
+ * Revision 1.38  1998/09/22 10:03:44  adam
  * Changed result sets to be persistent in the sense that they can
  * be re-searched if needed.
  * Fixed memory leak in rsm_or.
@@ -137,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>
@@ -159,6 +172,10 @@
 #include "zebraapi.h"
 #include "zinfo.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     int sysno;
     int score;
@@ -179,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;
@@ -193,16 +213,16 @@ 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
     ZebraMaps zebra_maps;
     ZebraRankClass rank_classes;
+    RecTypes recTypes;
     Passwd_db passwd_db;
 };
 
-
 struct rank_control {
     char *name;
     void *(*create)(ZebraHandle zh);
@@ -224,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);
@@ -232,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);
@@ -252,9 +273,6 @@ void zebra_sort (ZebraHandle zh, ODR stream,
                 const char *output_setname, Z_SortKeySpecList *sort_sequence,
                 int *sort_status);
 
-void zlog_rpn (Z_RPNQuery *rpn);
-void zlog_scan (Z_AttributesPlusTerm *zapt, oid_value ast);
-
 int zebra_server_lock_init (ZebraHandle zh);
 int zebra_server_lock_destroy (ZebraHandle zh);
 int zebra_server_lock (ZebraHandle zh, int lockCommit);
@@ -280,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