X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=index%2Fzserver.h;h=b59eecc32b2e10d4e34a64044dd68f5b4f122f8b;hb=4247c4670f5bc5ad61e458734a590d57be5a9f34;hp=dd9335238b01010fab0de4f9c7bdeeb65c6a4e42;hpb=ce3907338568fce46c5751e7e1091a5ad1c8e291;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index dd93352..b59eecc 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.30  1998-03-05 08:45:13  adam
+ * Revision 1.34  1998-06-22 11:36:50  adam
+ * Added authentication check facility to zebra.
+ *
+ * Revision 1.33  1998/06/12 12:22:14  adam
+ * Work on Zebra API.
+ *
+ * Revision 1.32  1998/05/27 16:57:47  adam
+ * Zebra returns surrogate diagnostic for single records when
+ * appropriate.
+ *
+ * Revision 1.31  1998/05/20 10:12:23  adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.30  1998/03/05 08:45:13  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -123,7 +137,9 @@
 #include <rset.h>
 
 #include <sortidx.h>
+#include <passwddb.h>
 #include "index.h"
+#include "zebraapi.h"
 #include "zinfo.h"
 
 typedef struct {
@@ -139,7 +155,7 @@ typedef struct zebra_rank_class {
     void *class_handle;
     struct zebra_rank_class *next;
 } *ZebraRankClass;
-   
+
 struct zebra_info {
     int registerState; /* 0 (no commit pages), 1 (use commit pages) */
     time_t registerChange;
@@ -154,7 +170,6 @@ struct zebra_info {
     char *errString;
     ZebraExplainInfo zei;
     data1_handle dh;
-    data1_attset *registered_sets;
     BFiles bfs;
     Res res;
 
@@ -167,9 +182,9 @@ struct zebra_info {
 #endif
     ZebraMaps zebra_maps;
     ZebraRankClass rank_classes;
+    Passwd_db passwd_db;
 };
 
-typedef struct zebra_info *ZebraHandle;
 
 struct rank_control {
     char *name;
@@ -186,11 +201,6 @@ void rpn_search (ZebraHandle zh, ODR stream,
 		 const char *setname);
 
 
-typedef struct {
-    int occurrences;
-    char *term;
-} ZebraScanEntry;
-
 void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	       oid_value attributeset,
 	       int num_bases, char **basenames,
@@ -243,34 +253,8 @@ int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att);
 
 extern struct rank_control *rank1_class;
 
-ZebraHandle zebra_open (const char *host, const char *configName);
-void zebra_search_rpn (ZebraHandle zh, ODR stream,
-		       Z_RPNQuery *query, int num_bases, char **basenames, 
-		       const char *setname);
-
-typedef struct {
-    int position;
-    char *buf;
-    int len;
-    oid_value format;
-    char *base;
-} ZebraRetrievalRecord;
-
-void zebra_records_retrieve (ZebraHandle zh, ODR stream,
-			     const char *setname, Z_RecordComposition *comp,
-			     oid_value input_format,
-			     int num_recs, ZebraRetrievalRecord *recs);
-
 int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
 			oid_value *output_format, char **rec_bufp,
 			int *rec_lenp, char **basenamep);
 
-void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
-		 oid_value attributeset,
-		 int num_bases, char **basenames,
-		 int *position, int *num_entries, ZebraScanEntry **list,
-		 int *is_partial);
-
-void zebra_close (ZebraHandle zh);
-