X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Findex.h;h=f795dafd31667ca2cb8a497cb71a27a527a60280;hp=6ffa33e46d671cb4f4884ef1d17a04a0d14cee5e;hb=e7cf9381a4b902cb2b91053f80ab7899b7d5bb00;hpb=f7a3769dede0071696bdcc13ae2ee1efe6d52d96

diff --git a/index/index.h b/index/index.h
index 6ffa33e..f795daf 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.161 2006-05-18 12:03:05 adam Exp $
+/* $Id: index.h,v 1.164 2006-05-19 23:45:29 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -132,10 +132,6 @@ int strtab_src (struct strtab *t, const char *name, void ***infop);
 void strtab_del (struct strtab *t,
                  void (*func)(const char *name, void *info, void *data),
                  void *data);
-int index_char_cvt (int c);
-int index_word_prefix (char *string, int attset_ordinal,
-                       int local_attribute, const char *databaseName);
-
 
 void zebraIndexLockMsg (ZebraHandle zh, const char *str);
 void zebraIndexUnlock (ZebraHandle zh);
@@ -149,8 +145,6 @@ void zebra_lock_prefix (Res res, char *dst);
 #define FNAME_ORG_LOCK    "zebraorg.LCK"
 #define FNAME_TOUCH_TIME  "zebraidx.time"
 
-void zebra_load_atts (data1_handle dh, Res res);
-
 int key_SU_decode (int *ch, const unsigned char *out);
 int key_SU_encode (int ch, char *out);
 
@@ -334,9 +328,9 @@ RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
 		struct ord_list *ol, int reg_type,
 		zint hits_limit, const char *term_ref_id);
 
-void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
-		       const char *db, int set,
-		       int use, const char *term);
+void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type,
+                      const char *db, const char *index_name,
+                      const char *term);
 ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov);
 ZebraSet resultSetGet (ZebraHandle zh, const char *name);
 ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
@@ -363,15 +357,6 @@ int zebra_server_lock (ZebraService zh, int lockCommit);
 void zebra_server_unlock (ZebraService zh, int commitPhase);
 int zebra_server_lock_get_state (ZebraService zh, time_t *timep);
 
-typedef struct attent
-{
-    int attset_ordinal;
-    data1_local_attribute *local_attributes;
-} attent;
-
-int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att,
-		const char *sattr);
-
 int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, 
 			zebra_snippets *hit_snippet, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
@@ -468,6 +453,24 @@ ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno);
 void zebra_term_untrans(ZebraHandle zh, int reg_type,
 			char *dst, const char *src);
 
+ZEBRA_RES zebra_apt_get_ord(ZebraHandle zh,
+                            Z_AttributesPlusTerm *zapt,
+                            int index_type,
+                            const char *xpath_use,
+                            oid_value curAttributeSet,
+                            int *ord);
+
+ZEBRA_RES zebra_attr_list_get_ord(ZebraHandle zh,
+                                  Z_AttributeList *attr_list,
+                                  int index_type,
+                                  oid_value curAttributeSet,
+                                  int *ord);
+
+ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh,
+                             Z_SortAttributes *sortAttributes,
+                             int *ord,
+                             int *numerical);
+
 YAZ_END_CDECL
 
 #endif