X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=27721396efdeff9b30aa7c38e79532413cea54a0;hb=33ab99ed17f92d8c84e580f3708b9d6d27fa1bc7;hp=990f610110f2d50e0000ebfd0bcd2ab7f16352f2;hpb=4152d3df77cbb06c9745a30400ed5c1cf98ee3b1;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 990f610..2772139 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.16 2005-10-24 16:39:55 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.24 2005-11-04 17:07:13 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -210,16 +210,11 @@ const char *
 ZOOM_diag_str(error)
 	int error
 
-# UNTESTED
-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 +227,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_records)
+	ZOOM_resultset r
+	size_t start
+	size_t count
+	int return_records
+	INIT:
+		ZOOM_record *recs = 0;
+	CODE:
+		if (return_records)
+			recs = (ZOOM_record*) xmalloc(count * sizeof *recs);
+		ZOOM_resultset_records(r, recs, start, count);
+		if (return_records) {
+			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 +279,23 @@ 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
+
+# TESTED
+void
+ZOOM_resultset_sort(r, sort_type, sort_spec)
+	ZOOM_resultset r
+	const char* sort_type
+	const char* sort_spec
 
 # See "typemap" for discussion of the "const char *" return-type.
 #
@@ -298,28 +320,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
@@ -400,13 +422,6 @@ ZOOM_package_option_set(p, key, val)
 	const char *	key
 	const char *	val
 
-# UNTESTED
-void
-ZOOM_resultset_sort(r, sort_type, sort_spec)
-	ZOOM_resultset	r
-	const char *	sort_type
-	const char *	sort_spec
-
 # We ignore the return value of ZOOM_options_set_callback(), since it
 # is always just the address of the __ZOOM_option_callback() function.
 # The information that we actually want -- the address of the Perl
@@ -517,3 +532,8 @@ ZOOM_event(no, cs)
 	int	no
 	ZOOM_connection *	cs
 
+# UNTESTED
+int
+ZOOM_connection_last_event(cs)
+	ZOOM_connection	cs
+