X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fsortidx.h;h=56097e6707473232e0e2ba2eb5989d20feff56a1;hb=6eeec08989cd11ca32945a3c686997b8d925d2c7;hp=5800382623e4cc0002dbd1ecc80fe4f6bdcbfb41;hpb=40869f1460c8b3804904ec207b18c5607f82de6e;p=idzebra-moved-to-github.git

diff --git a/include/sortidx.h b/include/sortidx.h
index 5800382..56097e6 100644
--- a/include/sortidx.h
+++ b/include/sortidx.h
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1995-2008 Index Data
+   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
@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define SORTIDX_H
 
 #include <yaz/yconfig.h>
-#include <idzebra/version.h>
 #include <idzebra/bfile.h>
 #include <yaz/wrbuf.h>
 
@@ -38,11 +37,6 @@ typedef struct zebra_sort_index *zebra_sort_index_t;
 #define ZEBRA_SORT_TYPE_ISAMB 2
 #define ZEBRA_SORT_TYPE_MULTI 3
 
-struct zebra_sort_ent {
-    int num;
-    WRBUF wrbuf;
-};
-
 /** \brief creates sort handle
     \param bfs block files handle
     \param write_flag (0=read-only, 1=write and read)
@@ -67,39 +61,32 @@ int zebra_sort_type(zebra_sort_index_t si, int type);
 */
 void zebra_sort_sysno(zebra_sort_index_t si, zint sysno);
 
-/** \brief adds content to sort file
-    \param si sort index handle
-    \param buf buffer content
-    \param len length
-
-    zebra_sort_type and zebra_sort_sysno must be called prior to this
-*/
-void zebra_sort_add(zebra_sort_index_t si, const char *buf, int len);
-
-
 /** \brief adds multi-map content to sort file
     \param si sort index handle
-    \param ent multi-map value
+    \param section_id section of key
+    \param w one or more 0-terminted strings (thus an array)
 
     zebra_sort_type and zebra_sort_sysno must be called prior to this
 */
-void zebra_sort_add_ent(zebra_sort_index_t si, struct zebra_sort_ent *ent);
+void zebra_sort_add(zebra_sort_index_t si, zint section_id, WRBUF w);
 
 
 /** \brief delete sort entry
     \param si sort index handle
+    \param section_id section of sort key to be deleted
 
     zebra_sort_type and zebra_sort_sysno must be called prior to this
 */
-void zebra_sort_delete(zebra_sort_index_t si);
+void zebra_sort_delete(zebra_sort_index_t si, zint section_id);
 
 /** \brief reads sort entry
     \param si sort index handle
-    \param buf resulting buffer
+    \param section_id output section ID (may be NULL and it will not be set)
+    \param w resulting buffer
     \retval 0 could not be read
     \retval 1 could be read (found)
 */
-int zebra_sort_read(zebra_sort_index_t si, WRBUF w);
+int zebra_sort_read(zebra_sort_index_t si, zint *section_id, WRBUF w);
 
 YAZ_END_CDECL
 
@@ -107,6 +94,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