X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=ZOOM.xs;h=7df537699ba6f053fcfa8f5ce03916b3ce7c104c;hb=a3e8644875d6c1bc32f9695c2b7bfcc2837abb02;hp=2c2686c14b39c9ca03b3cd024ee14c27f3ef872d;hpb=6fa5e35e6c94d7f0d786b78eb680b477c1820459;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 2c2686c..7df5376 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.15 2005-10-18 17:00:28 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.21 2005-11-03 15:58:09 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -215,11 +215,11 @@ int
 ZOOM_connection_last_event(cs)
 	ZOOM_connection	cs
 
-# UNTESTED
+# TESTED
 ZOOM_resultset
 ZOOM_connection_search(arg0, q)
 	ZOOM_connection	arg0
-	ZOOM_query	q
+	ZOOM_query q
 
 # TESTED
 ZOOM_resultset
@@ -232,31 +232,51 @@ void
 ZOOM_resultset_destroy(r)
 	ZOOM_resultset r
 
-# UNTESTED
+# TESTED
 const char *
 ZOOM_resultset_option_get(r, key)
-	ZOOM_resultset	r
-	const char *	key
+	ZOOM_resultset r
+	const char* key
 
-# UNTESTED
+# TESTED
 void
 ZOOM_resultset_option_set(r, key, val)
-	ZOOM_resultset	r
-	const char *	key
-	const char *	val
+	ZOOM_resultset r
+	const char* key
+	const char* val
 
 # TESTED
 size_t
 ZOOM_resultset_size(r)
 	ZOOM_resultset r
 
-# UNTESTED
-void
-ZOOM_resultset_records(r, recs, start, count)
-	ZOOM_resultset	r
-	ZOOM_record *	recs
-	size_t	start
-	size_t	count
+# TESTED
+SV *
+ZOOM_resultset_records(r, start, count, return_values)
+	ZOOM_resultset r
+	size_t start
+	size_t count
+	int return_values
+	INIT:
+		ZOOM_record *recs = 0;
+	CODE:
+		if (return_values)
+			recs = (ZOOM_record*) xmalloc(count * sizeof *recs);
+		ZOOM_resultset_records(r, recs, start, count);
+		if (return_values) {
+			AV *av = newAV();
+			int i;
+			for (i = 0; i < count; i++) {
+				SV *tmp = newSV(0);
+				sv_setref_pv(tmp, "ZOOM_record", (void*) recs[i]);
+				av_push(av, tmp);
+			}
+			RETVAL = newRV((SV*) av);
+		} else {
+			RETVAL = &PL_sv_undef;
+		}
+	OUTPUT:
+		RETVAL
 
 # TESTED
 ZOOM_record
@@ -264,16 +284,16 @@ ZOOM_resultset_record(s, pos)
 	ZOOM_resultset s
 	size_t pos
 
-# UNTESTED
+# TESTED
 ZOOM_record
 ZOOM_resultset_record_immediate(s, pos)
-	ZOOM_resultset	s
-	size_t	pos
+	ZOOM_resultset s
+	size_t pos
 
-# UNTESTED
+# TESTED
 void
 ZOOM_resultset_cache_reset(r)
-	ZOOM_resultset	r
+	ZOOM_resultset r
 
 # See "typemap" for discussion of the "const char *" return-type.
 #
@@ -298,28 +318,28 @@ ZOOM_record
 ZOOM_record_clone(srec)
 	ZOOM_record	srec
 
-# UNTESTED
+# TESTED
 ZOOM_query
 ZOOM_query_create()
 
-# UNTESTED
+# TESTED
 void
 ZOOM_query_destroy(s)
-	ZOOM_query	s
+	ZOOM_query s
 
-# UNTESTED
+# TESTED
 int
 ZOOM_query_cql(s, str)
-	ZOOM_query	s
-	const char *	str
+	ZOOM_query s
+	const char* str
 
-# UNTESTED
+# TESTED
 int
 ZOOM_query_prefix(s, str)
-	ZOOM_query	s
-	const char *	str
+	ZOOM_query s
+	const char* str
 
-# UNTESTED
+# TESTED
 int
 ZOOM_query_sortby(s, criteria)
 	ZOOM_query	s
@@ -423,11 +443,16 @@ ZOOM_options_set_callback(opt, function, handle)
 		/* The tiny amount of memory allocated here is never
 	         * released, as options_destroy() doesn't do anything
 	         * to the callback information.  Not a big deal.
+		 * Also, I have no idea how to drive the Perl "mortal"
+		 * reference-counting stuff, so I am just allocating
+		 * copies which also never get released.  Don't sue!
 		 */
 		struct callback_block *block = (struct callback_block*)
 			xmalloc(sizeof *block);
 		block->function = function;
 		block->handle = handle;
+		SvREFCNT(block->function);
+		SvREFCNT(block->handle);
 		ZOOM_options_set_callback(opt, __ZOOM_option_callback,
 					  (void*) block);