Fix log messages

[idzebra-moved-to-github.git] / index / index.h

diff --git a/index/index.h b/index/index.h
index 12703d2..ccb2714 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,9 +1,26 @@
-/*
- * Copyright (C) 1995-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- * $Id: index.h,v 1.81 2002-04-15 14:05:43 adam Exp $
- */
+/* $Id: index.h,v 1.86 2002-08-28 19:52:29 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #ifndef INDEX_H
 #define INDEX_H
@@ -23,6 +40,7 @@
 #include <isam.h>
 #include <isamc.h>
 #include <isamd.h>
+#include <isamb.h>
 #define ISAM_DEFAULT "c"
 #include <yaz/data1.h>
 #include <recctrl.h>
@@ -203,6 +221,7 @@ struct zebra_register {
     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;
+    ISAMB isamb;
     Dict dict;
     Dict matchDict;
     SortIdx sortIdx;
@@ -279,7 +298,10 @@ struct zebra_session {
     int records_updated;
     int records_deleted;
     int records_processed;
+    char *record_encoding;
 
+    yaz_iconv_t iconv_to_utf8;
+    yaz_iconv_t iconv_from_utf8;
 };
 
 struct rank_control {
@@ -315,7 +337,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 
 RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
                 const char *term, int length_term, const char *flags,
-                 int preserve_position);
+                 int preserve_position, int term_type);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
                       const char *db, int set,
@@ -410,6 +432,10 @@ int explain_extract (void *handle, Record rec, data1_node *n);
 int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
                  const struct recordGroup *rGroup, int deleteFlag);
 
+int zebra_begin_read (ZebraHandle zh);
+void zebra_end_read (ZebraHandle zh);
+
+
 YAZ_END_CDECL
 
 #endif