X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=8ef083553a0f73a38df4cc77d6226e1e5538d545;hb=91056985a65db6893bb136a9f92402dadfed659a;hp=76e1bd49bf50dc9ab563ae554c5349434e07c0a4;hpb=bfe7ce5c9c47f3f4ad1ac76d4232b9807d5ee158;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 76e1bd4..8ef0835 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.206 2007-11-01 14:56:07 adam Exp $
+/* $Id: index.h,v 1.213 2007-12-13 11:09:20 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>
-#include <index_types.h>
 #if HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
@@ -144,7 +143,6 @@ struct zebra_register {
 
     char *server_path_prefix;
     data1_handle dh;
-    zebra_index_types_t index_types;
     zebra_maps_t zebra_maps;
     ZebraRankClass rank_classes;
     RecTypes recTypes;
@@ -265,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,
@@ -275,7 +273,7 @@ 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,
@@ -284,6 +282,9 @@ RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
 		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);
@@ -310,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,
@@ -376,14 +377,14 @@ 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, 
-                              const char *index_type,
-			      char **dst, const char *src);
+int 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, const char *index_type,
-			char *dst, const char *src);
+int 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,
@@ -436,14 +437,17 @@ ZEBRA_RES zebra_term_limits_APT(ZebraHandle zh,
                                 const char **term_ref_id_str,
                                 NMEM nmem);
 
-ZEBRA_RES rpn_facet(ZebraHandle zh, ODR stream, NMEM nmem,
-                    struct rset_key_control *kc,
-                    Z_AttributesPlusTerm *zapt,
-                    int *position, int *num_entries, 
-                    ZebraScanEntry **list,
-                    int *is_partial, RSET limit_set,
-                    const char *index_type,
-                    int ord_no, int *ords);
+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