Remove a few redundant include(s).

[idzebra-moved-to-github.git] / include / idzebra / api.h

diff --git a/include/idzebra/api.h b/include/idzebra/api.h
index 19f2c16..5b3af1d 100644 (file)
--- a/include/idzebra/api.h
+++ b/include/idzebra/api.h
@@ -1,8 +1,5 @@
-/* $Id: api.h,v 1.35 2006-05-30 13:21:13 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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
 
 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

@@ -15,14 +12,14 @@ 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
 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+

 */
 
 /** \file api.h
     \brief Zebra API
 */
 
 /** \file api.h
     \brief Zebra API

-    
+

     Return codes:
     Most functions has return type ZEBRA_RES, where ZEBRA_FAIL indicates
     failure; ZEBRA_OK indicates success.
     Return codes:
     Most functions has return type ZEBRA_RES, where ZEBRA_FAIL indicates
     failure; ZEBRA_OK indicates success.

@@ -32,31 +29,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define IDZEBRA_API_H
 
 #include <yaz/odr.h>
 #define IDZEBRA_API_H
 
 #include <yaz/odr.h>

-#include <yaz/oid.h>

 #include <yaz/proto.h>
 #include <idzebra/res.h>
 #include <idzebra/version.h>
 #include <yaz/proto.h>
 #include <idzebra/res.h>
 #include <idzebra/version.h>

+#include <idzebra/recctrl.h>

 
 YAZ_BEGIN_CDECL
 
 
 YAZ_BEGIN_CDECL
 

-/**
-  expand GCC_ATTRIBUTE if GCC is in use. See :
-  http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
-*/
-
-#ifndef GCC_ATTRIBUTE
-#ifdef __GNUC__
-#define GCC_ATTRIBUTE(x) __attribute__ (x)
-#else
-#define GCC_ATTRIBUTE(x)
-#endif
-#endif
-

 typedef struct {
 typedef struct {

-    int processed;
-    int inserted;
-    int updated;
-    int deleted;
+    zint processed;
+    zint inserted;
+    zint updated;
+    zint deleted;

     long utime;
     long stime;
 } ZebraTransactionStatus;
     long utime;
     long stime;
 } ZebraTransactionStatus;

@@ -68,16 +52,17 @@ typedef struct {
     int position;        /* position of record in result set (1,2,..) */
     char *buf;           /* record buffer (void pointer really) */
     int len;             /* length */
     int position;        /* position of record in result set (1,2,..) */
     char *buf;           /* record buffer (void pointer really) */
     int len;             /* length */

-    oid_value format;    /* record syntax */
-    char *base; 
-    SYSNO sysno;
+    const Odr_oid *format; /* record syntax */
+    char *base;
+    zint sysno;

     int  score;
 } ZebraRetrievalRecord;
 
 /** Scan Term Descriptor */
 typedef struct {
     int  score;
 } ZebraRetrievalRecord;
 
 /** Scan Term Descriptor */
 typedef struct {

-    int occurrences;     /* scan term occurrences */
+    zint occurrences;    /* scan term occurrences */

     char *term;          /* scan term string */
     char *term;          /* scan term string */

+    char *display_term;  /* display scan term entry */

 } ZebraScanEntry;
 
 /** \var ZebraHandle
 } ZebraScanEntry;
 
 /** \var ZebraHandle

@@ -92,29 +77,29 @@ typedef struct zebra_service *ZebraService;
 
 /** \brief Creates a Zebra Service.
     \param configName name of configuration file
 
 /** \brief Creates a Zebra Service.
     \param configName name of configuration file

-    
+

     This function is a simplified version of zebra_start_res.
 */
 YAZ_EXPORT
 ZebraService zebra_start(const char *configName
     This function is a simplified version of zebra_start_res.
 */
 YAZ_EXPORT
 ZebraService zebra_start(const char *configName

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 /** \brief Creates a Zebra service with resources.
     \param configName name of configuration file
     \param def_res default resources
     \param over_res overriding resources
 
 /** \brief Creates a Zebra service with resources.
     \param configName name of configuration file
     \param def_res default resources
     \param over_res overriding resources

-    
+

     This function typically called once in a program. A Zebra Service
     acts as a factory for Zebra session handles.
 */
 YAZ_EXPORT
 ZebraService zebra_start_res(const char *configName,
                             Res def_res, Res over_res
     This function typically called once in a program. A Zebra Service
     acts as a factory for Zebra session handles.
 */
 YAZ_EXPORT
 ZebraService zebra_start_res(const char *configName,
                             Res def_res, Res over_res

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 /** \brief stops a Zebra service.
     \param zs service handle
 
 /** \brief stops a Zebra service.
     \param zs service handle

-    
+

     Frees resources used by the service.
 */
 YAZ_EXPORT
     Frees resources used by the service.
 */
 YAZ_EXPORT

@@ -133,14 +118,14 @@ void zebra_filter_info(ZebraService zs, void *cd,
 /** \brief Creates a Zebra session handle within service.
     \param zs service handle.
     \param res resources to be used for the service (NULL for none)
 /** \brief Creates a Zebra session handle within service.
     \param zs service handle.
     \param res resources to be used for the service (NULL for none)

-    
+

     There should be one handle for each thread doing something
     There should be one handle for each thread doing something

-    with zebra, be that searching or indexing. In simple apps 
-    one handle is sufficient 
+    with zebra, be that searching or indexing. In simple apps
+    one handle is sufficient

 */
 YAZ_EXPORT
 ZebraHandle zebra_open(ZebraService zs, Res res
 */
 YAZ_EXPORT
 ZebraHandle zebra_open(ZebraService zs, Res res

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 /** \brief Destroys Zebra session handle.
     \param zh zebra session handle.
 
 /** \brief Destroys Zebra session handle.
     \param zh zebra session handle.

@@ -174,10 +159,18 @@ char *zebra_errAdd(ZebraHandle zh);
 YAZ_EXPORT
 void zebra_result(ZebraHandle zh, int *code, char **addinfo);
 
 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
 /** \brief Set limit before Zebra does approx hit count
     \param zh session handle
     \param approx_limit the limit

-    
+

     Results will be approximiate if hit count is greater than the
     limit specified. By default there is a high-limit (no limit).
 */
     Results will be approximiate if hit count is greater than the
     limit specified. By default there is a high-limit (no limit).
 */

@@ -199,6 +192,22 @@ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query,
     \param query RPN query using YAZ structure
     \param setname name of resultset
     \param hits number of hits is returned
     \param query RPN query using YAZ structure
     \param setname name of resultset
     \param hits number of hits is returned

+    \param estimated_hit_count whether hit count is an estimate
+    \param partial_resultset whether result is only partially evaluated
+*/
+YAZ_EXPORT
+ZEBRA_RES zebra_search_RPN_x(ZebraHandle zh, ODR o, Z_RPNQuery *query,
+                           const char *setname, zint *hits,
+                           int *estimated_hit_count,
+                           int *partial_resultset);
+
+
+/** \brief Search using RPN Query structure (from ASN.1)
+    \param zh session handle
+    \param o ODR handle
+    \param query RPN query using YAZ structure
+    \param setname name of resultset
+    \param hits number of hits is returned

 */
 YAZ_EXPORT
 ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
 */
 YAZ_EXPORT
 ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,

@@ -217,10 +226,10 @@ YAZ_EXPORT
 ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                                 const char *setname,
                                 Z_RecordComposition *comp,
 ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                                 const char *setname,
                                 Z_RecordComposition *comp,

-                                oid_value input_format,
+                                const Odr_oid *input_format,

                                 int num_recs,
                                 ZebraRetrievalRecord *recs);
                                 int num_recs,
                                 ZebraRetrievalRecord *recs);

-/** \brief Deletes one or more resultsets 
+/** \brief Deletes one or more resultsets

     \param zh session handle
     \param function Z_DeleteResultSetRequest_{list,all}
     \param num_setnames number of result sets
     \param zh session handle
     \param function Z_DeleteResultSetRequest_{list,all}
     \param num_setnames number of result sets

@@ -237,7 +246,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function,
     \param zh session handle
     \param setname result set name
     \param num_terms number of terms returned in this integer
     \param zh session handle
     \param setname result set name
     \param num_terms number of terms returned in this integer

-    
+

     This function is used in conjunction with zebra_result_set_term_info.
     If operation was successful, ZEBRA_OK is returned; otherwise
     ZEBRA_FAIL is returned (typically non-existing setname)
     This function is used in conjunction with zebra_result_set_term_info.
     If operation was successful, ZEBRA_OK is returned; otherwise
     ZEBRA_FAIL is returned (typically non-existing setname)

@@ -250,12 +259,12 @@ ZEBRA_RES zebra_result_set_term_no(ZebraHandle zh, const char *setname,
     \param zh session handle
     \param setname result set name
     \param no the term we want to know about (0=first, 1=second,..)
     \param zh session handle
     \param setname result set name
     \param no the term we want to know about (0=first, 1=second,..)

-    \param count the number of occurrences of this term, aka hits (output) 
+    \param count the number of occurrences of this term, aka hits (output)

     \param approx about hits: 0=exact,1=approx (output)
     \param termbuf buffer for term string (intput, output)
     \param termlen size of termbuf (input=max, output=actual length)
     \param term_ref_id if non-NULL *term_ref_id holds term reference
     \param approx about hits: 0=exact,1=approx (output)
     \param termbuf buffer for term string (intput, output)
     \param termlen size of termbuf (input=max, output=actual length)
     \param term_ref_id if non-NULL *term_ref_id holds term reference

-    
+

     Returns information about one search term associated with result set.
     Use zebra_result_set_term_no to read total number of terms associated
     with result set. If this function can not return information,
     Returns information about one search term associated with result set.
     Use zebra_result_set_term_no to read total number of terms associated
     with result set. If this function can not return information,

@@ -277,14 +286,14 @@ ZEBRA_RES zebra_result_set_term_info(ZebraHandle zh, const char *setname,
     \param zapt Attribute plus Term (start term)
     \param attributeset Attributeset for Attribute plus Term
     \param position input/output position
     \param zapt Attribute plus Term (start term)
     \param attributeset Attributeset for Attribute plus Term
     \param position input/output position

-    \param num_entries number of terms requested / returned 
+    \param num_entries number of terms requested / returned

     \param entries list of resulting terms (ODR allocated)
     \param is_partial upon return 1=partial, 0=complete
     \param setname limit scan by this set (NULL means no limit)
 */
 YAZ_EXPORT ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream,
                                Z_AttributesPlusTerm *zapt,
     \param entries list of resulting terms (ODR allocated)
     \param is_partial upon return 1=partial, 0=complete
     \param setname limit scan by this set (NULL means no limit)
 */
 YAZ_EXPORT ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream,
                                Z_AttributesPlusTerm *zapt,

-                               oid_value attributeset,
+                               const Odr_oid *attributeset,

                                int *position, int *num_entries,
                                ZebraScanEntry **entries,
                                int *is_partial,
                                int *position, int *num_entries,
                                ZebraScanEntry **entries,
                                int *is_partial,

@@ -295,7 +304,7 @@ YAZ_EXPORT ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream,
     \param stream ODR handle for result
     \param query PQF scan query
     \param position input/output position
     \param stream ODR handle for result
     \param query PQF scan query
     \param position input/output position

-    \param num_entries number of terms requested / returned 
+    \param num_entries number of terms requested / returned

     \param entries list of resulting terms (ODR allocated)
     \param is_partial upon return 1=partial, 0=complete
     \param setname limit scan by this set (NULL means no limit)
     \param entries list of resulting terms (ODR allocated)
     \param is_partial upon return 1=partial, 0=complete
     \param setname limit scan by this set (NULL means no limit)

@@ -316,14 +325,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
 
 /** \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
     \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
                      int input_len, char *output_str, int output_len);
 
 /** \brief Creates a database

@@ -353,27 +363,20 @@ YAZ_EXPORT
 ZEBRA_RES zebra_admin_import_begin(ZebraHandle zh, const char *database,
                                   const char *record_type);
 
 ZEBRA_RES zebra_admin_import_begin(ZebraHandle zh, const char *database,
                                   const char *record_type);
 

-YAZ_EXPORT 
+YAZ_EXPORT

 ZEBRA_RES zebra_admin_import_segment(ZebraHandle zh,
                                     Z_Segment *segment);
 
 ZEBRA_RES zebra_admin_import_segment(ZebraHandle zh,
                                     Z_Segment *segment);
 

-YAZ_EXPORT 
+YAZ_EXPORT

 ZEBRA_RES zebra_admin_import_end(ZebraHandle zh);
 
 ZEBRA_RES zebra_admin_import_end(ZebraHandle zh);
 

-YAZ_EXPORT 
-ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
-                                     const char *rec_buf,
-                                     size_t rec_len,
-                                     const char *recid_buf, size_t recid_len,
-                                     int action);
-
-YAZ_EXPORT 
+YAZ_EXPORT

 ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw
 ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 YAZ_EXPORT
 ZEBRA_RES zebra_end_trans(ZebraHandle zh
 
 YAZ_EXPORT
 ZEBRA_RES zebra_end_trans(ZebraHandle zh

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 YAZ_EXPORT
 ZEBRA_RES zebra_end_transaction(ZebraHandle zh,
 
 YAZ_EXPORT
 ZEBRA_RES zebra_end_transaction(ZebraHandle zh,

@@ -391,56 +394,65 @@ ZEBRA_RES zebra_init(ZebraHandle zh);
 YAZ_EXPORT
 ZEBRA_RES zebra_compact(ZebraHandle zh);
 
 YAZ_EXPORT
 ZEBRA_RES zebra_compact(ZebraHandle zh);
 

-YAZ_EXPORT 
+YAZ_EXPORT
+ZEBRA_RES zebra_repository_index(ZebraHandle zh, const char *path,
+                                 enum zebra_recctrl_action_t action);
+
+YAZ_EXPORT

 ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path);
 
 ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path);
 

-YAZ_EXPORT 
+YAZ_EXPORT

 ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path);
 
 ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path);
 

-YAZ_EXPORT 
+YAZ_EXPORT

 ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path);
 
 ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path);
 

-YAZ_EXPORT 
+/** \brief Simple update record
+    \param zh session handle
+    \param buf record buffer
+    \param buf_size record buffer size
+
+    This function is a simple wrapper or zebra_update_record with
+    action=action_update (insert or replace) .
+*/
+YAZ_EXPORT

 ZEBRA_RES zebra_add_record(ZebraHandle zh, const char *buf, int buf_size);
 ZEBRA_RES zebra_add_record(ZebraHandle zh, const char *buf, int buf_size);

-                              
-YAZ_EXPORT 
-ZEBRA_RES zebra_insert_record(ZebraHandle zh, 
-                             const char *recordType,
-                             SYSNO *sysno, const char *match,
-                             const char *fname,
-                             const char *buf, int buf_size,
-                             int force_update);
-YAZ_EXPORT
-ZEBRA_RES zebra_update_record(ZebraHandle zh, 
-                             const char *recordType,
-                             SYSNO *sysno, const char *match,
-                             const char *fname,
-                             const char *buf, int buf_size,
-                             int force_update);
-YAZ_EXPORT 
-ZEBRA_RES zebra_delete_record(ZebraHandle zh, 
-                             const char *recordType,
-                             SYSNO *sysno, const char *match, const char *fname,
-                             const char *buf, int buf_size,
-                             int force_update);
-
-YAZ_EXPORT 
+
+/** \brief Updates record
+    \param zh session handle
+    \param action (insert,replace,delete or update (replace/insert)
+    \param recordType filter type (0 indicates default)
+    \param sysno system id (0 may be passed for no known id)
+    \param match match criteria (0 may be passed for no known criteria)
+    \param fname filename to be printed for logging (0 may be passed)
+    \param buf record buffer
+    \param buf_size record buffer size
+*/
+YAZ_EXPORT
+ZEBRA_RES zebra_update_record(ZebraHandle zh,
+                              enum zebra_recctrl_action_t action,
+                              const char *recordType,
+                              zint *sysno, const char *match,
+                              const char *fname,
+                              const char *buf, int buf_size);
+
+YAZ_EXPORT

 ZEBRA_RES zebra_sort(ZebraHandle zh, ODR stream,
                     int num_input_setnames,
                     const char **input_setnames,
                     const char *output_setname,
                     Z_SortKeySpecList *sort_sequence,
                     int *sort_status
 ZEBRA_RES zebra_sort(ZebraHandle zh, ODR stream,
                     int num_input_setnames,
                     const char **input_setnames,
                     const char *output_setname,
                     Z_SortKeySpecList *sort_sequence,
                     int *sort_status

-    ) GCC_ATTRIBUTE((warn_unused_result));    
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 YAZ_EXPORT
 
 YAZ_EXPORT

-ZEBRA_RES zebra_select_databases(ZebraHandle zh, int num_bases, 
+ZEBRA_RES zebra_select_databases(ZebraHandle zh, int num_bases,

                                 const char **basenames
                                 const char **basenames

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 YAZ_EXPORT
 ZEBRA_RES zebra_select_database(ZebraHandle zh, const char *basename
 
 YAZ_EXPORT
 ZEBRA_RES zebra_select_database(ZebraHandle zh, const char *basename

-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));

 
 YAZ_EXPORT
 void zebra_shadow_enable(ZebraHandle zh, int value);
 
 YAZ_EXPORT
 void zebra_shadow_enable(ZebraHandle zh, int value);

@@ -458,7 +470,7 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding);
 YAZ_EXPORT
 void zebra_set_resource(ZebraHandle zh, const char *name, const char *value);
 YAZ_EXPORT
 YAZ_EXPORT
 void zebra_set_resource(ZebraHandle zh, const char *name, const char *value);
 YAZ_EXPORT

-const char *zebra_get_resource(ZebraHandle zh, 
+const char *zebra_get_resource(ZebraHandle zh,

                               const char *name, const char *defaultvalue);
 
 
                               const char *name, const char *defaultvalue);
 
 

@@ -480,20 +492,28 @@ ZebraMetaRecord *zebra_meta_records_create(ZebraHandle zh,
 
 YAZ_EXPORT
 ZebraMetaRecord *zebra_meta_records_create_range(ZebraHandle zh,
 
 YAZ_EXPORT
 ZebraMetaRecord *zebra_meta_records_create_range(ZebraHandle zh,

-                                                const char *name, 
+                                                const char *name,

                                                 zint start, int num);
 
 YAZ_EXPORT
 void zebra_meta_records_destroy(ZebraHandle zh, ZebraMetaRecord *records,
                                int num);
 
                                                 zint start, int num);
 
 YAZ_EXPORT
 void zebra_meta_records_destroy(ZebraHandle zh, ZebraMetaRecord *records,
                                int num);
 

-YAZ_EXPORT 
+YAZ_EXPORT

 struct BFiles_struct *zebra_get_bfs(ZebraHandle zh);
 
 YAZ_EXPORT
 ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids);
 
 struct BFiles_struct *zebra_get_bfs(ZebraHandle zh);
 
 YAZ_EXPORT
 ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids);
 

-YAZ_END_CDECL                                
+YAZ_EXPORT
+ZEBRA_RES zebra_set_break_handler(ZebraHandle zh,
+                                  int (*f)(void *client_data),
+                                  void *client_data);
+
+YAZ_EXPORT
+ZEBRA_RES zebra_register_check(ZebraHandle zh, const char *spec);
+
+YAZ_END_CDECL

 
 /** \mainpage Zebra
  *
 
 /** \mainpage Zebra
  *

@@ -514,7 +534,7 @@ YAZ_END_CDECL
  *
  * \section res Resources
  *
  *
  * \section res Resources
  *

- * The resources system (res.h) is a manager of configuration 
+ * The resources system (res.h) is a manager of configuration

  * resources. The resources can be viewed as a simple database.
  * Resources can be read from a configurtion file, they can be
  * read or written by an application. Resources can also be written,
  * resources. The resources can be viewed as a simple database.
  * Resources can be read from a configurtion file, they can be
  * read or written by an application. Resources can also be written,

@@ -543,7 +563,7 @@ YAZ_END_CDECL
  *
  * Zebra has more than one ISAM system. The old and stable ISAM system
  * is named isamc (see isamc.h). Another version isams is a write-once
  *
  * Zebra has more than one ISAM system. The old and stable ISAM system
  * is named isamc (see isamc.h). Another version isams is a write-once

- * isam system that is quite compact - suitable for CD-ROMs (isams.h). 
+ * isam system that is quite compact - suitable for CD-ROMs (isams.h).

  * The newest ISAM system, isamb, is implemented as a B-Tree (see isamb.h).
  *
  * \section data1 Data-1
  * The newest ISAM system, isamb, is implemented as a B-Tree (see isamb.h).
  *
  * \section data1 Data-1

@@ -580,6 +600,7 @@ YAZ_END_CDECL
 /*
  * Local variables:
  * c-basic-offset: 4
 /*
  * Local variables:
  * c-basic-offset: 4

+ * c-file-style: "Stroustrup"

  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab