X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=ZOOM.xs;h=71a241d3ad72c5530f877f564b7181faf72eb43e;hb=2176830fd4825e95598f7410141add6130317b83;hp=557e4eddf133c3df3573ea49e04c6d75d667e063;hpb=c79aab4ce5b9a90f8bd3ff1f6873b4023f41f600;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 557e4ed..71a241d 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.20 2005-11-02 18:23:10 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.31 2005-11-16 16:10:13 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -207,14 +207,14 @@ ZOOM_connection_addinfo(c)
 
 # TESTED
 const char *
+ZOOM_connection_diagset(c)
+	ZOOM_connection	c
+
+# TESTED
+const char *
 ZOOM_diag_str(error)
 	int error
 
-# UNTESTED
-int
-ZOOM_connection_last_event(cs)
-	ZOOM_connection	cs
-
 # TESTED
 ZOOM_resultset
 ZOOM_connection_search(arg0, q)
@@ -250,40 +250,29 @@ size_t
 ZOOM_resultset_size(r)
 	ZOOM_resultset r
 
-# TESTING
+# TESTED
 SV *
-ZOOM_resultset_records(r, start, count, return_values)
+ZOOM_resultset_records(r, start, count, return_records)
 	ZOOM_resultset r
 	size_t start
 	size_t count
-	int return_values
+	int return_records
 	INIT:
-		ZOOM_record *recs;
+		ZOOM_record *recs = 0;
 	CODE:
-		/*printf("*** ZOOM_resultset_records(r=0x%lx, start=%lu, count=%lx, return_values=%d)\n", (unsigned long) r, (unsigned long) start, (unsigned long) count, return_values);*/
-		if (return_values) {
-			/*printf("*** generating space for %ld records\n", (unsigned long) count);*/
+		if (return_records)
 			recs = (ZOOM_record*) xmalloc(count * sizeof *recs);
-		} else {
-			/*printf("*** using null pointer for records array\n");*/
-			recs = 0;
-		}
 		ZOOM_resultset_records(r, recs, start, count);
-		/*printf("*** returned from ZOOM_resultset_records()\n");*/
-		if (return_values) {
+		if (return_records) {
 			AV *av = newAV();
 			int i;
 			for (i = 0; i < count; i++) {
-				SV *tmp = sv_newmortal();
-				printf("*** recs[%d] = %lu\n", i, (unsigned long) recs[i]);
-				/* ### Next line fails.  Damn and blast Perl */
+				SV *tmp = newSV(0);
 				sv_setref_pv(tmp, "ZOOM_record", (void*) recs[i]);
 				av_push(av, tmp);
 			}
 			RETVAL = newRV((SV*) av);
-			printf("*** returning array %lu\n", (unsigned long) RETVAL);
 		} else {
-			/*printf("*** returning undef\n");*/
 			RETVAL = &PL_sv_undef;
 		}
 	OUTPUT:
@@ -306,6 +295,20 @@ void
 ZOOM_resultset_cache_reset(r)
 	ZOOM_resultset r
 
+# TESTED (but deprecated)
+void
+ZOOM_resultset_sort(r, sort_type, sort_spec)
+	ZOOM_resultset r
+	const char* sort_type
+	const char* sort_spec
+
+# TESTED
+int
+ZOOM_resultset_sort1(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.
 #
 # TESTED
@@ -319,15 +322,15 @@ ZOOM_record_get(rec, type, len)
 		RETVAL
 		len
 
-# UNTESTED
+# TESTED
 void
 ZOOM_record_destroy(rec)
-	ZOOM_record	rec
+	ZOOM_record rec
 
-# UNTESTED
+# TESTED
 ZOOM_record
 ZOOM_record_clone(srec)
-	ZOOM_record	srec
+	ZOOM_record srec
 
 # TESTED
 ZOOM_query
@@ -356,88 +359,59 @@ ZOOM_query_sortby(s, criteria)
 	ZOOM_query	s
 	const char *	criteria
 
-# UNTESTED
+# TESTED
 ZOOM_scanset
 ZOOM_connection_scan(c, startterm)
-	ZOOM_connection	c
-	const char *	startterm
+	ZOOM_connection c
+	const char* startterm
 
-# UNTESTED
+# TESTED
 const char *
 ZOOM_scanset_term(scan, pos, occ, len)
-	ZOOM_scanset	scan
-	size_t	pos
-	int *	occ
-	int *	len
+	ZOOM_scanset scan
+	size_t pos
+	int& occ
+	int& len
+	OUTPUT:
+		RETVAL
+		occ
+		len
 
-# UNTESTED
+# TESTED
 const char *
 ZOOM_scanset_display_term(scan, pos, occ, len)
-	ZOOM_scanset	scan
-	size_t	pos
-	int *	occ
-	int *	len
+	ZOOM_scanset scan
+	size_t pos
+	int& occ
+	int& len
+	OUTPUT:
+		RETVAL
+		occ
+		len
 
-# UNTESTED
+# TESTED
 size_t
 ZOOM_scanset_size(scan)
-	ZOOM_scanset	scan
+	ZOOM_scanset scan
 
-# UNTESTED
+# TESTED
 void
 ZOOM_scanset_destroy(scan)
-	ZOOM_scanset	scan
+	ZOOM_scanset scan
 
-# UNTESTED
+# TESTED
 const char *
 ZOOM_scanset_option_get(scan, key)
 	ZOOM_scanset	scan
 	const char *	key
 
-# UNTESTED
+# TESTED
 void
 ZOOM_scanset_option_set(scan, key, val)
 	ZOOM_scanset	scan
 	const char *	key
 	const char *	val
 
-# UNTESTED
-ZOOM_package
-ZOOM_connection_package(c, options)
-	ZOOM_connection	c
-	ZOOM_options	options
-
-# UNTESTED
-void
-ZOOM_package_destroy(p)
-	ZOOM_package	p
-
-# UNTESTED
-void
-ZOOM_package_send(p, type)
-	ZOOM_package	p
-	const char *	type
-
-# UNTESTED
-const char *
-ZOOM_package_option_get(p, key)
-	ZOOM_package	p
-	const char *	key
-
-# UNTESTED
-void
-ZOOM_package_option_set(p, key, val)
-	ZOOM_package	p
-	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
@@ -542,9 +516,44 @@ ZOOM_options_set_int(opt, name, value)
 	const char* name
 	int value
 
+# TESTED
+ZOOM_package
+ZOOM_connection_package(c, options)
+	ZOOM_connection	c
+	ZOOM_options	options
+
+# TESTED
+void
+ZOOM_package_destroy(p)
+	ZOOM_package	p
+
+# TESTED
+void
+ZOOM_package_send(p, type)
+	ZOOM_package	p
+	const char *	type
+
+# TESTED
+const char *
+ZOOM_package_option_get(p, key)
+	ZOOM_package	p
+	const char *	key
+
+# TESTED
+void
+ZOOM_package_option_set(p, key, val)
+	ZOOM_package	p
+	const char *	key
+	const char *	val
+
 # UNTESTED
 int
 ZOOM_event(no, cs)
 	int	no
 	ZOOM_connection *	cs
 
+# UNTESTED
+int
+ZOOM_connection_last_event(cs)
+	ZOOM_connection	cs
+