X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=perl%2FIDZebra.i;h=c1f1ec2459376a293c1472db66aecf00ed894e88;hb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;hp=0cf0ca77607aa596fc946aacf844e78c2e71eb46;hpb=8c703765dad3228649e340337b293f76603ca9de;p=idzebra-moved-to-github.git

diff --git a/perl/IDZebra.i b/perl/IDZebra.i
index 0cf0ca7..c1f1ec2 100644
--- a/perl/IDZebra.i
+++ b/perl/IDZebra.i
@@ -88,20 +88,6 @@
 
 
 /*%include "zebra_perl.h" */
-typedef struct {
-    char  *groupName;
-    char  *databaseName;
-    char  *path;
-    char  *recordId;
-    char  *recordType;
-    int   flagStoreData;
-    int   flagStoreKeys;
-    int   flagRw;
-    int   fileVerboseLimit;
-    int   databaseNamePath;
-    int   explainDatabase;
-    int   followLinks;
-} recordGroup;
 
 typedef struct {
   int noOfRecords;
@@ -216,18 +202,16 @@ const char * zebra_errString (ZebraHandle zh);
 char *  zebra_errAdd (ZebraHandle zh); 
 
 
-/* == Record groups and database selection ================================= */
+/* == Zebra resources and database selection =============================== */
 
-/* initialize a recordGroup (zebra_api_ext.c); */
-void init_recordGroup (recordGroup *rg);
+/* set a resource */
+%name(set_resource)     
+void zebra_set_resource(ZebraHandle zh, const char *name, const char *value);
 
-/* set up a recordGroup for a specific file extension from zebra.cfg 
-   (zebra_api_ext.c); */
-void res_get_recordGroup (ZebraHandle zh, recordGroup *rg, 
-			  const char *ext); 
-/* set current record group for update purposes (zebraapi.c) */
-%name(set_group)           
-void zebra_set_group (ZebraHandle zh, struct recordGroup *rg);
+/* get a resource */
+%name(get_resource)     
+const char *zebra_set_resource(ZebraHandle zh, const char *name,
+                               const char *defaultvalue);
 
 /* select database for update purposes (zebraapi.c) */
 %name(select_database)     
@@ -274,13 +258,13 @@ int  zebra_init (ZebraHandle zh);
 int  zebra_compact (ZebraHandle zh);
 
 %name(repository_update)   
-void zebra_repository_update (ZebraHandle zh);
+void zebra_repository_update (ZebraHandle zh, const char *path);
 
 %name(repository_delete)   
-void zebra_repository_delete (ZebraHandle zh);
+void zebra_repository_delete (ZebraHandle zh, const char *path);
 
 %name(repository_show)     
-void zebra_repository_show (ZebraHandle zh); 
+void zebra_repository_show (ZebraHandle zh, const char *path); 
 
 
 /* == Record update/delete (zebra_api_ext.c) =============================== */
@@ -292,18 +276,16 @@ void zebra_repository_show (ZebraHandle zh);
 %apply int *REFERENCE { int *sysno };
 %name(insert_record)       
 int zebra_insert_record (ZebraHandle zh, 
-			 recordGroup *rGroup, 
 			 const char *recordType,
 			 int *sysno, 
 			 const char *match, 
 			 const char *fname,
 			 const char *buf, 
 			 int buf_size,
-			 int force_update);
+	 	         int force_update);
 
 %name(update_record)       
 int zebra_update_record (ZebraHandle zh, 
-			 recordGroup *rGroup, 
 			 const char *recordType,
 			 int *sysno, 
 			 const char *match, 
@@ -314,7 +296,6 @@ int zebra_update_record (ZebraHandle zh,
      
 %name(delete_record)       
 int zebra_delete_record (ZebraHandle zh, 
-			 recordGroup *rGroup, 
 			 const char *recordType,
 			 int *sysno, 
 			 const char *match, 
@@ -323,7 +304,6 @@ int zebra_delete_record (ZebraHandle zh,
 			 int buf_size,
 			 int force_update);
 
-
 /* == Search (zebraapi.c) ================================================== */
 %include "typemaps.i"
 %apply int *REFERENCE { int *hits };
@@ -373,6 +353,12 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
 			  int *statuses);
 
 
+/* Resultset terms */
+%name(resultSetTerms)
+int zebra_resultSetTerms (ZebraHandle zh, const char *setname, 
+                          int no, int *REFERENCE, 
+                          int *REFERENCE, char *out, int *REFERENCE);
+
 /* == Sort ================================================================= */
 %name(sort)
 int zebra_sort_by_specstr (ZebraHandle zh,