X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=ccc66ba52aa3a5936d1e8a6add8dbfefe0906640;hb=b88909df16157ed1e7859bc3fad6b01520d4865e;hp=b37becc210123db59265bb283def7fa33194f433;hpb=1285f0f6eeb151a62b69d8d3381c54ace03e55d4;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index b37becc..ccc66ba 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,5 +1,5 @@
-/* $Id: rset.h,v 1.55 2005-06-07 07:41:04 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: rset.h,v 1.59 2006-06-06 21:01:30 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -58,14 +58,18 @@ struct rset_term {
 		       This info is used to return encoded term back for
 		       search-result-1 .
 		   */
+    int reg_type;  /** register type */
     RSET rset;     /** the rset corresponding to this term */
     void *rankpriv;/** private stuff for the ranking algorithm */
+    zint hits_limit;/** limit for hits if > 0 */
+    char *ref_id;  /** reference for this term */
     struct ord_list *ol;
 };
 
 typedef struct rset_term *TERMID; 
 TERMID rset_term_create (const char *name, int length, const char *flags,
-			 int type, NMEM nmem, struct ord_list *ol);
+			 int type, NMEM nmem, struct ord_list *ol,
+			 int reg_type, zint hits_limit, const char *ref_id);
 
 /** rsfd is a "file descriptor" for reading from a rset */
 struct rsfd {  /* the stuff common to all rsfd's. */
@@ -222,33 +226,27 @@ void rset_close(RSFD rfd);
 /** rset_count counts or estimates the keys in it*/
 zint rset_count(RSET rs);
 
-RSET rstemp_create(NMEM nmem, struct rset_key_control *kcontrol,
-                    int scope, const char *temp_path, TERMID term);
+RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol,
+                      int scope, const char *temp_path, TERMID term);
 
-RSET rsnull_create(NMEM nmem, struct rset_key_control *kcontrol, TERMID term);
+RSET rset_create_null(NMEM nmem, struct rset_key_control *kcontrol, TERMID term);
 
-RSET rsbool_create_and(NMEM nmem, struct rset_key_control *kcontrol,
-		       int scope, RSET rset_l, RSET rset_r);
+RSET rset_create_not(NMEM nmem, struct rset_key_control *kcontrol,
+                     int scope, RSET rset_l, RSET rset_r);
 
-RSET rsbool_create_or(NMEM nmem, struct rset_key_control *kcontrol,
-		      int scope, RSET rset_l, RSET rset_r);
+RSET rset_create_between(NMEM nmem, struct rset_key_control *kcontrol,
+                         int scope, RSET rset_l, RSET rset_m, RSET rset_r, 
+                         RSET rset_attr);
 
-RSET rsbool_create_not(NMEM nmem, struct rset_key_control *kcontrol,
-		       int scope, RSET rset_l, RSET rset_r);
+RSET rset_create_or(NMEM nmem, struct rset_key_control *kcontrol,
+                          int scope, TERMID termid, int no_rsets, RSET* rsets);
 
-RSET rsbetween_create(NMEM nmem, struct rset_key_control *kcontrol,
-		      int scope, RSET rset_l, RSET rset_m, RSET rset_r, 
-		      RSET rset_attr);
+RSET rset_create_and(NMEM nmem, struct rset_key_control *kcontrol,
+                     int scope, int no_rsets, RSET* rsets);
 
-RSET rsmulti_or_create(NMEM nmem, struct rset_key_control *kcontrol,
-		       int scope, TERMID termid, int no_rsets, RSET* rsets);
-
-RSET rsmulti_and_create(NMEM nmem, struct rset_key_control *kcontrol,
-			int scope, int no_rsets, RSET* rsets);
-
-RSET rsprox_create(NMEM nmem, struct rset_key_control *kcontrol,
-		   int scope, int rset_no, RSET *rset,
-		   int ordered, int exclusion, int relation, int distance);
+RSET rset_create_prox(NMEM nmem, struct rset_key_control *kcontrol,
+                      int scope, int rset_no, RSET *rset,
+                      int ordered, int exclusion, int relation, int distance);
 
 RSET rsisamb_create(NMEM nmem, struct rset_key_control *kcontrol,
 		    int scope, ISAMB is, ISAM_P pos, TERMID term);
@@ -264,3 +262,11 @@ void rset_visit(RSET rset, int level);
 YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+