X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fidzebra%2Fapi.h;h=e3e976b1c2cd845d776cbbcc8279d8d76412f941;hb=5d1021b2b70231c8f36fd7ec4583c4816a4f25d6;hp=76690ae236f932756e18737e7aa17fb8aea8e33f;hpb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/api.h b/include/idzebra/api.h
index 76690ae..e3e976b 100644
--- a/include/idzebra/api.h
+++ b/include/idzebra/api.h
@@ -1,4 +1,4 @@
-/* $Id: api.h,v 1.48 2007-04-16 08:44:31 adam Exp $
+/* $Id: api.h,v 1.53 2007-10-31 16:56:14 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -55,7 +55,7 @@ typedef struct {
     int position;        /* position of record in result set (1,2,..) */
     char *buf;           /* record buffer (void pointer really) */
     int len;             /* length */
-    const int *format;   /* record syntax */
+    const Odr_oid *format; /* record syntax */
     char *base; 
     zint sysno;
     int  score;
@@ -65,6 +65,7 @@ typedef struct {
 typedef struct {
     zint occurrences;    /* scan term occurrences */
     char *term;          /* scan term string */
+    char *display_term;  /* display scan term entry */
 } ZebraScanEntry;
 
 /** \var ZebraHandle
@@ -161,6 +162,14 @@ char *zebra_errAdd(ZebraHandle zh);
 YAZ_EXPORT
 void zebra_result(ZebraHandle zh, int *code, char **addinfo);
 
+
+/** \brief Returns character set encoding for session
+    \param zh zebra session handle.
+    \returns encoding name (e.g. "iso-8859-1")
+*/
+YAZ_EXPORT
+const char *zebra_get_encoding(ZebraHandle zh);
+
 /** \brief Set limit before Zebra does approx hit count
     \param zh session handle
     \param approx_limit the limit
@@ -220,7 +229,7 @@ YAZ_EXPORT
 ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 				 const char *setname,
 				 Z_RecordComposition *comp,
-				 const int *input_format,
+				 const Odr_oid *input_format,
 				 int num_recs,
 				 ZebraRetrievalRecord *recs);
 /** \brief Deletes one or more resultsets 
@@ -287,7 +296,7 @@ ZEBRA_RES zebra_result_set_term_info(ZebraHandle zh, const char *setname,
 */
 YAZ_EXPORT ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream,
 				Z_AttributesPlusTerm *zapt,
-				const int *attributeset,
+				const Odr_oid *attributeset,
 				int *position, int *num_entries,
 				ZebraScanEntry **entries,
 				int *is_partial,
@@ -319,14 +328,15 @@ ZEBRA_RES zebra_auth(ZebraHandle zh, const char *user, const char *pass);
 
 /** \brief Normalize zebra term for register (subject to change!)
     \param zh session handle
-    \param reg_id register ID, 'w', 'p',..
+    \param index_type "w", "p",..
     \param input_str input string buffer
     \param input_len input string length
     \param output_str output string buffer
     \param output_len output string length
 */
 YAZ_EXPORT
-int zebra_string_norm(ZebraHandle zh, unsigned reg_id, const char *input_str, 
+int zebra_string_norm(ZebraHandle zh, const char *index_type,
+                      const char *input_str, 
 		      int input_len, char *output_str, int output_len);
 
 /** \brief Creates a database
@@ -404,7 +414,6 @@ ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path);
     This function is a simple wrapper or zebra_update_record with
     action=action_update (insert or replace) .
 */
-YAZ_EXPORT
 YAZ_EXPORT 
 ZEBRA_RES zebra_add_record(ZebraHandle zh, const char *buf, int buf_size);