X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=fbbcafc22630cdbeb4293e2f6caf1f414ce7d3cf;hp=7a0b17a65969092230738cf30bb4bc95d7aa92ac;hb=eb69046dd58ade30eada3a5ec5f2d4c05fb3b9b5;hpb=76c6d9aa7b7671681fdb7f85f68d45201c080899 diff --git a/SimpleServer.xs b/SimpleServer.xs index 7a0b17a..fbbcafc 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,8 @@ /* - * Copyright (c) 2000, Index Data. + * $Id: SimpleServer.xs,v 1.70 2007-08-17 16:21:41 mike Exp $ + * ---------------------------------------------------------------------- + * + * Copyright (c) 2000-2004, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -24,24 +27,40 @@ * OF THIS SOFTWARE. */ - #include "EXTERN.h" #include "perl.h" +#include "proto.h" +#include "embed.h" #include "XSUB.h" +#include #include #include #include +#include #include +#include +#include +#ifdef WIN32 +#else +#include +#endif #include #include +#define GRS_MAX_FIELDS 500 #ifdef ASN_COMPILED #include #endif +#ifndef sv_undef /* To fix the problem with Perl 5.6.0 */ +#define sv_undef PL_sv_undef +#endif +YAZ_MUTEX simpleserver_mutex; typedef struct { - SV *handle; - + SV *ghandle; /* Global handle specified at creation */ + SV *handle; /* Per-connection handle set at Init */ +#if 0 +/* ### These callback-reference elements are never used! */ SV *init_ref; SV *close_ref; SV *sort_ref; @@ -51,8 +70,15 @@ typedef struct { SV *esrequest_ref; SV *delete_ref; SV *scan_ref; + SV *explain_ref; +#endif /*0*/ + NMEM nmem; + int stop_flag; /* is used to stop server prematurely .. */ } Zfront_handle; +#define ENABLE_STOP_SERVER 0 + +SV *_global_ghandle = NULL; /* To be copied into zhandle then ignored */ SV *init_ref = NULL; SV *close_ref = NULL; SV *sort_ref = NULL; @@ -62,7 +88,204 @@ SV *present_ref = NULL; SV *esrequest_ref = NULL; SV *delete_ref = NULL; SV *scan_ref = NULL; -int MAX_OID = 15; +SV *explain_ref = NULL; +PerlInterpreter *root_perl_context; + +#define GRS_BUF_SIZE 8192 + + +/* + * Inspects the SV indicated by svp, and returns a null pointer if + * it's an undefined value, or a string allocation from `stream' + * otherwise. Using this when filling in addinfo avoids those + * irritating "Use of uninitialized value in subroutine entry" + * warnings from Perl. + */ +char *string_or_undef(SV **svp, ODR stream) { + STRLEN len; + char *ptr, *buf; + + if (!SvOK(*svp)) + return 0; + + ptr = SvPV(*svp, len); + buf = (char*) odr_malloc(stream, len+1); + strcpy(buf, ptr); + return buf; +} + + +CV * simpleserver_sv2cv(SV *handler) { + STRLEN len; + char *buf; + + if (SvPOK(handler)) { + CV *ret; + buf = SvPV( handler, len); + if ( !( ret = perl_get_cv(buf, FALSE ) ) ) { + fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf ); + exit(1); + } + + return ret; + } else { + return (CV *) handler; + } +} + +/* debugging routine to check for destruction of Perl interpreters */ +#ifdef USE_ITHREADS +void tst_clones(void) +{ + int i; + PerlInterpreter *parent = PERL_GET_CONTEXT; + for (i = 0; i<5000; i++) + { + PerlInterpreter *perl_interp; + + PERL_SET_CONTEXT(parent); + PL_perl_destruct_level = 2; + perl_interp = perl_clone(parent, CLONEf_CLONE_HOST); + PL_perl_destruct_level = 2; + PERL_SET_CONTEXT(perl_interp); + perl_destruct(perl_interp); + perl_free(perl_interp); + } + exit (0); +} +#endif + +int simpleserver_clone(void) { +#ifdef USE_ITHREADS + yaz_mutex_enter(simpleserver_mutex); + if (1) + { + PerlInterpreter *current = PERL_GET_CONTEXT; + + /* if current is unset, then we're in a new thread with + * no Perl interpreter for it. So we must create one . + * This will only happen when threaded is used.. + */ + if (!current) { + PerlInterpreter *perl_interp; + PERL_SET_CONTEXT( root_perl_context ); + perl_interp = perl_clone(root_perl_context, CLONEf_CLONE_HOST); + PERL_SET_CONTEXT( perl_interp ); + } + } + yaz_mutex_leave(simpleserver_mutex); +#endif + return 0; +} + + +void simpleserver_free(void) { + yaz_mutex_enter(simpleserver_mutex); + if (1) + { + PerlInterpreter *current_interp = PERL_GET_CONTEXT; + + /* If current Perl Interp is different from root interp, then + * we're in threaded mode and we must destroy.. + */ + if (current_interp != root_perl_context) { + PL_perl_destruct_level = 2; + PERL_SET_CONTEXT(current_interp); + perl_destruct(current_interp); + perl_free(current_interp); + } + } + yaz_mutex_leave(simpleserver_mutex); +} + + +Z_GenericRecord *read_grs1(char *str, ODR o) +{ + int type, ivalue; + char line[GRS_BUF_SIZE+1], *buf, *ptr, *original; + char value[GRS_BUF_SIZE+1]; + Z_GenericRecord *r = 0; + + original = str; + r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r)); + r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); + r->num_elements = 0; + + for (;;) + { + Z_TaggedElement *t; + Z_ElementData *c; + int len; + + ptr = strchr(str, '\n'); + if (!ptr) { + return r; + } + len = ptr - str; + if (len > GRS_BUF_SIZE) { + yaz_log(YLOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE); + len = GRS_BUF_SIZE; + } + strncpy(line, str, len); + line[len] = 0; + buf = line; + str = ptr + 1; + while (*buf && isspace(*buf)) + buf++; + if (*buf == '}') { + memmove(original, str, strlen(str)); + return r; + } + if (sscanf(buf, "(%d,%[^)])", &type, value) != 2) + { + yaz_log(YLOG_WARN, "Bad data in '%s'", buf); + return r; + } + if (!type && *value == '0') + return r; + if (!(buf = strchr(buf, ')'))) + return r; + buf++; + while (*buf && isspace(*buf)) + buf++; + if (r->num_elements >= GRS_MAX_FIELDS) + { + yaz_log(YLOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", GRS_MAX_FIELDS); + exit(0); + } + r->elements[r->num_elements] = t = (Z_TaggedElement *) odr_malloc(o, sizeof(Z_TaggedElement)); + t->tagType = odr_intdup(o, type); + t->tagValue = (Z_StringOrNumeric *) + odr_malloc(o, sizeof(Z_StringOrNumeric)); + if ((ivalue = atoi(value))) + { + t->tagValue->which = Z_StringOrNumeric_numeric; + t->tagValue->u.numeric = odr_intdup(o, ivalue); + } + else + { + t->tagValue->which = Z_StringOrNumeric_string; + t->tagValue->u.string = odr_strdup(o, value); + } + t->tagOccurrence = 0; + t->metaData = 0; + t->appliedVariant = 0; + t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData)); + if (*buf == '{') + { + c->which = Z_ElementData_subtree; + c->u.subtree = read_grs1(str, o); + } + else + { + c->which = Z_ElementData_string; + c->u.string = odr_strdup(o, buf); + } + r->num_elements++; + } +} + + static void oid2str(Odr_oid *o, WRBUF buf) { @@ -75,112 +298,440 @@ static void oid2str(Odr_oid *o, WRBUF buf) } } +WRBUF oid2dotted(Odr_oid *oid) +{ + WRBUF buf = wrbuf_alloc(); + oid2str(oid, buf); + return buf; +} + + +WRBUF zquery2pquery(Z_Query *q) +{ + WRBUF buf = wrbuf_alloc(); + + if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) + return 0; + yaz_rpnquery_to_wrbuf(buf, q->u.type_1); + return buf; +} + + +/* Lifted verbatim from Net::Z3950 yazwrap/util.c */ +#include +void fatal(char *fmt, ...) +{ + va_list ap; + + fprintf(stderr, "FATAL (SimpleServer): "); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "\n"); + abort(); +} + + +/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */ +/* + * Creates a new Perl object of type `class'; the newly-created scalar + * that is a reference to the blessed thingy `referent' is returned. + */ +static SV *newObject(char *class, SV *referent) +{ + HV *stash; + SV *sv; + + sv = newRV_noinc((SV*) referent); + stash = gv_stashpv(class, 0); + if (stash == 0) + fatal("attempt to create object of undefined class '%s'", class); + /*assert(stash != 0);*/ + sv_bless(sv, stash); + return sv; +} + + +/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */ +static void setMember(HV *hv, char *name, SV *val) +{ + /* We don't increment `val's reference count -- I think this is + * right because it's created with a refcount of 1, and in fact + * the reference via this hash is the only reference to it in + * general. + */ + if (!hv_store(hv, name, (U32) strlen(name), val, (U32) 0)) + fatal("couldn't store member in hash"); +} + + +/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */ +static SV *translateOID(Odr_oid *x) +{ + /* Yaz represents an OID by an int array terminated by a negative + * value, typically -1; we represent it as a reference to a + * blessed scalar string of "."-separated elements. + */ + char buf[1000]; + int i; + + *buf = '\0'; + for (i = 0; x[i] >= 0; i++) { + sprintf(buf + strlen(buf), "%d", (int) x[i]); + if (x[i+1] >- 0) + strcat(buf, "."); + } + + /* + * ### We'd like to return a blessed scalar (string) here, but of + * course you can't do that in Perl: only references can be + * blessed, so we'd have to return a _reference_ to a string, and + * bless _that_. Better to do without the blessing, I think. + */ + if (1) { + return newSVpv(buf, 0); + } else { + return newObject("Net::Z3950::APDU::OID", newSVpv(buf, 0)); + } +} + -static int rpn2pquery(Z_RPNStructure *s, WRBUF buf) +static SV *rpn2perl(Z_RPNStructure *s) { + SV *sv; + HV *hv; + AV *av; + SV *sv2; + char *rsid; + Z_Operand *o; + Z_AttributesPlusTerm *at; + switch (s->which) { - case Z_RPNStructure_simple: { - Z_Operand *o = s->u.simple; - - switch (o->which) { - case Z_Operand_APT: { - Z_AttributesPlusTerm *at = o->u.attributesPlusTerm; - - if (at->attributes) { - int i; - char ibuf[16]; - - for (i = 0; i < at->attributes->num_attributes; i++) { - wrbuf_puts(buf, "@attr "); - if (at->attributes->attributes[i]->attributeSet) { - oid2str(at->attributes->attributes[i]->attributeSet, buf); - wrbuf_putc(buf, ' '); - } - sprintf(ibuf, "%d=", *at->attributes->attributes[i]->attributeType); - assert(at->attributes->attributes[i]->which == Z_AttributeValue_numeric); - wrbuf_puts(buf, ibuf); - sprintf(ibuf, "%d ", *at->attributes->attributes[i]->value.numeric); - wrbuf_puts(buf, ibuf); - } - } - switch (at->term->which) { - case Z_Term_general: { - wrbuf_putc(buf, '"'); - wrbuf_write(buf, (char*) at->term->u.general->buf, at->term->u.general->len); - wrbuf_puts(buf, "\" "); - break; + case Z_RPNStructure_simple: + o = s->u.simple; + switch (o->which) { + case Z_Operand_resultSetId: + /* This code causes a SIGBUS on my machine, and I have no + idea why. It seems as clear as day to me */ + rsid = (char*) o->u.resultSetId; + printf("Encoding resultSetId '%s'\n", rsid); + sv = newObject("Net::Z3950::RPN::RSID", (SV*) (hv = newHV())); + printf("Made sv=0x%lx, hv=0x%lx\n", + (unsigned long) sv ,(unsigned long) hv); + sv2 = newSVpv(rsid, strlen(rsid)); + setMember(hv, "id", sv2); + printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2); + return sv; + + case Z_Operand_APT: + at = o->u.attributesPlusTerm; + if (at->term->which != Z_Term_general) + fatal("can't handle RPN terms other than general"); + + sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV())); + if (at->attributes) { + int i; + SV *attrs = newObject("Net::Z3950::RPN::Attributes", + (SV*) (av = newAV())); + for (i = 0; i < at->attributes->num_attributes; i++) { + Z_AttributeElement *elem = at->attributes->attributes[i]; + HV *hv2; + SV *tmp = newObject("Net::Z3950::RPN::Attribute", + (SV*) (hv2 = newHV())); + if (elem->attributeSet) + setMember(hv2, "attributeSet", + translateOID(elem->attributeSet)); + setMember(hv2, "attributeType", + newSViv(*elem->attributeType)); + if (elem->which == Z_AttributeValue_numeric) { + setMember(hv2, "attributeValue", + newSViv(*elem->value.numeric)); + } else { + assert(elem->which == Z_AttributeValue_complex); + Z_ComplexAttribute *complex = elem->value.complex; + Z_StringOrNumeric *son; + /* We ignore semantic actions and multiple values */ + assert(complex->num_list > 0); + son = complex->list[0]; + if (son->which == Z_StringOrNumeric_numeric) { + setMember(hv2, "attributeValue", + newSViv(*son->u.numeric)); + } else { /*Z_StringOrNumeric_string*/ + setMember(hv2, "attributeValue", + newSVpv(son->u.string, 0)); } - default: abort(); } - break; + av_push(av, tmp); } - default: abort(); + setMember(hv, "attributes", attrs); } - break; + setMember(hv, "term", newSVpv((char*) at->term->u.general->buf, + at->term->u.general->len)); + return sv; + + default: + fatal("can't handle RPN simples other than APT and RSID"); + } - case Z_RPNStructure_complex: { - Z_Complex *c = s->u.complex; - - switch (c->roperator->which) { - case Z_Operator_and: wrbuf_puts(buf, "@and "); break; - case Z_Operator_or: wrbuf_puts(buf, "@or "); break; - case Z_Operator_and_not: wrbuf_puts(buf, "@not "); break; - case Z_Operator_prox: abort(); - default: abort(); - } - if (!rpn2pquery(c->s1, buf)) - return 0; - if (!rpn2pquery(c->s2, buf)) - return 0; - break; + + case Z_RPNStructure_complex: { + SV *tmp; + Z_Complex *c = s->u.complex; + char *type = 0; /* vacuous assignment satisfies gcc -Wall */ + switch (c->roperator->which) { + case Z_Operator_and: type = "Net::Z3950::RPN::And"; break; + case Z_Operator_or: type = "Net::Z3950::RPN::Or"; break; + case Z_Operator_and_not: type = "Net::Z3950::RPN::AndNot"; break; + case Z_Operator_prox: fatal("proximity not yet supported"); + default: fatal("unknown RPN operator %d", (int) c->roperator->which); } - default: abort(); + sv = newObject(type, (SV*) (av = newAV())); + if ((tmp = rpn2perl(c->s1)) == 0) + return 0; + av_push(av, tmp); + if ((tmp = rpn2perl(c->s2)) == 0) + return 0; + av_push(av, tmp); + return sv; + } + default: + fatal("unknown RPN node type %d", (int) s->which); } + + return 0; +} + + +/* Decode the Z_SortAttributes struct and store the whole thing into the + * hash by reference + */ +int simpleserver_ExpandSortAttributes (HV *sort_spec, Z_SortAttributes *sattr) +{ + WRBUF attrset_wr = wrbuf_alloc(); + AV *list = newAV(); + Z_AttributeList *attr_list = sattr->list; + int i; + + oid2str(sattr->id, attrset_wr); + hv_store(sort_spec, "ATTRSET", 7, + newSVpv(attrset_wr->buf, attrset_wr->pos), 0); + wrbuf_destroy(attrset_wr); + + hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0); + + for (i = 0; i < attr_list->num_attributes; i++) + { + Z_AttributeElement *attr = *attr_list->attributes++; + HV *attr_spec = newHV(); + + av_push(list, newRV( sv_2mortal( (SV*) attr_spec ) )); + hv_store(attr_spec, "ATTR_TYPE", 9, newSViv(*attr->attributeType), 0); + + if (attr->which == Z_AttributeValue_numeric) + { + hv_store(attr_spec, "ATTR_VALUE", 10, + newSViv(*attr->value.numeric), 0); + } else { + return 0; + } + } + return 1; } -WRBUF zquery2pquery(Z_Query *q) +/* Decode the Z_SortKeySpec struct and store the whole thing in a perl hash */ +int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec) { - WRBUF buf = wrbuf_alloc(); + Z_SortElement *element = spec->sortElement; - if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) - return 0; - if (q->u.type_1->attributeSetId) { - /* Output attribute set ID */ - wrbuf_puts(buf, "@attrset "); - oid2str(q->u.type_1->attributeSetId, buf); - wrbuf_putc(buf, ' '); + hv_store(sort_spec, "RELATION", 8, newSViv(*spec->sortRelation), 0); + hv_store(sort_spec, "CASE", 4, newSViv(*spec->caseSensitivity), 0); + hv_store(sort_spec, "MISSING", 7, newSViv(spec->which), 0); + + if (element->which == Z_SortElement_generic) + { + Z_SortKey *key = element->u.generic; + + if (key->which == Z_SortKey_sortField) + { + hv_store(sort_spec, "SORTFIELD", 9, + newSVpv((char *) key->u.sortField, 0), 0); + } + else if (key->which == Z_SortKey_elementSpec) + { + Z_Specification *zspec = key->u.elementSpec; + + hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16, + newSViv(zspec->which), 0); + + if (zspec->which == Z_Schema_oid) + { + WRBUF elementSpec = wrbuf_alloc(); + + oid2str(zspec->schema.oid, elementSpec); + hv_store(sort_spec, "ELEMENTSPEC_VALUE", 17, + newSVpv(elementSpec->buf, elementSpec->pos), 0); + wrbuf_destroy(elementSpec); + } + else if (zspec->which == Z_Schema_uri) + { + hv_store(sort_spec, "ELEMENTSPEC_VALUE", 17, + newSVpv((char *) zspec->schema.uri, 0), 0); + } + } + else if (key->which == Z_SortKey_sortAttributes) + { + return simpleserver_ExpandSortAttributes(sort_spec, + key->u.sortAttributes); + } + else + { + return 0; + } + } + else + { + return 0; } - return rpn2pquery(q->u.type_1->RPNStructure, buf) ? buf : 0; + + return 1; } -int bend_sort(void *handle, bend_sort_rr *rr) +static SV *zquery2perl(Z_Query *q) { - perl_call_sv(sort_ref, G_VOID | G_DISCARD | G_NOARGS); - return; + SV *sv; + HV *hv; + + if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) + return 0; + sv = newObject("Net::Z3950::APDU::Query", (SV*) (hv = newHV())); + if (q->u.type_1->attributeSetId) + setMember(hv, "attributeSet", + translateOID(q->u.type_1->attributeSetId)); + setMember(hv, "query", rpn2perl(q->u.type_1->RPNStructure)); + return sv; } -int bend_search(void *handle, bend_search_rr *rr) +int bend_sort(void *handle, bend_sort_rr *rr) { HV *href; AV *aref; + AV *sort_seq; SV **temp; - SV *hits; SV *err_code; SV *err_str; - char *ODR_errstr; + SV *status; + SV *point; STRLEN len; + char *ptr; + char *ODR_err_str; + char **input_setnames; + Zfront_handle *zhandle = (Zfront_handle *)handle; + Z_SortKeySpecList *sort_spec = rr->sort_sequence; + int i; + + dSP; + ENTER; + SAVETMPS; + + aref = newAV(); + input_setnames = rr->input_setnames; + for (i = 0; i < rr->num_input_setnames; i++) + { + av_push(aref, newSVpv(*input_setnames++, 0)); + } + + sort_seq = newAV(); + for (i = 0; i < sort_spec->num_specs; i++) + { + Z_SortKeySpec *spec = *sort_spec->specs++; + HV *sort_spec = newHV(); + + if ( simpleserver_SortKeySpecToHash(sort_spec, spec) ) + av_push(sort_seq, newRV( sv_2mortal( (SV*) sort_spec ) )); + else + { + rr->errcode = 207; + return 0; + } + } + + href = newHV(); + hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0); + hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0); + hv_store(href, "SEQUENCE", 8, newRV( (SV*) sort_seq), 0); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); + hv_store(href, "STATUS", 6, newSViv(0), 0); + hv_store(href, "ERR_CODE", 8, newSViv(0), 0); + hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0); + + PUSHMARK(sp); + + XPUSHs(sv_2mortal(newRV( (SV*) href))); + + PUTBACK; + + perl_call_sv(sort_ref, G_SCALAR | G_DISCARD); + + SPAGAIN; + + temp = hv_fetch(href, "ERR_CODE", 8, 1); + err_code = newSVsv(*temp); + + temp = hv_fetch(href, "ERR_STR", 7, 1); + err_str = newSVsv(*temp); + + temp = hv_fetch(href, "STATUS", 6, 1); + status = newSVsv(*temp); + + temp = hv_fetch(href, "HANDLE", 6, 1); + point = newSVsv(*temp); + + hv_undef(href); + av_undef(aref); + av_undef(sort_seq); + + sv_free( (SV*) aref); + sv_free( (SV*) href); + sv_free( (SV*) sort_seq); + + rr->errcode = SvIV(err_code); + rr->sort_status = SvIV(status); + + ptr = SvPV(err_str, len); + ODR_err_str = (char *)odr_malloc(rr->stream, len + 1); + strcpy(ODR_err_str, ptr); + rr->errstring = ODR_err_str; + zhandle->handle = point; + + sv_free(err_code); + sv_free(err_str); + sv_free(status); + + PUTBACK; + FREETMPS; + LEAVE; + + return 0; +} + + +int bend_search(void *handle, bend_search_rr *rr) +{ + HV *href; + AV *aref; + SV **temp; int i; char **basenames; - int n; WRBUF query; - char *ptr; SV *point; - SV *ODR_point; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; + SV *rpnSV; dSP; ENTER; @@ -192,22 +743,41 @@ int bend_search(void *handle, bend_search_rr *rr) { av_push(aref, newSVpv(*basenames++, 0)); } +#if ENABLE_STOP_SERVER + if (rr->num_bases == 1 && !strcmp(rr->basenames[0], "XXstop")) + { + zhandle->stop_flag = 1; + } +#endif href = newHV(); hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0); + if (rr->srw_sortKeys && *rr->srw_sortKeys) + hv_store(href, "SRW_SORTKEYS", 12, newSVpv(rr->srw_sortKeys, 0), 0); hv_store(href, "REPL_SET", 8, newSViv(rr->replace_set), 0); hv_store(href, "ERR_CODE", 8, newSViv(0), 0); hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0); hv_store(href, "HITS", 4, newSViv(0), 0); hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); hv_store(href, "HANDLE", 6, zhandle->handle, 0); + hv_store(href, "PID", 3, newSViv(getpid()), 0); + if ((rpnSV = zquery2perl(rr->query)) != 0) { + hv_store(href, "RPN", 3, rpnSV, 0); + } query = zquery2pquery(rr->query); if (query) { hv_store(href, "QUERY", 5, newSVpv((char *)query->buf, query->pos), 0); } + else if (rr->query->which == Z_Query_type_104 && + rr->query->u.type_104->which == Z_External_CQL) { + hv_store(href, "CQL", 3, + newSVpv(rr->query->u.type_104->u.cql, 0), 0); + } else { rr->errcode = 108; + return 0; } PUSHMARK(sp); @@ -215,110 +785,34 @@ int bend_search(void *handle, bend_search_rr *rr) PUTBACK; - n = perl_call_sv(search_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( search_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; temp = hv_fetch(href, "HITS", 4, 1); - hits = newSVsv(*temp); + rr->hits = SvIV(*temp); temp = hv_fetch(href, "ERR_CODE", 8, 1); - err_code = newSVsv(*temp); + rr->errcode = SvIV(*temp); temp = hv_fetch(href, "ERR_STR", 7, 1); - err_str = newSVsv(*temp); + rr->errstring = string_or_undef(temp, rr->stream); temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); - PUTBACK; - FREETMPS; - LEAVE; - hv_undef(href); av_undef(aref); - rr->hits = SvIV(hits); - rr->errcode = SvIV(err_code); - ptr = SvPV(err_str, len); - ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); - strcpy(ODR_errstr, ptr); - rr->errstring = ODR_errstr; -/* ODR_point = (SV *)odr_malloc(rr->stream, sizeof(*point)); - memcpy(ODR_point, point, sizeof(*point)); - zhandle->handle = ODR_point;*/ + zhandle->handle = point; - handle = zhandle; - sv_free(hits); - sv_free(err_code); - sv_free(err_str); sv_free( (SV*) aref); sv_free( (SV*) href); - /*sv_free(point);*/ - wrbuf_free(query, 1); - return 0; -} - - -WRBUF oid2dotted(int *oid) -{ - - WRBUF buf = wrbuf_alloc(); - int dot = 0; - - for (; *oid != -1 ; oid++) - { - char ibuf[16]; - if (dot) - { - wrbuf_putc(buf, '.'); - } - else - { - dot = 1; - } - sprintf(ibuf, "%d", *oid); - wrbuf_puts(buf, ibuf); - } - return buf; -} - - -int dotted2oid(char *dotted, int *buffer) -{ - int *oid; - char ibuf[16]; - char *ptr; - int n = 0; - - ptr = ibuf; - oid = buffer; - while (*dotted) - { - if (*dotted == '.') - { - n++; - if (n == MAX_OID) /* Terminate if more than MAX_OID entries */ - { - *oid = -1; - return -1; - } - *ptr = 0; - sscanf(ibuf, "%d", oid++); - ptr = ibuf; - dotted++; - - } - else - { - *ptr++ = *dotted++; - } - } - if (n < MAX_OID) - { - *ptr = 0; - sscanf(ibuf, "%d", oid++); - } - *oid = -1; + if (query) + wrbuf_destroy(query); + PUTBACK; + FREETMPS; + LEAVE; return 0; } @@ -335,18 +829,19 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) SV *sur_flag; SV *point; SV *rep_form; + SV *schema = 0; char *ptr; char *ODR_record; char *ODR_basename; char *ODR_errstr; - int *ODR_oid_buf; WRBUF oid_dotted; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; Z_RecordComposition *composition; Z_ElementSetNames *simple; + Z_CompSpec *complex; STRLEN length; - int oid; dSP; ENTER; @@ -355,8 +850,19 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) rr->errcode = 0; href = newHV(); hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0); + if (rr->schema) + hv_store(href, "SCHEMA", 6, newSVpv(rr->schema, 0), 0); + else + hv_store(href, "SCHEMA", 6, newSVpv("", 0), 0); + temp = hv_store(href, "OFFSET", 6, newSViv(rr->number), 0); - oid_dotted = oid2dotted(rr->request_format_raw); + if (rr->request_format != 0) { + oid_dotted = oid2dotted(rr->request_format); + } else { + /* Probably an SRU request: assume XML is required */ + oid_dotted = wrbuf_alloc(); + wrbuf_puts(oid_dotted, "1.2.840.10003.5.109.10"); + } hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0); hv_store(href, "REP_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0); hv_store(href, "BASENAME", 8, newSVpv("", 0), 0); @@ -365,14 +871,16 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) hv_store(href, "ERR_CODE", 8, newSViv(0), 0); hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0); hv_store(href, "SUR_FLAG", 8, newSViv(0), 0); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); hv_store(href, "HANDLE", 6, zhandle->handle, 0); + hv_store(href, "PID", 3, newSViv(getpid()), 0); if (rr->comp) { composition = rr->comp; if (composition->which == Z_RecordComp_simple) { simple = composition->u.simple; - if (simple->which == 1) + if (simple->which == Z_ElementSetNames_generic) { hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0); } @@ -381,9 +889,32 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) rr->errcode = 26; } } + else if (composition->which == Z_RecordComp_complex) + { + if (composition->u.complex->generic && + + composition->u.complex->generic && + composition->u.complex->generic->elementSpec && + composition->u.complex->generic->elementSpec->which == + Z_ElementSpec_elementSetName) + { + complex = composition->u.complex; + hv_store(href, "COMP", 4, + newSVpv(complex->generic->elementSpec->u.elementSetName, 0), 0); + } + else + { +#if 0 /* For now ignore this error, which is ubiquitous in SRU */ + fprintf(stderr, "complex is weird\n"); + rr->errcode = 26; + return 0; +#endif /*0*/ + } + } else { rr->errcode = 26; + return 0; } } @@ -393,7 +924,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) PUTBACK; - perl_call_sv(fetch_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( fetch_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -418,12 +950,19 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) temp = hv_fetch(href, "REP_FORM", 8, 1); rep_form = newSVsv(*temp); + temp = hv_fetch(href, "SCHEMA", 6, 1); + if (temp != 0) { + schema = newSVsv(*temp); + ptr = SvPV(schema, length); + if (length > 0) { + rr->schema = (char *)odr_malloc(rr->stream, length + 1); + strcpy(rr->schema, ptr); + } + } + temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); - PUTBACK; - FREETMPS; - LEAVE; hv_undef(href); @@ -433,19 +972,29 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) rr->basename = ODR_basename; ptr = SvPV(rep_form, length); - ODR_oid_buf = (int *)odr_malloc(rr->stream, (MAX_OID + 1) * sizeof(int)); - if (dotted2oid(ptr, ODR_oid_buf) == -1) /* Maximum number of OID elements exceeded */ + + rr->output_format = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_RECSYN, ptr, rr->stream); + if (!rr->output_format) { - printf("Net::Z3950::SimpleServer: WARNING: OID structure too long, max length is %d\n", MAX_OID); + printf("Net::Z3950::SimpleServer: WARNING: Bad OID %s\n", ptr); + rr->output_format = + odr_oiddup(rr->stream, yaz_oid_recsyn_sutrs); } - rr->output_format_raw = ODR_oid_buf; - ptr = SvPV(record, length); - ODR_record = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_record, ptr); - rr->record = ODR_record; - rr->len = length; - + /* Treat GRS-1 records separately */ + if (!oid_oidcmp(rr->output_format, yaz_oid_recsyn_grs_1)) + { + rr->record = (char *) read_grs1(ptr, rr->stream); + rr->len = -1; + } + else + { + ODR_record = (char *)odr_malloc(rr->stream, length + 1); + strcpy(ODR_record, ptr); + rr->record = ODR_record; + rr->len = length; + } zhandle->handle = point; handle = zhandle; rr->last_in_set = SvIV(last); @@ -460,7 +1009,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) } rr->surrogate_flag = SvIV(sur_flag); - wrbuf_free(oid_dotted, 1); + wrbuf_destroy(oid_dotted); sv_free((SV*) href); sv_free(basename); sv_free(record); @@ -469,6 +1018,13 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) sv_free(err_code), sv_free(sur_flag); sv_free(rep_form); + + if (schema) + sv_free(schema); + + PUTBACK; + FREETMPS; + LEAVE; return 0; } @@ -476,35 +1032,46 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) int bend_present(void *handle, bend_present_rr *rr) { - - int n; HV *href; SV **temp; SV *err_code; SV *err_string; + SV *hits; + SV *point; STRLEN len; Z_RecordComposition *composition; Z_ElementSetNames *simple; + Z_CompSpec *complex; char *ODR_errstr; char *ptr; + Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; + +/* WRBUF oid_dotted; */ dSP; ENTER; SAVETMPS; href = newHV(); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); hv_store(href, "ERR_CODE", 8, newSViv(0), 0); hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0); hv_store(href, "START", 5, newSViv(rr->start), 0); hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0); hv_store(href, "NUMBER", 6, newSViv(rr->number), 0); + /*oid_dotted = oid2dotted(rr->request_format_raw); + hv_store(href, "REQ_FORM", 8, newSVpv((char *)oid_dotted->buf, oid_dotted->pos), 0);*/ + hv_store(href, "HITS", 4, newSViv(0), 0); + hv_store(href, "PID", 3, newSViv(getpid()), 0); if (rr->comp) { composition = rr->comp; - if (composition->which == 1) + if (composition->which == Z_RecordComp_simple) { simple = composition->u.simple; - if (simple->which == 1) + if (simple->which == Z_ElementSetNames_generic) { hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0); } @@ -514,6 +1081,25 @@ int bend_present(void *handle, bend_present_rr *rr) return 0; } } + else if (composition->which == Z_RecordComp_complex) + { + if (composition->u.complex->generic && + + composition->u.complex->generic && + composition->u.complex->generic->elementSpec && + composition->u.complex->generic->elementSpec->which == + Z_ElementSpec_elementSetName) + { + complex = composition->u.complex; + hv_store(href, "COMP", 4, + newSVpv(complex->generic->elementSpec->u.elementSetName, 0), 0); + } + else + { + rr->errcode = 26; + return 0; + } + } else { rr->errcode = 26; @@ -527,7 +1113,8 @@ int bend_present(void *handle, bend_present_rr *rr) PUTBACK; - n = perl_call_sv(present_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( present_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -537,20 +1124,30 @@ int bend_present(void *handle, bend_present_rr *rr) temp = hv_fetch(href, "ERR_STR", 7, 1); err_string = newSVsv(*temp); + temp = hv_fetch(href, "HITS", 4, 1); + hits = newSVsv(*temp); + + temp = hv_fetch(href, "HANDLE", 6, 1); + point = newSVsv(*temp); + PUTBACK; FREETMPS; LEAVE; hv_undef(href); rr->errcode = SvIV(err_code); + rr->hits = SvIV(hits); ptr = SvPV(err_string, len); ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); strcpy(ODR_errstr, ptr); rr->errstring = ODR_errstr; - +/* wrbuf_free(oid_dotted, 1);*/ + zhandle->handle = point; + handle = zhandle; sv_free(err_code); sv_free(err_string); + sv_free(hits); sv_free( (SV*) href); return 0; @@ -573,135 +1170,367 @@ int bend_delete(void *handle, bend_delete_rr *rr) int bend_scan(void *handle, bend_scan_rr *rr) { - perl_call_sv(scan_ref, G_VOID | G_DISCARD | G_NOARGS); - return 0; -} + HV *href; + AV *aref; + AV *list; + AV *entries; + HV *scan_item; + struct scan_entry *scan_list; + struct scan_entry *buffer; + int *step_size = rr->step_size; + int i; + char **basenames; + SV **temp; + SV *err_code = sv_newmortal(); + SV *err_str = sv_newmortal(); + SV *point = sv_newmortal(); + SV *status = sv_newmortal(); + SV *number = sv_newmortal(); + char *ptr; + char *ODR_errstr; + STRLEN len; + int term_len; + SV *entries_ref; + Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; + + dSP; + ENTER; + SAVETMPS; + href = newHV(); + list = newAV(); + if (rr->term->term->which == Z_Term_general) + { + term_len = rr->term->term->u.general->len; + hv_store(href, "TERM", 4, newSVpv((char*) rr->term->term->u.general->buf, term_len), 0); + } else { + rr->errcode = 229; /* Unsupported term type */ + return 0; + } + hv_store(href, "STEP", 4, newSViv(*step_size), 0); + hv_store(href, "NUMBER", 6, newSViv(rr->num_entries), 0); + hv_store(href, "POS", 3, newSViv(rr->term_position), 0); + hv_store(href, "ERR_CODE", 8, newSViv(0), 0); + hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); + hv_store(href, "STATUS", 6, newSViv(BEND_SCAN_SUCCESS), 0); + hv_store(href, "ENTRIES", 7, newRV((SV *) list), 0); + aref = newAV(); + basenames = rr->basenames; + for (i = 0; i < rr->num_bases; i++) + { + av_push(aref, newSVpv(*basenames++, 0)); + } + hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0); + PUSHMARK(sp); -bend_initresult *bend_init(bend_initrequest *q) + XPUSHs(sv_2mortal(newRV( (SV*) href))); + + PUTBACK; + + handler_cv = simpleserver_sv2cv( scan_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); + + SPAGAIN; + + temp = hv_fetch(href, "ERR_CODE", 8, 1); + err_code = newSVsv(*temp); + + temp = hv_fetch(href, "ERR_STR", 7, 1); + err_str = newSVsv(*temp); + + temp = hv_fetch(href, "HANDLE", 6, 1); + point = newSVsv(*temp); + + temp = hv_fetch(href, "STATUS", 6, 1); + status = newSVsv(*temp); + + temp = hv_fetch(href, "NUMBER", 6, 1); + number = newSVsv(*temp); + + temp = hv_fetch(href, "ENTRIES", 7, 1); + entries_ref = newSVsv(*temp); + + PUTBACK; + FREETMPS; + LEAVE; + + ptr = SvPV(err_str, len); + ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); + strcpy(ODR_errstr, ptr); + rr->errstring = ODR_errstr; + rr->errcode = SvIV(err_code); + rr->num_entries = SvIV(number); + rr->status = SvIV(status); + scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list)); + buffer = scan_list; + entries = (AV *)SvRV(entries_ref); + if (rr->errcode == 0) for (i = 0; i < rr->num_entries; i++) + { + scan_item = (HV *)SvRV(sv_2mortal(av_shift(entries))); + temp = hv_fetch(scan_item, "TERM", 4, 1); + ptr = SvPV(*temp, len); + buffer->term = (char *) odr_malloc (rr->stream, len + 1); + strcpy(buffer->term, ptr); + temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); + buffer->occurrences = SvIV(*temp); + buffer++; + hv_undef(scan_item); + } + rr->entries = scan_list; + zhandle->handle = point; + handle = zhandle; + sv_free(err_code); + sv_free(err_str); + sv_free(status); + sv_free(number); + hv_undef(href); + sv_free((SV *)href); + av_undef(aref); + sv_free((SV *)aref); + av_undef(list); + sv_free((SV *)list); + av_undef(entries); + /*sv_free((SV *)entries);*/ + sv_free(entries_ref); + + return 0; +} + +int bend_explain(void *handle, bend_explain_rr *q) { - bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r)); HV *href; + CV *handler_cv = 0; SV **temp; - SV *name; - SV *ver; - SV *err_str; - SV *status; - Zfront_handle *zhandle = (Zfront_handle *) xmalloc (sizeof(*zhandle)); + char *explain; + SV *explainsv; STRLEN len; - int n; - SV *handle; - /*char *name_ptr; - char *ver_ptr;*/ - char *ptr; + Zfront_handle *zhandle = (Zfront_handle *)handle; dSP; ENTER; SAVETMPS; - /*q->bend_sort = bend_sort;*/ + href = newHV(); + hv_store(href, "EXPLAIN", 7, newSVpv("", 0), 0); + hv_store(href, "DATABASE", 8, newSVpv(q->database, 0), 0); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); + + PUSHMARK(sp); + XPUSHs(sv_2mortal(newRV((SV*) href))); + PUTBACK; + + handler_cv = simpleserver_sv2cv(explain_ref); + perl_call_sv((SV*) handler_cv, G_SCALAR | G_DISCARD); + + SPAGAIN; + + temp = hv_fetch(href, "EXPLAIN", 7, 1); + explainsv = newSVsv(*temp); + + PUTBACK; + FREETMPS; + LEAVE; + + explain = SvPV(explainsv, len); + q->explain_buf = (char*) odr_malloc(q->stream, len + 1); + strcpy(q->explain_buf, explain); + + return 0; +} + +bend_initresult *bend_init(bend_initrequest *q) +{ + int dummy = simpleserver_clone(); + bend_initresult *r = (bend_initresult *) + odr_malloc (q->stream, sizeof(*r)); + char *ptr; + CV* handler_cv = 0; + dSP; + STRLEN len; + NMEM nmem = nmem_create(); + Zfront_handle *zhandle = (Zfront_handle *) nmem_malloc (nmem, + sizeof(*zhandle)); + SV *handle; + HV *href; + SV **temp; + + ENTER; + SAVETMPS; + + zhandle->ghandle = _global_ghandle; + zhandle->nmem = nmem; + zhandle->stop_flag = 0; + + if (sort_ref) + { + q->bend_sort = bend_sort; + } if (search_ref) { q->bend_search = bend_search; } - /*q->bend_present = present;*/ + if (present_ref) + { + q->bend_present = bend_present; + } /*q->bend_esrequest = bend_esrequest;*/ /*q->bend_delete = bend_delete;*/ if (fetch_ref) { q->bend_fetch = bend_fetch; } - /*q->bend_scan = bend_scan;*/ + if (scan_ref) + { + q->bend_scan = bend_scan; + } + if (explain_ref) + { + q->bend_explain = bend_explain; + } + href = newHV(); + hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0); hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0); hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0); hv_store(href, "ERR_CODE", 8, newSViv(0), 0); + hv_store(href, "ERR_STR", 7, newSViv(0), 0); + hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0); + hv_store(href, "PID", 3, newSViv(getpid()), 0); + if (q->auth) { + char *user = NULL; + char *passwd = NULL; + if (q->auth->which == Z_IdAuthentication_open) { + char *cp; + user = nmem_strdup (odr_getmem (q->stream), q->auth->u.open); + cp = strchr (user, '/'); + if (cp) { + /* password after / given */ + *cp = '\0'; + passwd = cp+1; + } + } else if (q->auth->which == Z_IdAuthentication_idPass) { + user = q->auth->u.idPass->userId; + passwd = q->auth->u.idPass->password; + } + /* ### some code paths have user/password unassigned here */ + if (user) + hv_store(href, "USER", 4, newSVpv(user, 0), 0); + if (passwd) + hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0); + } PUSHMARK(sp); - XPUSHs(sv_2mortal(newRV( (SV*) href))); + XPUSHs(sv_2mortal(newRV((SV*) href))); PUTBACK; if (init_ref != NULL) { - perl_call_sv(init_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( init_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); } SPAGAIN; + temp = hv_fetch(href, "IMP_ID", 6, 1); + ptr = SvPV(*temp, len); + q->implementation_id = nmem_strdup(nmem, ptr); + temp = hv_fetch(href, "IMP_NAME", 8, 1); - name = newSVsv(*temp); + ptr = SvPV(*temp, len); + q->implementation_name = nmem_strdup(nmem, ptr); temp = hv_fetch(href, "IMP_VER", 7, 1); - ver = newSVsv(*temp); + ptr = SvPV(*temp, len); + q->implementation_version = nmem_strdup(nmem, ptr); temp = hv_fetch(href, "ERR_CODE", 8, 1); - status = newSVsv(*temp); + r->errcode = SvIV(*temp); + + temp = hv_fetch(href, "ERR_STR", 7, 1); + ptr = SvPV(*temp, len); + r->errstring = (char *)odr_malloc(q->stream, len + 1); + strcpy(r->errstring, ptr); temp = hv_fetch(href, "HANDLE", 6, 1); handle= newSVsv(*temp); + zhandle->handle = handle; + + r->handle = zhandle; hv_undef(href); + sv_free((SV*) href); + PUTBACK; FREETMPS; LEAVE; - zhandle->handle = handle; - r->errcode = SvIV(status); - r->handle = zhandle; - ptr = SvPV(name, len); - q->implementation_name = (char *)xmalloc(len + 1); - strcpy(q->implementation_name, ptr); -/* q->implementation_name = SvPV(name, len);*/ - ptr = SvPV(ver, len); - q->implementation_version = (char *)xmalloc(len + 1); - strcpy(q->implementation_version, ptr); - return r; + return r; } - void bend_close(void *handle) { HV *href; Zfront_handle *zhandle = (Zfront_handle *)handle; - SV **temp; - + CV* handler_cv = 0; + int stop_flag = 0; dSP; ENTER; SAVETMPS; - if (close_ref == NULL) + if (close_ref) { - return; - } + href = newHV(); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); - href = newHV(); - hv_store(href, "HANDLE", 6, zhandle->handle, 0); + PUSHMARK(sp); - PUSHMARK(sp); - - XPUSHs(sv_2mortal(newRV((SV *)href))); + XPUSHs(sv_2mortal(newRV((SV *)href))); - PUTBACK; + PUTBACK; - perl_call_sv(close_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( close_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); - SPAGAIN; + SPAGAIN; + sv_free((SV*) href); + } + else + sv_free(zhandle->handle); PUTBACK; FREETMPS; LEAVE; + stop_flag = zhandle->stop_flag; + nmem_destroy(zhandle->nmem); + simpleserver_free(); - xfree(handle); - + if (stop_flag) + exit(0); return; } MODULE = Net::Z3950::SimpleServer PACKAGE = Net::Z3950::SimpleServer +PROTOTYPES: DISABLE + + +void +set_ghandle(arg) + SV *arg + CODE: + _global_ghandle = newSVsv(arg); + + void set_init_handler(arg) SV *arg @@ -763,6 +1592,11 @@ set_scan_handler(arg) CODE: scan_ref = newSVsv(arg); +void +set_explain_handler(arg) + SV *arg + CODE: + explain_ref = newSVsv(arg); int start_server(...) @@ -782,7 +1616,47 @@ start_server(...) strcpy(*argv_buf++, ptr); } *argv_buf = NULL; + root_perl_context = PERL_GET_CONTEXT; + yaz_mutex_create(&simpleserver_mutex); +#if 0 + /* only for debugging perl_clone .. */ + tst_clones(); +#endif RETVAL = statserv_main(items, argv, bend_init, bend_close); OUTPUT: - RETVAL + RETVAL + + +int +ScanSuccess() + CODE: + RETVAL = BEND_SCAN_SUCCESS; + OUTPUT: + RETVAL + +int +ScanPartial() + CODE: + RETVAL = BEND_SCAN_PARTIAL; + OUTPUT: + RETVAL + + +void +yazlog(arg) + SV *arg + CODE: + STRLEN len; + char *ptr; + ptr = SvPV(arg, len); + yaz_log(YLOG_LOG, "%.*s", len, ptr); + +int +yaz_diag_srw_to_bib1(srw_code) + int srw_code + +int +yaz_diag_bib1_to_srw(bib1_code) + int bib1_code +