X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ZOOM.xs;h=b10513e456d599584dab2764f3b8cb9abb7f51a1;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=2178a2323ae91afec9c4f185ff22fcc3398e8319;hpb=bc796c5fb526230fcbc420a5ca173b3fbeecf4cf;p=ZOOM-Perl-moved-to-github.git diff --git a/ZOOM.xs b/ZOOM.xs index 2178a23..b10513e 100644 --- a/ZOOM.xs +++ b/ZOOM.xs @@ -1,11 +1,12 @@ -/* $Id: ZOOM.xs,v 1.30 2005-11-15 11:31:52 mike Exp $ */ - #include "EXTERN.h" #include "perl.h" #include "XSUB.h" #include +#include #include +#include +#include /* Used by the *_setl() functions */ typedef char opaquechar; @@ -79,36 +80,30 @@ MODULE = Net::Z3950::ZOOM PACKAGE = Net::Z3950::ZOOM PREFIX=ZOOM_ PROTOTYPES: ENABLE -# TESTED ZOOM_connection ZOOM_connection_new(host, portnum) const char* host int portnum -# TESTED ZOOM_connection ZOOM_connection_create(options) ZOOM_options options -# TESTED void ZOOM_connection_connect(c, host, portnum) ZOOM_connection c const char* host int portnum -# TESTED void ZOOM_connection_destroy(c) ZOOM_connection c -# TESTED const char * ZOOM_connection_option_get(c, key) ZOOM_connection c const char *key -# TESTED struct datachunk ZOOM_connection_option_getl(c, key, len) ZOOM_connection c @@ -121,7 +116,6 @@ ZOOM_connection_option_getl(c, key, len) RETVAL len -# TESTED void ZOOM_connection_option_set(c, key, val) ZOOM_connection c @@ -134,7 +128,6 @@ ZOOM_connection_option_set(c, key, val) # is an opaque pointer. The underlying C function can then use this # along with `len' to Do The Right Thing. # -# TESTED void ZOOM_connection_option_setl(c, key, val, len) ZOOM_connection c @@ -154,24 +147,24 @@ ZOOM_connection_option_setl(c, key, val, len) # support for const char**, but who can blame it? If you ask me, the # whole "const" thing was well-intentioned by ghastly mistake. # -# TESTED int ZOOM_connection_error(c, cp, addinfo) ZOOM_connection c char* &cp char* &addinfo CODE: + { const char *ccp, *caddinfo; RETVAL = ZOOM_connection_error(c, &ccp, &caddinfo); cp = (char*) ccp; addinfo = (char*) caddinfo; + } OUTPUT: RETVAL cp addinfo # See comments for ZOOM_connection_error() above -# TESTED int ZOOM_connection_error_x(c, cp, addinfo, diagset) ZOOM_connection c @@ -179,82 +172,85 @@ ZOOM_connection_error_x(c, cp, addinfo, diagset) const char * &addinfo const char * &diagset CODE: + { const char *ccp, *caddinfo, *cdset; RETVAL = ZOOM_connection_error_x(c, &ccp, &caddinfo, &cdset); cp = (char*) ccp; addinfo = (char*) caddinfo; diagset = (char*) cdset; + } OUTPUT: RETVAL cp addinfo diagset -# TESTED int ZOOM_connection_errcode(c) ZOOM_connection c -# TESTED const char * ZOOM_connection_errmsg(c) ZOOM_connection c -# TESTED const char * ZOOM_connection_addinfo(c) ZOOM_connection c -# TESTED +const char * +ZOOM_connection_diagset(c) + ZOOM_connection c + const char * ZOOM_diag_str(error) int error -# TESTED +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 ZOOM_query q -# TESTED ZOOM_resultset ZOOM_connection_search_pqf(c, q) ZOOM_connection c const char *q -# TESTED void ZOOM_resultset_destroy(r) ZOOM_resultset r -# TESTED const char * ZOOM_resultset_option_get(r, key) ZOOM_resultset r const char* key -# TESTED void ZOOM_resultset_option_set(r, key, val) ZOOM_resultset r const char* key const char* val -# TESTED size_t ZOOM_resultset_size(r) ZOOM_resultset r -# TESTED SV * ZOOM_resultset_records(r, start, count, return_records) ZOOM_resultset r size_t start size_t count int return_records - INIT: - ZOOM_record *recs = 0; CODE: + { + ZOOM_record *recs = 0; if (return_records) recs = (ZOOM_record*) xmalloc(count * sizeof *recs); ZOOM_resultset_records(r, recs, start, count); @@ -270,22 +266,20 @@ ZOOM_resultset_records(r, start, count, return_records) } else { RETVAL = &PL_sv_undef; } + } OUTPUT: RETVAL -# TESTED ZOOM_record ZOOM_resultset_record(s, pos) ZOOM_resultset s size_t pos -# TESTED ZOOM_record ZOOM_resultset_record_immediate(s, pos) ZOOM_resultset s size_t pos -# TESTED void ZOOM_resultset_cache_reset(r) ZOOM_resultset r @@ -297,110 +291,155 @@ ZOOM_resultset_sort(r, sort_type, sort_spec) 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 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. -# -# TESTED -### 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 -# TESTED void ZOOM_record_destroy(rec) ZOOM_record rec -# TESTED ZOOM_record ZOOM_record_clone(srec) ZOOM_record srec -# TESTED ZOOM_query ZOOM_query_create() -# TESTED void ZOOM_query_destroy(s) ZOOM_query s -# TESTED int ZOOM_query_cql(s, str) ZOOM_query s const char* str -# TESTED +int +ZOOM_query_cql2rpn(s, str, conn) + ZOOM_query s + const char* str + 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 -# TESTED 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 -# TESTED ZOOM_scanset ZOOM_connection_scan(c, startterm) ZOOM_connection c const char* startterm -# TESTED +ZOOM_scanset +ZOOM_connection_scan1(c, startterm) + ZOOM_connection c + ZOOM_query startterm + 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 len -# TESTED 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 len -# TESTED size_t ZOOM_scanset_size(scan) ZOOM_scanset scan -# TESTED void ZOOM_scanset_destroy(scan) ZOOM_scanset scan -# TESTED const char * ZOOM_scanset_option_get(scan, key) ZOOM_scanset scan const char * key -# TESTED void ZOOM_scanset_option_set(scan, key, val) ZOOM_scanset scan @@ -413,13 +452,13 @@ ZOOM_scanset_option_set(scan, key, val) # function in the callback_block -- is unavailable to us, as the # underlying C function doesn't give the block back. # -# TESTED void ZOOM_options_set_callback(opt, function, handle) ZOOM_options opt SV* function; SV* handle; CODE: + { /* The tiny amount of memory allocated here is never * released, as options_destroy() doesn't do anything * to the callback information. Not a big deal. @@ -435,29 +474,25 @@ ZOOM_options_set_callback(opt, function, handle) SvREFCNT(block->handle); ZOOM_options_set_callback(opt, __ZOOM_option_callback, (void*) block); + } -# TESTED ZOOM_options ZOOM_options_create() -# TESTED ZOOM_options ZOOM_options_create_with_parent(parent) ZOOM_options parent -# TESTED ZOOM_options ZOOM_options_create_with_parent2(parent1, parent2) ZOOM_options parent1 ZOOM_options parent2 -# TESTED const char * ZOOM_options_get(opt, name) ZOOM_options opt const char* name -# TESTED struct datachunk ZOOM_options_getl(opt, name, len) ZOOM_options opt @@ -470,14 +505,12 @@ ZOOM_options_getl(opt, name, len) RETVAL len -# TESTED void ZOOM_options_set(opt, name, v) ZOOM_options opt const char* name const char* v -# TESTED void ZOOM_options_setl(opt, name, value, len) ZOOM_options opt @@ -485,70 +518,188 @@ ZOOM_options_setl(opt, name, value, len) opaquechar* value int len -# TESTED void ZOOM_options_destroy(opt) ZOOM_options opt -# TESTED int ZOOM_options_get_bool(opt, name, defa) ZOOM_options opt const char* name int defa -# TESTED int ZOOM_options_get_int(opt, name, defa) ZOOM_options opt const char* name int defa -# TESTED void ZOOM_options_set_int(opt, name, value) ZOOM_options opt 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 +# 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. + +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 + const char *prefix + const char *name + +void +yaz_log_init_file(fname) + const char *fname + +void +yaz_log_init_level(level) + int level + +void +yaz_log_init_prefix(prefix) + const char *prefix + +void +yaz_log_time_format(fmt) + const char *fmt + +void +yaz_log_init_max_size(mx) + int mx + +# interfaces are horrible to code for a Perl-C interface +# layer. Instead, we expect Perl applications to construct the +# message themselves, and pass it in as an opaque lump. +void +yaz_log(level, str) + int level + const char *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 +