Cleaned test scripts to be (nearly?) atomic

[idzebra-moved-to-github.git] / perl / IDZebra.i

diff --git a/perl/IDZebra.i b/perl/IDZebra.i
index c1f1ec2..2d8f773 100644 (file)
--- a/perl/IDZebra.i
+++ b/perl/IDZebra.i
@@ -3,7 +3,7 @@
 
 
 %{
-#include "zebraapi.h"
+#include <idzebra/api.h>
 #include "zebra_perl.h"
 #include "data1.h"
 #include "yaz/odr.h"
@@ -26,6 +26,20 @@
   argvi++;
 }
 
+/* * * * * *  Fix for broken swig implementation */
+%typemap(argout) long long *INOUT {
+    char temp[256];
+    if (argvi >= items) {
+        EXTEND(sp,1);
+    }
+ /* sprintf(temp,"%lld", $1); */
+    sprintf(temp,"%lld", *$1);
+    $result = sv_newmortal();
+    sv_setpv($result,temp);
+    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 * {
@@ -99,7 +113,7 @@ typedef struct {
   char *errString;     /* error string */
   int  position;       /* position of record in result set (1,2,..) */
   char *base; 
-  int  sysno;
+  long long sysno;
   int  score;
   char *format;    /* record syntax */
   RetrievalRecordBuf *buf;
@@ -273,21 +287,26 @@ void zebra_repository_show (ZebraHandle zh, const char *path);
    If not, and match_criteria is provided, then sysno is guessed
    If not, and a record is provided, then sysno is got from there */
 
-%apply int *REFERENCE { int *sysno };
+%apply long long *INOUT { long long *sysno };
+
 %name(insert_record)       
 int zebra_insert_record (ZebraHandle zh, 
                         const char *recordType,
-                        int *sysno, 
+                        long long *sysno, 
                         const char *match, 
                         const char *fname,
                         const char *buf, 
                         int buf_size,
                         int force_update);
+/* actually, sysno is only output param in insert_record, but kept */
+/* as inout for symmetry in the interface. The session class assures */
+/* that nothing goes in... */
+
 
 %name(update_record)       
 int zebra_update_record (ZebraHandle zh, 
                         const char *recordType,
-                        int *sysno, 
+                        long long *sysno, 
                         const char *match, 
                         const char *fname,
                         const char *buf, 
@@ -297,7 +316,7 @@ int zebra_update_record (ZebraHandle zh,
 %name(delete_record)       
 int zebra_delete_record (ZebraHandle zh, 
                         const char *recordType,
-                        int *sysno, 
+                        long long *sysno, 
                         const char *match, 
                         const char *fname,
                         const char *buf, 
@@ -354,10 +373,12 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
 
 
 /* Resultset terms */
+/* disabled
 %name(resultSetTerms)
 int zebra_resultSetTerms (ZebraHandle zh, const char *setname, 
                           int no, int *REFERENCE, 
                           int *REFERENCE, char *out, int *REFERENCE);
+*/
 
 /* == Sort ================================================================= */
 %name(sort)