X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=7f02c013df6619340b0c5a4b58fee2c576768e9e;hb=692fb30bc0ab6d6e1536405ed7040ecd2b7c94ce;hp=5298f1c53674574b07549dc32ce1733041d0e382;hpb=32c2c74a2199009b15a30c0c5266fd2875f78834;p=ZOOM-Perl-moved-to-github.git

diff --git a/ZOOM.xs b/ZOOM.xs
index 5298f1c..7f02c01 100644
--- a/ZOOM.xs
+++ b/ZOOM.xs
@@ -1,4 +1,4 @@
-/* $Id: ZOOM.xs,v 1.37 2006-01-20 12:33:14 mike Exp $ */
+/* $Id: ZOOM.xs,v 1.42 2006-06-15 15:43:13 mike Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -327,6 +327,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
@@ -507,10 +521,71 @@ ZOOM_package_option_set(p, key, val)
 	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
+# because there doesn't seem to be a way to do varargs in an XS
+# function.
+#
 int
-ZOOM_event(no, cs)
-	int	no
-	ZOOM_connection *	cs
+ZOOM_event(conns)
+	SV* conns
+	INIT:
+		SV *realconns;
+		I32 n, i;
+		int res;
+		ZOOM_connection cs[100];
+	CODE:
+		/*printf("* in ZOOM_event(%p)\n", conns);*/
+		if (!SvROK(conns)) {
+			/*printf("* argument is not a reference\n");*/
+			XSRETURN_IV(-1);
+		}
+		realconns = SvRV(conns);
+		/*printf("* realconns = %p\n", realconns);*/
+		if (SvTYPE(realconns) != SVt_PVAV) {
+			/*printf("* reference is not to an array\n");*/
+			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");*/
+			XSRETURN_IV(-3);
+		} else if (n >= sizeof(cs)/sizeof(cs[0])) {
+			/*printf("* Too many connections (%d)\n", (int) n);*/
+			XSRETURN_IV(-4);
+		}
+
+		/*printf("* n = %d\n", n);*/
+		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);
+		    conn = *connp;
+		    /*printf("* conn = %p\n", conn);*/
+		    /*
+		     * From here on, the tests and assertions seem to
+		     * be ignored: if I pass in a reference to
+		     * something other than a ZOOM_connection, or even
+		     * if I pass a non-reference, the assertions still
+		     * pass and everything seems to work until the
+		     * segmentation fault bites.
+		     */
+		    assert(sv_derived_from(conn, "ZOOM_connection"));
+		    /*printf("* passed assert(isa(ZOOM_connection))\n");*/
+		    assert(SvROK(conn));
+		    /*printf("* passed assert SvROK()\n");*/
+		    sv = (SV*) SvRV(conn);
+		    /*printf("* sv = %p\n", sv);*/
+		    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);
+	OUTPUT:
+		RETVAL
 
 # UNTESTED
 int