X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=82480b5ed9d7da2572d6d3401b13efc313efc1f5;hb=3168ab325caf86d3bac38c33f7d3b701d1110539;hp=a71660157a548ab758aa704ed31b617a7451788a;hpb=ac300df2169e3dcbdf9ab726349925cc3a122028;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index a716601..82480b5 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.157 2006-03-26 14:17:01 adam Exp $
+/* $Id: index.h,v 1.159 2006-05-03 09:31:26 marc Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -308,23 +308,6 @@ struct zebra_session {
     struct zebra_limit *m_limit;
 };
 
-struct rank_control {
-    char *name;
-    void *(*create)(ZebraHandle zh);
-    void (*destroy)(struct zebra_register *reg, void *class_handle);
-    void *(*begin)(struct zebra_register *reg, 
-                   void *class_handle, RSET rset, NMEM nmem,
-                   TERMID *terms, int numterms);
-    /* ### Could add parameters to begin:
-     *	char *index;	// author, title, etc.
-     *	int dbsize;	// number of records in database
-     *	int rssize;	// number of records in result set (estimate?)
-     */
-    void (*end)(struct zebra_register *reg, void *set_handle);
-    int (*calc)(void *set_handle, zint sysno, zint staticrank,
-		int *stop_flag);
-    void (*add)(void *set_handle, int seqno, TERMID term);
-};
 
 struct term_set_entry {
     char *term;
@@ -401,17 +384,9 @@ typedef struct attent
     data1_local_attribute *local_attributes;
 } attent;
 
-void zebraRankInstall (struct zebra_register *reg, struct rank_control *ctrl);
-ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name);
-void zebraRankDestroy (struct zebra_register *reg);
-
 int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att,
 		const char *sattr);
 
-extern struct rank_control *rank_1_class;
-extern struct rank_control *rank_zv_class;
-extern struct rank_control *rank_static_class;
-
 int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, 
 			zebra_snippets *hit_snippet, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
@@ -482,8 +457,8 @@ 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);
 
-int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
-		 int deleteFlag);
+ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
+			     int deleteFlag);
 
 ZEBRA_RES zebra_begin_read (ZebraHandle zh);
 ZEBRA_RES zebra_end_read (ZebraHandle zh);