X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=a805d26168e56fe090f215e13e3ba41205541864;hb=c63292356fbdef7b575efbf027ba8574482b0320;hp=9bcea720367f720e5d1f8c7e2a6ea2d95119429d;hpb=3e72747f4b28856e5f684dbe8984f8fb28680e62;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 9bcea72..a805d26 100644
--- 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.83 2002-04-26 08:44:47 adam Exp $
- */
+/* $Id: index.h,v 1.85 2002-08-02 19:26:55 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
@@ -18,6 +35,10 @@
 #include <sys/times.h>
 #endif
 
+#if HAVE_ICONV_H
+#include <iconv.h>
+#endif
+
 #include <dict.h>
 #include <isams.h>
 #include <isam.h>
@@ -281,7 +302,11 @@ struct zebra_session {
     int records_updated;
     int records_deleted;
     int records_processed;
-
+    char *record_encoding;
+#if HAVE_ICONV_H
+    iconv_t iconv_to_utf8;
+    iconv_t iconv_from_utf8;
+#endif
 };
 
 struct rank_control {
@@ -317,7 +342,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,