Bump copyright year
[idzebra-moved-to-github.git] / index / zinfo.h
index fd46688..d5abe46 100644 (file)
@@ -1,8 +1,5 @@
-/* $Id: zinfo.h,v 1.39 2007-10-29 09:25:41 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) 2004-2013 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;
@@ -63,21 +60,21 @@ int zebraExplain_newDatabase(ZebraExplainInfo zei, const char *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);
@@ -87,7 +84,7 @@ 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,
+                            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);
@@ -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