X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=b10513e456d599584dab2764f3b8cb9abb7f51a1;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=efb4582a5e6ca5b4608b777f1553d9ccf257f2ea;hpb=f53b84a5cc7a641511e7caf241aab3229673cd0e;p=ZOOM-Perl-moved-to-github.git diff --git a/ZOOM.xs b/ZOOM.xs index efb4582..b10513e 100644 --- a/ZOOM.xs +++ b/ZOOM.xs @@ -1,11 +1,12 @@ -/* $Id: ZOOM.xs,v 1.35 2005-12-21 16:54:45 mike Exp $ */ - #include "EXTERN.h" #include "perl.h" #include "XSUB.h" #include +#include #include +#include +#include /* Used by the *_setl() functions */ typedef char opaquechar; @@ -204,6 +205,14 @@ const char * ZOOM_diag_str(error) int error +const char * +ZOOM_diag_srw_str(error) + int error + CODE: + RETVAL = yaz_diag_srw_str(error); + OUTPUT: + RETVAL + ZOOM_resultset ZOOM_connection_search(arg0, q) ZOOM_connection arg0 @@ -288,17 +297,47 @@ 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. const char * -ZOOM_record_get(rec, type, len) +ZOOM_record_get_string(rec, type) ZOOM_record rec const char* type - int &len + INIT: + int len; + CODE: + RETVAL = ZOOM_record_get(rec, type, &len); + OUTPUT: + RETVAL + +struct datachunk +ZOOM_record_get_binary(rec, type) + ZOOM_record rec + const char* type + CODE: + RETVAL.data = (char*) ZOOM_record_get(rec, type, &RETVAL.len); OUTPUT: RETVAL - len void ZOOM_record_destroy(rec) @@ -327,6 +366,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 @@ -335,6 +388,12 @@ int ZOOM_query_sortby(s, criteria) ZOOM_query s const char * criteria + +int +ZOOM_query_sortby2(s, strategy, criteria) + ZOOM_query s + const char * strategy + const char * criteria ZOOM_scanset ZOOM_connection_scan(c, startterm) @@ -350,8 +409,8 @@ const char * ZOOM_scanset_term(scan, pos, occ, len) ZOOM_scanset scan size_t pos - int& occ - int& len + size_t& occ + size_t& len OUTPUT: RETVAL occ @@ -361,8 +420,8 @@ const char * ZOOM_scanset_display_term(scan, pos, occ, len) ZOOM_scanset scan size_t pos - int& occ - int& len + size_t& occ + size_t& len OUTPUT: RETVAL occ @@ -506,17 +565,86 @@ 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 +# 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; + ZOOM_connection *cs; + 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); + } + + /*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); + 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); + 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. @@ -525,6 +653,10 @@ int yaz_log_mask_str(str) const char *str +int +yaz_log_module_level(name) + const char *name + void yaz_log_init(level, prefix, name) int level @@ -561,3 +693,13 @@ yaz_log(level, str) CODE: yaz_log(level, "%s", str); +# This is also not strictly part of ZOOM +unsigned long +yaz_version(version_str, sys_str) + char *version_str + char *sys_str + OUTPUT: + RETVAL + version_str + sys_str +