X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=e8957c53d7228747c99efcbe8098af03d556acd9;hb=2953b2e39b289b3625e6a3a7c5a3f2b5e1d95ce8;hp=432c757ab234eac90b2370566489793c096c9f65;hpb=519fefb91135ad52134b9fc4e82b3874f5525a2b;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 432c757..e8957c5 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.89 2002-10-22 12:51:08 adam Exp $
+/* $Id: index.h,v 1.98 2003-03-26 16:41:48 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -170,8 +170,6 @@ 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);
 
-// extern Res common_resource;
-
 #define ENCODE_BUFLEN 768
 struct encode_info {
     int  sysno;  /* previously written values for delta-compress */
@@ -214,6 +212,13 @@ struct recKeys {
     int prevSeqNo;
 };
 
+#if 1
+struct sortKeys {
+    int buf_used;
+    int buf_max;
+    char *buf;
+};
+#else
 struct sortKey {
     char *string;
     int length;
@@ -221,6 +226,7 @@ struct sortKey {
     int attrUse;
     struct sortKey *next;
 };
+#endif
 
 struct zebra_register {
     char *name;
@@ -249,11 +255,12 @@ struct zebra_register {
     int stop_flag;
     int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
 
-
-
     struct recKeys keys;
+#if 1
+    struct sortKeys sortKeys;
+#else
     struct sortKey *sortKeys;
-
+#endif
     char **key_buf;
     size_t ptr_top;
     size_t ptr_i;
@@ -289,6 +296,8 @@ struct zebra_session {
     ZebraLockHandle lock_shadow;
 
     int trans_no;
+    int trans_w_no;
+
     int destroyed;
     ZebraSet sets;
     Res res;
@@ -314,7 +323,7 @@ struct zebra_session {
 
 struct rank_control {
     char *name;
-    void *(*create)(struct zebra_register *reg);
+    void *(*create)(ZebraHandle zh);
     void (*destroy)(struct zebra_register *reg, void *class_handle);
     void *(*begin)(struct zebra_register *reg, void *class_handle, RSET rset);
     void (*end)(struct zebra_register *reg, void *set_handle);
@@ -341,7 +350,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	       oid_value attributeset,
 	       int num_bases, char **basenames,
 	       int *position, int *num_entries, ZebraScanEntry **list,
-	       int *is_partial);
+	       int *is_partial, RSET limit_set, int return_zero);
 
 RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
 		 const char *term, int length_term, const char *flags,
@@ -355,7 +364,7 @@ ZebraSet resultSetGet (ZebraHandle zh, const char *name);
 ZebraSet resultSetAddRPN (ZebraHandle zh, ODR stream, ODR decode,
                           Z_RPNQuery *rpn, int num_bases,
                           char **basenames, const char *setname);
-RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId);
+RSET resultSetRef (ZebraHandle zh, const char *resultSetId);
 void resultSetDestroy (ZebraHandle zh, int num_names, char **names,
 		       int *statuses);
 
@@ -393,6 +402,8 @@ void zebraRankDestroy (struct zebra_register *reg);
 int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att);
 
 extern struct rank_control *rank1_class;
+extern struct rank_control *rankzv_class;
+extern struct rank_control *rankliv_class;
 
 int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
@@ -402,6 +413,17 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
 void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
 void zebra_index_merge (ZebraHandle zh);
 
+int bufferExtractRecord (ZebraHandle zh, 
+			 const char *buf, size_t buf_size,
+			 struct recordGroup *rGroup, 
+			 int delete_flag,
+			 int test_mode, 
+			 const char *recordType,
+			 int *sysno,
+			 const char *match_criteria,
+			 const char *fname,
+			 int force_update,
+			 int allow_update);
 
 int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
                         const char *buf, size_t buf_size,
@@ -409,7 +431,6 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
                         int test_mode, int *sysno,
                         int store_keys, int store_data,
                         const char *match_criteria);
-
 void extract_flushWriteKeys (ZebraHandle zh);
 
 struct zebra_fetch_control {
@@ -432,7 +453,7 @@ void zebra_record_int_end (void *fh, off_t offset);
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
                               int cmd, struct recKeys *reckeys);
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, struct sortKey **skp);
+                            int cmd, struct sortKeys *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);
@@ -446,6 +467,8 @@ void zebra_end_read (ZebraHandle zh);
 int zebra_file_stat (const char *file_name, struct stat *buf,
                      int follow_links);
 
+void zebra_livcode_transform(ZebraHandle zh, Z_RPNQuery *query);
+
 YAZ_END_CDECL
 
 #endif