X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=e3045f74f9f046139aaa5818338dd79a8cfa7075;hb=d089fa72c83a673c788d828687dbec88fe9d1c4a;hp=aa33cc54ebcd3a8637dd2b88837fbdc25f1d9fab;hpb=fc83d98d346711f446d9f9a29cc2ff0eee398053;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index aa33cc5..e3045f7 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.165 2006-05-30 13:21:14 adam Exp $
+/* $Id: index.h,v 1.170 2006-07-04 14:10:29 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -104,6 +104,7 @@ int key_compare (const void *p1, const void *p2);
 void key_init(struct it_key *k);
 char *key_print_it (const void *p, char *buf);
 zint key_get_seq (const void *p);
+zint key_get_segment (const void *p);
 int key_compare_it (const void *p1, const void *p2);
 int key_qsort_compare (const void *p1, const void *p2);
 void key_logdump (int mask, const void *p);
@@ -148,25 +149,6 @@ void zebra_lock_prefix (Res res, char *dst);
 int key_SU_decode (int *ch, const unsigned char *out);
 int key_SU_encode (int ch, char *out);
 
-#define ENCODE_BUFLEN 768
-struct encode_info {
-    int  sysno;  /* previously written values for delta-compress */
-    int  seqno;
-    int  cmd;
-    int prevsys; /* buffer for skipping insert/delete pairs */
-    int prevseq;
-    int prevcmd;
-    int keylen; /* tells if we have an unwritten key in buf, and how long*/
-    void *encode_handle;
-    void *decode_handle;
-    char buf[ENCODE_BUFLEN];
-};
-
-void encode_key_init (struct encode_info *i);
-char *encode_key_int (int d, char *bp);
-void encode_key_write (char *k, struct encode_info *i, FILE *outf);
-void encode_key_flush (struct encode_info *i, FILE *outf);
-
 typedef struct zebra_set *ZebraSet;
 
 typedef struct zebra_rank_class {
@@ -368,16 +350,16 @@ void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
 
 void zebra_index_merge (ZebraHandle zh);
 
-ZEBRA_RES buffer_extract_record (ZebraHandle zh, 
-				 const char *buf, size_t buf_size,
-				 int delete_flag,
-				 int test_mode, 
-				 const char *recordType,
-				 SYSNO *sysno,
-				 const char *match_criteria,
-				 const char *fname,
-				 int force_update,
-				 int allow_update);
+ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, 
+                                      const char *buf, size_t buf_size,
+                                      int delete_flag,
+                                      int test_mode, 
+                                      const char *recordType,
+                                      SYSNO *sysno,
+                                      const char *match_criteria,
+                                      const char *fname,
+                                      int force_update,
+                                      int allow_update);
 
 #if 0
 int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
@@ -413,14 +395,7 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys,
 ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 				    zint sysno, zebra_snippets *snippets);
 
-void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, zebra_rec_keys_t reckeys,
-			      zint staticrank);
-void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, zebra_rec_keys_t skp);
-void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
-void extract_token_add (RecWord *p);
-int explain_extract (void *handle, Record rec, data1_node *n);
+ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n);
 
 ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
 			     int deleteFlag);
@@ -462,6 +437,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,
                                   oid_value curAttributeSet,
                                   int *ord);