X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=7a3de30121382fc2a5fcf34a798ea0122a4126f0;hb=40205a3923522999ca96aa0e57e013cb12db7e29;hp=673b02580912a3e7b2349a7cf6b29e6b3aba27d9;hpb=c1f2a1e8ca45c6770e222e4902463a31fbfe3c82;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 673b025..7a3de30 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,11 +1,14 @@
-/* $Id: ZOOM.xs,v 1.47 2007-02-22 20:37:47 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.51 2008-05-14 13:31:39 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
 #include <yaz/zoom.h>
+#include <yaz/diagsrw.h>
 #include <yaz/xmalloc.h>
+#include <yaz/log.h>
+#include <yaz/yaz-version.h>
 
 /* Used by the *_setl() functions */
 typedef char opaquechar;
@@ -204,6 +207,14 @@ const char *
 ZOOM_diag_str(error)
 	int error
 
+const char *
+ZOOM_diag_srw_str(error)
+	int error
+	CODE:
+		RETVAL = yaz_diag_srw_str(error);
+	OUTPUT:
+		RETVAL
+
 ZOOM_resultset
 ZOOM_connection_search(arg0, q)
 	ZOOM_connection	arg0
@@ -310,16 +321,25 @@ ZOOM_record_error(rec, cp, addinfo, diagset)
 		diagset
 
 # See "typemap" for discussion of the "const char *" return-type.
-#
-### but should use datachunk for in some (not all!) cases.
 const char *
-ZOOM_record_get(rec, type, len)
+ZOOM_record_get_string(rec, type)
 	ZOOM_record rec
 	const char* type
-	int &len
+	INIT:
+		int len;
+	CODE:
+		RETVAL = ZOOM_record_get(rec, type, &len);
+	OUTPUT:
+		RETVAL
+
+struct datachunk
+ZOOM_record_get_binary(rec, type)
+	ZOOM_record rec
+	const char* type
+	CODE:
+		RETVAL.data = (char*) ZOOM_record_get(rec, type, &RETVAL.len);
 	OUTPUT:
 		RETVAL
-		len
 
 void
 ZOOM_record_destroy(rec)
@@ -385,8 +405,8 @@ const char *
 ZOOM_scanset_term(scan, pos, occ, len)
 	ZOOM_scanset scan
 	size_t pos
-	int& occ
-	int& len
+	size_t& occ
+	size_t& len
 	OUTPUT:
 		RETVAL
 		occ
@@ -396,8 +416,8 @@ const char *
 ZOOM_scanset_display_term(scan, pos, occ, len)
 	ZOOM_scanset scan
 	size_t pos
-	int& occ
-	int& len
+	size_t& occ
+	size_t& len
 	OUTPUT:
 		RETVAL
 		occ
@@ -553,7 +573,6 @@ ZOOM_event(conns)
 	INIT:
 		SV *realconns;
 		I32 n, i;
-		int res;
 		ZOOM_connection *cs;
 	CODE:
 		/*printf("* in ZOOM_event(%p)\n", conns);*/