X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=b10513e456d599584dab2764f3b8cb9abb7f51a1;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=f3b576cbc2471063361789d77948f7bf9c58f151;hpb=19fb3562d54700f677143e2b9212c8aea40ca2bd;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index f3b576c..b10513e 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,5 +1,3 @@
-/* $Id: ZOOM.xs,v 1.50 2007-11-19 12:57:16 mike Exp $ */
-
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -321,16 +319,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)
@@ -381,6 +388,12 @@ int
 ZOOM_query_sortby(s, criteria)
 	ZOOM_query	s
 	const char *	criteria
+	
+int
+ZOOM_query_sortby2(s, strategy, criteria)
+	ZOOM_query	s
+	const char *	strategy
+	const char *	criteria
 
 ZOOM_scanset
 ZOOM_connection_scan(c, startterm)
@@ -396,8 +409,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
@@ -407,8 +420,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