X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Findex.h;h=a123b30aa2ed53c63d642c43d18a9174a9cfa390;hp=8478bde49b9a6e14643d35e343fc900312ec590c;hb=f82c996895d8dcd69e987660ebf9fdaafdba35b0;hpb=5623222cf968d493c2bc9506c42b8344de60c4e5

diff --git a/index/index.h b/index/index.h
index 8478bde..a123b30 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.200 2007-08-21 13:27:04 adam Exp $
+/* $Id: index.h,v 1.212 2007-12-03 13:04:04 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <idzebra/util.h>
 #include <idzebra/flock.h>
 #include <sortidx.h>
-
 #if HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
@@ -144,7 +143,7 @@ struct zebra_register {
 
     char *server_path_prefix;
     data1_handle dh;
-    ZebraMaps zebra_maps;
+    zebra_maps_t zebra_maps;
     ZebraRankClass rank_classes;
     RecTypes recTypes;
     int seqno;
@@ -264,7 +263,7 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
 			 const Odr_oid *attributeSet, 
 			 NMEM stream, NMEM rset_nmem,
 			 Z_SortKeySpecList *sort_sequence,
-			 int num_bases, char **basenames,
+			 int num_bases, const char **basenames,
 			 RSET *result_set);
 
 ZEBRA_RES rpn_get_top_approx_limit(ZebraHandle zh, Z_RPNStructure *zs,
@@ -274,15 +273,18 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
                    const Odr_oid *attributeset,
                    int num_bases, char **basenames,
                    int *position, int *num_entries, ZebraScanEntry **list,
-                   int *is_partial, RSET limit_set);
+                   int *is_partial, const char *set_name);
 
 RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
 		const char *term, int length_term, const char *flags,
 		int preserve_position, int term_type, NMEM rset_nmem,
 		struct rset_key_control *kctrl, int scope,
-		struct ord_list *ol, int reg_type,
+		struct ord_list *ol, const char *index_type,
 		zint hits_limit, const char *term_ref_id);
 
+ZEBRA_RES resultSetGetBaseNames(ZebraHandle zh, const char *setname,
+                                const char ***basenames, int *num_bases);
+
 void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type,
                       const char *db, const char *index_name,
                       const char *term);
@@ -309,7 +311,7 @@ void resultSetInvalidate(ZebraHandle zh);
 
 int zebra_record_fetch(ZebraHandle zh, const char *setname,
                        zint sysno, int score, 
-                       zebra_snippets *hit_snippet, ODR stream,
+                       ODR stream,
                        const Odr_oid *input_format, Z_RecordComposition *comp,
                        const Odr_oid **output_format, char **rec_bufp,
                        int *rec_lenp, char **basenamep,
@@ -375,17 +377,18 @@ Dict dict_open_res(BFiles bfs, const char *name, int cache, int rw,
 void zebra_setError(ZebraHandle zh, int code, const char *addinfo);
 void zebra_setError_zint(ZebraHandle zh, int code, zint i);
 
-void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
+void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, 
+                              const char *index_type,
 			      char **dst, const char *src);
 
 ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno);
 
-void zebra_term_untrans(ZebraHandle zh, int reg_type,
+void zebra_term_untrans(ZebraHandle zh, const char *index_type,
 			char *dst, const char *src);
 
 ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
                             Z_AttributesPlusTerm *zapt,
-                            int index_type,
+                            const char *index_type,
                             const char *xpath_use,
                             const Odr_oid *curAttributeSet,
                             int *ord);
@@ -393,7 +396,7 @@ ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
 ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
                                   Z_AttributeList *attr_list,
                                   zinfo_index_category_t cat,
-                                  int index_type,
+                                  const char *index_type,
                                   const Odr_oid *curAttributeSet,
                                   int *ord);
 
@@ -409,11 +412,11 @@ ZEBRA_RES zebra_remove_file_match(ZebraHandle zh);
 
 struct rpn_char_map_info
 {
-    ZebraMaps zm;
+    zebra_map_t zm;
     int reg_type;
 };
 
-void rpn_char_map_prepare(struct zebra_register *reg, int reg_type,
+void rpn_char_map_prepare(struct zebra_register *reg, zebra_map_t zm,
                           struct rpn_char_map_info *map_info);
 
 ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
@@ -428,6 +431,31 @@ int zebra_check_res(Res res);
 #define FIRST_IN_FIELD_CHAR 1
 #define FIRST_IN_FIELD_LEN 2
 
+ZEBRA_RES zebra_term_limits_APT(ZebraHandle zh,
+                                Z_AttributesPlusTerm *zapt,
+                                zint *hits_limit_value,
+                                const char **term_ref_id_str,
+                                NMEM nmem);
+
+ZEBRA_RES rpn_facet(ZebraHandle zh, ODR stream,
+                    Z_AttributesPlusTerm *zapt,
+                    const Odr_oid *attributeset,
+                    int *position, int *num_entries, 
+                    ZebraScanEntry **list,
+                    int *is_partial, const char *set_name);
+
+ZEBRA_RES zebra_result_recid_to_sysno(ZebraHandle zh, 
+                                      const char *setname,
+                                      zint recid,
+                                      zint *sysnos, int *no_sysnos);
+
+void zebra_count_set(ZebraHandle zh, RSET rset, zint *count,
+                     zint approx_limit);
+
+RSET zebra_create_rset_isam(ZebraHandle zh,
+                            NMEM rset_nmem, struct rset_key_control *kctl,
+                            int scope, ISAM_P pos, TERMID termid);
+
 YAZ_END_CDECL
 
 #endif