X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fzserver.h;h=ab1e985397652df348af547c1d6ff4347556ff17;hb=5c693d36af8be6f6642257160b3c6441d2e2d762;hp=2b25cdf4216702e3c318192a542361965716fa63;hpb=3d01abbe1238c82d62e4c01eb7cac760d3d53377;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index 2b25cdf..ab1e985 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994-1997, 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.27  1997-10-27 14:33:06  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
@@ -112,6 +118,7 @@
 #include <backend.h>
 #include <rset.h>
 
+#include <sortidx.h>
 #include "index.h"
 #include "zinfo.h"
 
@@ -124,6 +131,7 @@ typedef struct ZServerSet_ {
     char *name;
     RSET rset;
     int size;
+    struct zset_sort_info *sort_info;
     struct ZServerSet_ *next;
 } ZServerSet;
    
@@ -132,12 +140,12 @@ typedef struct {
     time_t registerChange;
     ZServerSet *sets;
     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;
@@ -154,11 +162,11 @@ typedef struct {
     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,
@@ -174,7 +182,11 @@ 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);