X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=673b02580912a3e7b2349a7cf6b29e6b3aba27d9;hb=c8fb970de6273fa0cb034cd6cb706734d5a7dafd;hp=ad6f4bad2c952e64c4ca2aa751e9df4c818b45fa;hpb=8dec60b264f2adf3bcd79b2ed3a0d9971541684d;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index ad6f4ba..673b025 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.38 2006-04-06 12:41:25 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.47 2007-02-22 20:37:47 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -288,6 +288,27 @@ ZOOM_resultset_sort1(r, sort_type, sort_spec)
 	const char* sort_type
 	const char* sort_spec
 
+# See comments for ZOOM_connection_error() above
+int
+ZOOM_record_error(rec, cp, addinfo, diagset)
+	ZOOM_record rec
+	const char* &cp
+	const char* &addinfo
+	const char* &diagset
+	CODE:
+		{
+		const char *ccp = "", *caddinfo = "", *cdset = "";
+		RETVAL = ZOOM_record_error(rec, &ccp, &caddinfo, &cdset);
+		cp = (char*) ccp;
+		addinfo = (char*) caddinfo;
+		diagset = (char*) cdset;
+		}
+	OUTPUT:
+		RETVAL
+		cp
+		addinfo
+		diagset
+
 # See "typemap" for discussion of the "const char *" return-type.
 #
 ### but should use datachunk for in some (not all!) cases.
@@ -327,6 +348,20 @@ ZOOM_query_cql2rpn(s, str, conn)
 	ZOOM_connection conn
 
 int
+ZOOM_query_ccl2rpn(s, query_str, config, errcode, errstr, errpos)
+	ZOOM_query s
+	const char* query_str
+	const char* config
+	int &errcode
+	const char* &errstr
+	int &errpos
+	OUTPUT:
+		RETVAL
+		errcode
+		errstr
+		errpos
+
+int
 ZOOM_query_prefix(s, str)
 	ZOOM_query s
 	const char* str
@@ -506,8 +541,6 @@ ZOOM_package_option_set(p, key, val)
 	const char *	key
 	const char *	val
 
-# UNTESTED
-#
 # This has to be called with a single argument which is a _reference_
 # to an array -- rather than directly with an array, which is of
 # course identical to passing arbitrarily many arguments.  This is
@@ -521,39 +554,38 @@ ZOOM_event(conns)
 		SV *realconns;
 		I32 n, i;
 		int res;
-		ZOOM_connection cs[100];
+		ZOOM_connection *cs;
 	CODE:
 		/*printf("* in ZOOM_event(%p)\n", conns);*/
 		if (!SvROK(conns)) {
 			/*printf("* argument is not a reference\n");*/
-			RETVAL = -1;
-			XSRETURN(1);
+			XSRETURN_IV(-1);
 		}
 		realconns = SvRV(conns);
 		/*printf("* realconns = %p\n", realconns);*/
 		if (SvTYPE(realconns) != SVt_PVAV) {
 			/*printf("* reference is not to an array\n");*/
-			RETVAL = -2;
-			XSRETURN(1);
+			XSRETURN_IV(-2);
 		}
 		n = av_len((AV*) realconns);
 		n++; /* The av_len() return-value is zero-based */
 		if (n == 0) {
 			/*printf("* No connections in referenced array\n");*/
-			RETVAL = -3;
-			XSRETURN(1);
-		} else if (n >= sizeof(cs)/sizeof(cs[0])) {
-			/*printf("* Too many connections (%d)\n", (int) n);*/
-			RETVAL = -4;
-			XSRETURN(1);
+			XSRETURN_IV(-3);
 		}
 
 		/*printf("* n = %d\n", n);*/
+		if ((cs = (ZOOM_connection*) malloc(n * sizeof *cs)) == 0) {
+			/*printf("* Too many connections (%d)\n", (int) n);*/
+			XSRETURN_IV(-4);
+		}
+
 		for (i = 0; i < n; i++) {
 		    SV **connp = av_fetch((AV*) realconns, i, (I32) 0);
+		    SV *conn, *sv;
 		    /*printf("* %d of %d: connp = %p\n", (int) i, (int) n,connp);*/
 		    assert(connp != 0);
-		    SV *conn = *connp;
+		    conn = *connp;
 		    /*printf("* conn = %p\n", conn);*/
 		    /*
 		     * From here on, the tests and assertions seem to
@@ -567,22 +599,29 @@ ZOOM_event(conns)
 		    /*printf("* passed assert(isa(ZOOM_connection))\n");*/
 		    assert(SvROK(conn));
 		    /*printf("* passed assert SvROK()\n");*/
-		    SV *sv = (SV*) SvRV(conn);
+		    sv = (SV*) SvRV(conn);
 		    /*printf("* sv = %p\n", sv);*/
-		    IV tmp = SvIV(sv);
-		    /*printf("* tmp = %d\n", tmp);	*/
-		    cs[i] = INT2PTR(ZOOM_connection, tmp);
+		    cs[i] = INT2PTR(ZOOM_connection, SvIV(sv));
 		    /*printf("got cs[%d] of %d = %p\n", (int) i, (int) n, cs[i]);*/
 		}
 		RETVAL = ZOOM_event((int) n, cs);
+		free(cs);
 	OUTPUT:
 		RETVAL
 
-# UNTESTED
 int
 ZOOM_connection_last_event(cs)
 	ZOOM_connection	cs
 
+int
+ZOOM_connection_is_idle(cs)
+	ZOOM_connection	cs
+
+int
+ZOOM_connection_peek_event(cs)
+	ZOOM_connection	cs
+
+
 # ----------------------------------------------------------------------------
 # What follows is the YAZ logging API.  This is not strictly part of
 # ZOOM, but it's so useful that it would be silly to omit.