X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=perl%2FIDZebra.i;h=70efba5d4ce6b947e75595239ffe314c84cc46e9;hb=34252670515d7057b40aa9bd6acde0c891678d31;hp=0d020edd531d93f9034589228d10a8a7fb91052f;hpb=62aeae27f2897b54a14c6fe60da004f2f23bd2e8;p=idzebra-moved-to-github.git

diff --git a/perl/IDZebra.i b/perl/IDZebra.i
index 0d020ed..70efba5 100644
--- a/perl/IDZebra.i
+++ b/perl/IDZebra.i
@@ -1,9 +1,9 @@
 %module "IDZebra"
 %include typemaps.i                       // Load the typemaps librayr
 
+
 %{
 #include "zebraapi.h"
-#include "zebra_api_ext.h"
 #include "zebra_perl.h"
 #include "data1.h"
 #include "yaz/odr.h"
@@ -12,8 +12,6 @@
 
 /* == Typemaps ============================================================= */
 
-/* RetrievalRecordBuff is a special construct, to allow to map a char * buf
-   to non-null terminated perl string scalar value (SVpv). */
 %typemap(in) int * {
   int i;
   if (!SvIOK($input)) 
@@ -28,6 +26,8 @@
   argvi++;
 }
 
+/* RetrievalRecordBuff is a special construct, to allow to map a char * buf
+   to non-null terminated perl string scalar value (SVpv). */
 %typemap(out) RetrievalRecordBuf * {
   if ($1->len) {
     $result = newSVpv($1->buf,$1->len);
@@ -86,7 +86,52 @@
 
 /* == Structures for shadow classes  ======================================= */
 
-%include "zebra_perl.h"
+
+/*%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;
+  ZebraRetrievalRecord *records;
+} RetrievalObj;
+
+typedef struct {
+  int  errCode;        /* non-zero if error when fetching this */
+  char *errString;     /* error string */
+  int  position;       /* position of record in result set (1,2,..) */
+  char *base; 
+  int  sysno;
+  int  score;
+  char *format;    /* record syntax */
+  RetrievalRecordBuf *buf;
+} RetrievalRecord;
+
+/* Scan Term Descriptor */
+typedef struct {
+    int occurrences;     /* scan term occurrences */
+    char *term;          /* scan term string */
+} scanEntry;
+
+typedef struct {
+  int num_entries;
+  int position;
+  int is_partial;
+  scanEntry *entries;
+} ScanObj;
+
 
 typedef struct {
   int processed;
@@ -97,7 +142,6 @@ typedef struct {
   long stime;
 } ZebraTransactionStatus;
 
-
 /* == Module initialization and cleanup (zebra_perl.c) ===================== */
 
 void init (void);
@@ -188,7 +232,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
 
 /* begin transaction (add write lock) (zebraapi.c) */
 %name(begin_trans)         
-void zebra_begin_trans (ZebraHandle zh);
+int zebra_begin_trans (ZebraHandle zh, int rw);
 
 /* end transaction (remove write lock) (zebraapi.c) */
 %name(end_trans)           
@@ -197,15 +241,6 @@ void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *stat);
 %name(trans_no)
 int zebra_trans_no (ZebraHandle zh);
 
-%name(begin_read)          
-int zebra_begin_read (ZebraHandle zh);
-
-void zts_test (ZebraTransactionStatus *stat);
-
-/* end retrieval (remove read lock) (zebraapi.c) */
-%name(end_read)            
-void zebra_end_read (ZebraHandle zh);
-
 /* commit changes from shadow (zebraapi.c) */
 %name(commit)              
 int  zebra_commit (ZebraHandle zh);
@@ -327,7 +362,7 @@ void zebra_scan_PQF (ZebraHandle zh,
 		     ODR stream,
 		     const char *pqf_query);
 
-ScanEntry *getScanEntry(ScanObj *so, int pos);
+scanEntry *getScanEntry(ScanObj *so, int pos);
 
 /* Admin functionality */
 /*