X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzinfo.h;h=5de0d4462e468416403ce8cb5e8fe15c1a23cb68;hb=8c1d8b5e863e1375f9e25c4e11c8443f11c22496;hp=a3175b56e3272d66a7d5835e7694f4e45e1dfdbd;hpb=5a8a42bede922e70156e7b289db071592c71529b;p=idzebra-moved-to-github.git

diff --git a/index/zinfo.h b/index/zinfo.h
index a3175b5..5de0d44 100644
--- a/index/zinfo.h
+++ b/index/zinfo.h
@@ -1,8 +1,5 @@
-/* $Id: zinfo.h,v 1.38 2007-01-15 20:08:25 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -43,9 +40,9 @@ typedef enum {
     zinfo_index_category_alwaysmatches,
     zinfo_index_category_anchor
 } zinfo_index_category_t;
-    
+
 typedef ZEBRA_RES ZebraExplainUpdateFunc(void *handle,
-                                         Record drec, 
+                                         Record drec,
                                          data1_node *n);
 
 typedef struct zebraExplainInfo *ZebraExplainInfo;
@@ -56,38 +53,38 @@ ZebraExplainInfo zebraExplain_open(Records records, data1_handle dh,
                                    void *updateHandle,
                                    ZebraExplainUpdateFunc *);
 
-void zebraExplain_close (ZebraExplainInfo zei);
-int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database);
-int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database,
+void zebraExplain_close(ZebraExplainInfo zei);
+int zebraExplain_curDatabase(ZebraExplainInfo zei, const char *database);
+int zebraExplain_newDatabase(ZebraExplainInfo zei, const char *database,
 			      int explain_database);
 int zebraExplain_add_attr_su(ZebraExplainInfo zei, int index_type,
 			     int set, int use);
 
-/** \brief lookup ordinal from string index + index type 
+/** \brief lookup ordinal from string index + index type
     \param zei explain info
     \param cat category
     \param index_type index type
     \param str index string
     \returns  -1 no such index+type exist; ordinal otherwise
 */
-    
-int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, 
+
+int zebraExplain_lookup_attr_str(ZebraExplainInfo zei,
                                  zinfo_index_category_t cat,
-                                 int index_type,
+                                 const char *index_type,
 				 const char *str);
-int zebraExplain_add_attr_str(ZebraExplainInfo zei, 
+int zebraExplain_add_attr_str(ZebraExplainInfo zei,
                               zinfo_index_category_t cat,
-                              int index_type,
+                              const char *index_type,
 			      const char *str);
-void zebraExplain_addSchema (ZebraExplainInfo zei, Odr_oid *oid);
-void zebraExplain_recordCountIncrement (ZebraExplainInfo zei, int adjust_num);
-void zebraExplain_recordBytesIncrement (ZebraExplainInfo zei, int adjust_num);
-zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num);
-void zebraExplain_loadAttsets (data1_handle dh, Res res);
-void zebraExplain_flush (ZebraExplainInfo zei, void *updateHandle);
-
-int zebraExplain_lookup_ord (ZebraExplainInfo zei, int ord,
-			     int *index_type, const char **db,
+void zebraExplain_addSchema(ZebraExplainInfo zei, Odr_oid *oid);
+void zebraExplain_recordCountIncrement(ZebraExplainInfo zei, int adjust_num);
+void zebraExplain_recordBytesIncrement(ZebraExplainInfo zei, int adjust_num);
+zint zebraExplain_runNumberIncrement(ZebraExplainInfo zei, int adjust_num);
+void zebraExplain_loadAttsets(data1_handle dh, Res res);
+void zebraExplain_flush(ZebraExplainInfo zei, void *updateHandle);
+
+int zebraExplain_lookup_ord(ZebraExplainInfo zei, int ord,
+			     const char **index_type, const char **db,
 			     const char **string_index);
 
 int zebraExplain_ord_adjust_occurrences(ZebraExplainInfo zei, int ord,
@@ -97,7 +94,10 @@ zint zebraExplain_ord_get_term_occurrences(ZebraExplainInfo zei, int ord);
 zint zebraExplain_ord_get_doc_occurrences(ZebraExplainInfo zei, int ord);
 
 int zebraExplain_trav_ord(ZebraExplainInfo zei, void *handle,
-			  int (*f)(void *handle, int ord));
+			  int (*f)(void *handle, int ord,
+                                   const char *index_type,
+                                   const char *string_index,
+                                   zinfo_index_category_t cat));
 
 int zebraExplain_get_database_ord(ZebraExplainInfo zei);
 int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *updateHandle);
@@ -108,7 +108,7 @@ typedef struct {
     zint runNumber;
     zint staticrank;
 } RecordAttr;
-RecordAttr *rec_init_attr (ZebraExplainInfo zei, Record rec);
+RecordAttr *rec_init_attr(ZebraExplainInfo zei, Record rec);
 
 YAZ_END_CDECL
 
@@ -116,6 +116,7 @@ YAZ_END_CDECL
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab