X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=71a241d3ad72c5530f877f564b7181faf72eb43e;hb=1ca1d4abecce01941183fa3bed64df468b43c50d;hp=954d1bd5fa6bafa0cbe7487416bf4455ab5f719a;hpb=391e72e5022f25c43a027b84d6eeb0a8cb60d628;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 954d1bd..71a241d 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.23 2005-11-03 16:42:22 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.31 2005-11-16 16:10:13 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -207,6 +207,11 @@ ZOOM_connection_addinfo(c)
 
 # TESTED
 const char *
+ZOOM_connection_diagset(c)
+	ZOOM_connection	c
+
+# TESTED
+const char *
 ZOOM_diag_str(error)
 	int error
 
@@ -290,12 +295,19 @@ void
 ZOOM_resultset_cache_reset(r)
 	ZOOM_resultset r
 
-# UNTESTED
+# TESTED (but deprecated)
 void
 ZOOM_resultset_sort(r, sort_type, sort_spec)
-	ZOOM_resultset	r
-	const char *	sort_type
-	const char *	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.
 #
@@ -310,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
@@ -347,81 +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
-
 # 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
@@ -526,6 +516,36 @@ 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)