X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=ab1e985397652df348af547c1d6ff4347556ff17;hb=b306d131fe1c06ca1d313f3b04a159b4a3a376f9;hp=447d6afea4a76b3be8c8185e247ebf0e95bafae5;hpb=4e45c8e2e01c52e8d03dbd9a0873a9e2ff7e5f91;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 447d6af..ab1e985 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,48 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.18  1996-05-14 06:16:50  adam
+ * Revision 1.29  1998-02-10 12:03:06  adam
+ * Implemented Sort.
+ *
+ * Revision 1.28  1998/01/29 13:40:11  adam
+ * Better logging for scan service.
+ *
+ * Revision 1.27  1997/10/27 14:33:06  adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * Revision 1.26  1997/09/29 12:41:35  adam
+ * Fixed bug regarding USE_TIMES var.
+ *
+ * Revision 1.25  1997/09/29 09:08:36  adam
+ * Revised locking system to be thread safe for the server.
+ *
+ * Revision 1.24  1997/09/17 12:19:19  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.23  1996/12/23 15:30:46  adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.22  1996/11/04 14:07:49  adam
+ * Moved truncation code to trunc.c.
+ *
+ * Revision 1.21  1996/10/29 14:09:58  adam
+ * Use of cisam system - enabled if setting isamc is 1.
+ *
+ * Revision 1.20  1996/06/04 10:19:02  adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.19  1996/05/14  11:34:01  adam
+ * Scan support in multiple registers/databases.
+ *
+ * Revision 1.18  1996/05/14  06:16:50  adam
  * Compact use/set bytes used in search service.
  *
  * Revision 1.17  1995/12/08 16:22:57  adam
@@ -64,9 +102,23 @@
  *
  */
 
+
+#ifndef USE_TIMES
+#ifdef __linux__
+#define USE_TIMES 1
+#else
+#define USE_TIMES 0
+#endif
+#endif
+
+#if USE_TIMES
+#include <sys/times.h>
+#endif
+
 #include <backend.h>
 #include <rset.h>
 
+#include <sortidx.h>
 #include "index.h"
 #include "zinfo.h"
 
@@ -79,6 +131,7 @@ typedef struct ZServerSet_ {
     char *name;
     RSET rset;
     int size;
+    struct zset_sort_info *sort_info;
     struct ZServerSet_ *next;
 } ZServerSet;
    
@@ -86,32 +139,65 @@ typedef struct {
     int registerState; /* 0 (no commit pages), 1 (use commit pages) */
     time_t registerChange;
     ZServerSet *sets;
-    Dict wordDict;
-    ISAM wordIsam;
+    Dict dict;
+    SortIdx sortIdx;
+    ISAM isam;
+    ISAMC isamc;
     Records records;
     int errCode;
     char *errString;
-    ODR odr;
     ZebTargetInfo *zti;
+    data1_handle dh;
+    data1_attset *registered_sets;
+    BFiles bfs;
+    Res res;
+
+    ZebraLockHandle server_lock_cmt;
+    ZebraLockHandle server_lock_org;
+    char *server_path_prefix;
+#if USE_TIMES
+    struct tms tms1;
+    struct tms tms2;    
+#endif
+    ZebraMaps zebra_maps;
 } ZServerInfo;
 
-int rpn_search (ZServerInfo *zi, 
+int rpn_search (ZServerInfo *zi, ODR stream,
                 Z_RPNQuery *rpn, int num_bases, char **basenames, 
                 const char *setname, int *hits);
 
-int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt,
+int rpn_scan (ZServerInfo *zi, ODR stream, Z_AttributesPlusTerm *zapt,
+              oid_value attributeset,
               int num_bases, char **basenames,
               int *position, int *num_entries, struct scan_entry **list,
               int *status);
 
+RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no);
+
 ZServerSet *resultSetAdd (ZServerInfo *zi, const char *name,
                           int ov, RSET rset);
 ZServerSet *resultSetGet (ZServerInfo *zi, const char *name);
+void resultSetDestroy (ZServerInfo *zi);
+
 ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
                                     int num, int *positions);
 void resultSetSysnoDel (ZServerInfo *zi, ZServerSetSysno *records, int num);
+
+int resultSetSort (ZServerInfo *zi, bend_sort_rr *rr);
+
 void zlog_rpn (Z_RPNQuery *rpn);
+void zlog_scan (Z_AttributesPlusTerm *zapt, oid_value ast);
+
+int zebra_server_lock_init (ZServerInfo *zi);
+int zebra_server_lock_destroy (ZServerInfo *zi);
+int zebra_server_lock (ZServerInfo *zi, int lockCommit);
+void zebra_server_unlock (ZServerInfo *zi, int commitPhase);
+int zebra_server_lock_get_state (ZServerInfo *zi, time_t *timep);
+
+typedef struct attent
+{
+    int attset_ordinal;
+    data1_local_attribute *local_attributes;
+} attent;
 
-int zebraServerLock (int lockCommit);
-void zebraServerUnlock (int commitPhase);
-int zebraServerLockGetState (time_t *timep);
+int att_getentbyatt(ZServerInfo *zi, attent *res, oid_value set, int att);