X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fzebraapi.h;h=1a53175dce3b76f7e07695a4864e7b9fc463f849;hb=da1267b22edd9e3be497ce84b9734a0c870defdd;hp=d619baf8ea9dc2746eb13f18178b2e8eb60a3e52;hpb=104beff061317519411d779c7c84419ccdfc70e1;p=idzebra-moved-to-github.git

diff --git a/include/zebraapi.h b/include/zebraapi.h
index d619baf..1a53175 100644
--- a/include/zebraapi.h
+++ b/include/zebraapi.h
@@ -1,5 +1,5 @@
-/* $Id: zebraapi.h,v 1.8 2003-06-20 14:21:23 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: zebraapi.h,v 1.15 2004-08-06 13:36:22 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -32,6 +32,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/odr.h>
 #include <yaz/oid.h>
 #include <yaz/proto.h>
+#include <res.h>
 #include <zebraver.h>
 
 /* Fixme! Compare string (ignore case) */
@@ -43,21 +44,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 YAZ_BEGIN_CDECL
 
-struct recordGroup {
-    char  *groupName;
-    char  *databaseName;
-    char  *path;
-    char  *recordId;
-    char  *recordType;
-    int   flagStoreData;
-    int   flagStoreKeys;
-    int   flagRw;
-    int   fileVerboseLimit;
-    int   databaseNamePath;
-    int   explainDatabase;
-    int   followLinks;
-};
-
 typedef struct {
   int processed;
   int inserted;
@@ -76,7 +62,7 @@ typedef struct {
     int len;             /* length */
     oid_value format;    /* record syntax */
     char *base; 
-    int  sysno;
+    SYSNO sysno;
     int  score;
 } ZebraRetrievalRecord;
 
@@ -97,6 +83,8 @@ typedef struct zebra_service *ZebraService;
 /* Start Zebra using file 'configName' (usually zebra.cfg) */
 /* There should be exactly one ZebraService */
 YAZ_EXPORT ZebraService zebra_start (const char *configName);
+YAZ_EXPORT ZebraService zebra_start_res (const char *configName,
+				         Res def_res, Res over_res);
 
 /* Close the whole Zebra */
 YAZ_EXPORT int zebra_stop (ZebraService zs);
@@ -141,7 +129,7 @@ YAZ_EXPORT int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
 
 /* Search using RPN Query */
 YAZ_EXPORT int zebra_search_RPN (ZebraHandle zh, ODR o, Z_RPNQuery *query,
-                                  const char *setname, int *hits);
+				 const char *setname, int *hits);
 
 /* Retrieve record(s) */
 YAZ_EXPORT int zebra_records_retrieve (ZebraHandle zh, ODR stream,
@@ -184,7 +172,7 @@ YAZ_EXPORT int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
  */                   
           
 YAZ_EXPORT int zebra_create_database (ZebraHandle zh, const char *db);
-
+YAZ_EXPORT int zebra_drop_database (ZebraHandle zh, const char *db);
 
 YAZ_EXPORT int zebra_admin_shutdown (ZebraHandle zh);
 YAZ_EXPORT int zebra_admin_start (ZebraHandle zh);
@@ -200,7 +188,6 @@ YAZ_EXPORT int zebra_admin_import_segment (ZebraHandle zh,
 YAZ_EXPORT int zebra_admin_import_end (ZebraHandle zh);
 
 int zebra_admin_exchange_record (ZebraHandle zh,
-                                 const char *database,
                                  const char *rec_buf,
                                  size_t rec_len,
                                  const char *recid_buf, size_t recid_len,
@@ -215,25 +202,38 @@ int zebra_clean (ZebraHandle zh);
 
 int zebra_init (ZebraHandle zh);
 int zebra_compact (ZebraHandle zh);
-int zebra_repository_update (ZebraHandle zh);
-int zebra_repository_delete (ZebraHandle zh);
-int zebra_repository_show (ZebraHandle zh);
-int zebra_record_insert (ZebraHandle zh, const char *buf, int len, int *sysno);
-
-YAZ_EXPORT int zebra_set_group (ZebraHandle zh, struct recordGroup *rg);
-
+int zebra_repository_update (ZebraHandle zh, const char *path);
+int zebra_repository_delete (ZebraHandle zh, const char *path);
+int zebra_repository_show (ZebraHandle zh, const char *path);
+
+int zebra_add_record (ZebraHandle zh, const char *buf, int buf_size);
+			       
+int 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);
+int 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);
+int 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 int zebra_resultSetTerms (ZebraHandle zh, const char *setname, 
-                                     int no, int *count, 
+                                     int no, zint *count, 
                                      int *type, char *out, size_t *len);
 
 YAZ_EXPORT int 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);
-
+			   int num_input_setnames,
+			   const char **input_setnames,
+			   const char *output_setname,
+			   Z_SortKeySpecList *sort_sequence,
+			   int *sort_status);
 
 YAZ_EXPORT
 int zebra_select_databases (ZebraHandle zh, int num_bases, 
@@ -259,5 +259,7 @@ const char *zebra_get_resource(ZebraHandle zh,
 		const char *name, const char *defaultvalue);
 
 
+YAZ_EXPORT void zebra_pidfname(ZebraService zs, char *path);
+
 YAZ_END_CDECL				      
 #endif