X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=a03ee21d72d9c1933c2983eefdc2864c3fd589ab;hb=6f7dfe3c3f09f7104c1ae7616c9d207edeab308d;hp=8738d1aa178e80b2aad597647704bcb8e0032dcb;hpb=6988ba91e363565638c27a8d5895ad9afc409e75;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 8738d1a..a03ee21 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.199 2007-08-21 11:06:47 adam Exp $
+/* $Id: index.h,v 1.203 2007-10-30 19:17:15 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <idzebra/util.h>
 #include <idzebra/flock.h>
 #include <sortidx.h>
-
+#include <index_types.h>
 #if HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
@@ -144,7 +144,8 @@ struct zebra_register {
 
     char *server_path_prefix;
     data1_handle dh;
-    ZebraMaps zebra_maps;
+    zebra_index_types_t index_types;
+    zebra_maps_t zebra_maps;
     ZebraRankClass rank_classes;
     RecTypes recTypes;
     int seqno;
@@ -280,7 +281,7 @@ 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);
 
 void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type,
@@ -321,6 +322,9 @@ void extract_snippet(ZebraHandle zh, zebra_snippets *sn,
                      struct ZebraRecStream *stream, RecType rt,
                      void *recTypeClientData);
 
+int zebra_get_rec_snippets(ZebraHandle zh, zint sysno,
+                           zebra_snippets *snippets);
+
 void zebra_index_merge(ZebraHandle zh);
 
 ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, 
@@ -382,7 +386,7 @@ void zebra_term_untrans(ZebraHandle zh, int reg_type,
 
 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);
@@ -390,7 +394,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);
 
@@ -406,11 +410,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,