X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=11622daf43bbfac6c62d100df72355c92b6ed623;hp=e3e08be4020d33aae9bb8ca751f906f64d0be9fa;hb=e1c360ffe42917276f87ee47c003b074927de2ff;hpb=547a71c5acc223963abc973d8b5045469378a14c diff --git a/SimpleServer.xs b/SimpleServer.xs index e3e08be..11622da 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,82 +1,53 @@ -/* - * Copyright (c) 2000, 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, - * provided that: +/* This file is part of simpleserver. + * Copyright (C) 2000-2013 Index Data. + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * 1. This copyright and permission notice appear in all copies of the - * software and its documentation. Notices of copyright or attribution - * which appear at the beginning of any file must remain unchanged. + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. * - * 2. The name of Index Data or the individual authors may not be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR - * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/*$Log: SimpleServer.xs,v $ -/*Revision 1.18 2003-01-03 09:05:41 sondberg -/*Applied Dave's GRS-1 patch - actually this was already done in revision 1.17. -/* -/*Revision 1.16 2002/11/26 17:09:18 mike -/*basic support for idPass authentication -/* -/*Revision 1.15 2002/09/16 13:55:53 sondberg -/*Added support for authentication into SimpleServer. -/* -/*Revision 1.14 2002/03/05 00:34:13 mike -/*Support for implementation_id (commented out until it's -/*in mainstream Yaz) -/* -/*Revision 1.13 2002/02/28 11:21:57 mike -/*Add RPN structure to search-handler argument hash. -/* -/*Revision 1.12 2001/08/30 14:02:10 sondberg -/*Small changes. -/* -/*Revision 1.11 2001/08/30 13:15:11 sondberg -/*Corrected a memory leak, one more to go. -/* -/*Revision 1.10 2001/08/29 11:48:36 sondberg -/*Added routines -/* -/* Net::Z3950::SimpleServer::ScanSuccess -/* Net::Z3950::SimpleServer::ScanPartial -/* -/*and a bit of documentation. -/* -/*Revision 1.9 2001/08/24 14:00:20 sondberg -/*Added support for scan. -/* -/*Revision 1.8 2001/05/21 11:07:02 sondberg -/*Extended maximum numbers of GRS-1 elements. Should be done dynamically. -/* -/*Revision 1.7 2001/03/13 14:17:15 sondberg -/*Added support for GRS-1. -/**/ - - #include "EXTERN.h" #include "perl.h" +#include "proto.h" +#include "embed.h" #include "XSUB.h" +#include #include +#include #include #include +#include +#include #include +#include +#include +#include +#ifdef WIN32 +#else #include +#endif #include #include -#define GRS_MAX_FIELDS 500 +#define GRS_MAX_FIELDS 500 #ifdef ASN_COMPILED #include #endif @@ -84,20 +55,18 @@ #define sv_undef PL_sv_undef #endif -typedef struct { - SV *handle; +YAZ_MUTEX simpleserver_mutex; - SV *init_ref; - SV *close_ref; - SV *sort_ref; - SV *search_ref; - SV *fetch_ref; - SV *present_ref; - SV *esrequest_ref; - SV *delete_ref; - SV *scan_ref; +typedef struct { + SV *ghandle; /* Global handle specified at creation */ + SV *handle; /* Per-connection handle set at Init */ + 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; @@ -107,9 +76,115 @@ SV *present_ref = NULL; SV *esrequest_ref = NULL; SV *delete_ref = NULL; SV *scan_ref = NULL; -int MAX_OID = 15; +SV *explain_ref = NULL; +SV *start_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; + + if (!SvOK(*svp)) + return 0; + + ptr = SvPV(*svp, len); + return odr_strdupn(stream, ptr, len); +} + + +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); +} -#define GRS_BUF_SIZE 512 Z_GenericRecord *read_grs1(char *str, ODR o) { @@ -120,22 +195,23 @@ Z_GenericRecord *read_grs1(char *str, ODR o) original = str; r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r)); - r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); + 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(LOG_WARN, "GRS string too long - truncating (%d > %d)", 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); @@ -150,7 +226,7 @@ Z_GenericRecord *read_grs1(char *str, ODR o) } if (sscanf(buf, "(%d,%[^)])", &type, value) != 2) { - yaz_log(LOG_WARN, "Bad data in '%s'", buf); + yaz_log(YLOG_WARN, "Bad data in '%s'", buf); return r; } if (!type && *value == '0') @@ -162,30 +238,29 @@ Z_GenericRecord *read_grs1(char *str, ODR o) buf++; if (r->num_elements >= GRS_MAX_FIELDS) { - yaz_log(LOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", 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 = (int *)odr_malloc(o, sizeof(int)); - *t->tagType = type; + 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 = (int *)odr_malloc(o, sizeof(int)); - *t->tagValue->u.numeric = ivalue; + t->tagValue->u.numeric = odr_intdup(o, ivalue); } else { t->tagValue->which = Z_StringOrNumeric_string; - t->tagValue->u.string = (char *)odr_malloc(o, strlen(value)+1); - strcpy(t->tagValue->u.string, value); + 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)); + t->content = c = (Z_ElementData *) + odr_malloc(o, sizeof(Z_ElementData)); if (*buf == '{') { c->which = Z_ElementData_subtree; @@ -202,7 +277,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o) - static void oid2str(Odr_oid *o, WRBUF buf) { for (; *o >= 0; o++) { @@ -214,68 +288,11 @@ static void oid2str(Odr_oid *o, WRBUF buf) } } - -static int rpn2pquery(Z_RPNStructure *s, WRBUF buf) +WRBUF oid2dotted(Odr_oid *oid) { - 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; - } - default: abort(); - } - break; - } - default: abort(); - } - break; - } - 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; - } - default: abort(); - } - return 1; + WRBUF buf = wrbuf_alloc(); + oid2str(oid, buf); + return buf; } @@ -283,15 +300,10 @@ WRBUF zquery2pquery(Z_Query *q) { WRBUF buf = wrbuf_alloc(); - if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) + 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, ' '); - } - return rpn2pquery(q->u.type_1->RPNStructure, buf) ? buf : 0; + yaz_rpnquery_to_wrbuf(buf, q->u.type_1); + return buf; } @@ -301,7 +313,7 @@ void fatal(char *fmt, ...) { va_list ap; - fprintf(stderr, "FATAL (yazwrap): "); + fprintf(stderr, "FATAL (SimpleServer): "); va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); @@ -373,56 +385,102 @@ static SV *translateOID(Odr_oid *x) } } +static SV *attributes2perl(Z_AttributeList *list) +{ + AV *av; + int i; + SV *attrs = newObject("Net::Z3950::RPN::Attributes", + (SV*) (av = newAV())); + for (i = 0; i < list->num_attributes; i++) { + Z_AttributeElement *elem = list->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 { + Z_ComplexAttribute *c; + Z_StringOrNumeric *son; + assert(elem->which == Z_AttributeValue_complex); + c = elem->value.complex; + /* We ignore semantic actions and multiple values */ + assert(c->num_list > 0); + son = c->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)); + } + } + av_push(av, tmp); + } + return attrs; +} + +static SV *f_Term_to_SV(Z_Term *term, Z_AttributeList *attributes) +{ + HV *hv; + SV *sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV())); + + if (term->which != Z_Term_general) + fatal("can't handle RPN terms other than general"); + + setMember(hv, "term", newSVpv((char*) term->u.general->buf, + term->u.general->len)); + + if (attributes) { + setMember(hv, "attributes", attributes2perl(attributes)); + } + return sv; +} static SV *rpn2perl(Z_RPNStructure *s) { SV *sv; HV *hv; AV *av; + Z_Operand *o; switch (s->which) { - case Z_RPNStructure_simple: { - Z_Operand *o = s->u.simple; - Z_AttributesPlusTerm *at; - if (o->which != Z_Operand_APT) - fatal("can't handle RPN simples other than 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)); - assert(elem->which == Z_AttributeValue_numeric); - setMember(hv2, "attributeValue", - newSViv(*elem->value.numeric)); - av_push(av, tmp); - } - setMember(hv, "attributes", attrs); + 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 */ + SV *sv2; + char *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; } - setMember(hv, "term", newSVpv((char*) at->term->u.general->buf, - at->term->u.general->len)); - return sv; - } + + case Z_Operand_APT: + return f_Term_to_SV(o->u.attributesPlusTerm->term, + o->u.attributesPlusTerm->attributes); + default: + fatal("unknown RPN simple type %d", (int) o->which); + } + 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: 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); @@ -436,19 +494,118 @@ static SV *rpn2perl(Z_RPNStructure *s) av_push(av, tmp); return sv; } - default: fatal("unknown RPN node type %d", (int) s->which); + + 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; +} + + +/* Decode the Z_SortKeySpec struct and store the whole thing in a perl hash */ +int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec) +{ + Z_SortElement *element = spec->sortElement; + + 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 1; +} + + static SV *zquery2perl(Z_Query *q) { SV *sv; HV *hv; - if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) + 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) @@ -463,32 +620,54 @@ int bend_sort(void *handle, bend_sort_rr *rr) { HV *href; AV *aref; + AV *sort_seq; SV **temp; SV *err_code; SV *err_str; 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)); + 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); @@ -509,48 +688,230 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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); - PUTBACK; - FREETMPS; - LEAVE; + sv_free( (SV*) aref); + sv_free( (SV*) href); + sv_free( (SV*) sort_seq); - hv_undef(href), - av_undef(aref); 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; + rr->errstring = odr_strdupn(rr->stream, ptr, len); + zhandle->handle = point; sv_free(err_code); sv_free(err_str); sv_free(status); - + + PUTBACK; + FREETMPS; + LEAVE; + return 0; } +static SV *f_FacetField_to_SV(Z_FacetField *facet_field) +{ + HV *hv; + AV *av; + SV *terms; + int i; + SV *sv = newObject("Net::Z3950::FacetField", (SV *) (hv = newHV())); + if (facet_field->attributes) { + setMember(hv, "attributes", + attributes2perl(facet_field->attributes)); + } + terms = newObject("Net::Z3950::FacetTerms", (SV *) (av = newAV())); + + for (i = 0; i < facet_field->num_terms; i++) { + Z_Term *z_term = facet_field->terms[i]->term; + HV *hv; + SV *sv_count = newSViv(*facet_field->terms[i]->count); + SV *sv_term; + SV *tmp; + if (z_term->which == Z_Term_general) { + sv_term = newSVpv((char*) z_term->u.general->buf, + z_term->u.general->len); + } else if (z_term->which == Z_Term_characterString) { + sv_term = newSVpv(z_term->u.characterString, + strlen(z_term->u.characterString)); + } + tmp = newObject("Net::Z3950::FacetTerm", (SV *) (hv = newHV())); + + setMember(hv, "count", sv_count); + setMember(hv, "term", sv_term); + + av_push(av, tmp); + } + setMember(hv, "terms", terms); + return sv; +} + +static SV *f_FacetList_to_SV(Z_FacetList *facet_list) +{ + SV *sv = 0; + if (facet_list) { + AV *av; + int i; + sv = newObject("Net::Z3950::FacetList", (SV *) (av = newAV())); + + for (i = 0; i < facet_list->num; i++) { + SV *sv = f_FacetField_to_SV(facet_list->elements[i]); + av_push(av, sv); + } + } + return sv; +} + + +static void f_SV_to_FacetField(HV *facet_field_hv, Z_FacetField **fl, ODR odr) +{ + int i; + int num_terms, num_attributes; + SV **temp; + Z_AttributeList *attributes = odr_malloc(odr, sizeof(*attributes)); + + AV *sv_terms, *sv_attributes; + + temp = hv_fetch(facet_field_hv, "attributes", 10, 1); + sv_attributes = (AV *) SvRV(*temp); + num_attributes = av_len(sv_attributes) + 1; + attributes->num_attributes = num_attributes; + attributes->attributes = (Z_AttributeElement **) + odr_malloc(odr, sizeof(*attributes->attributes) * num_attributes); + + for (i = 0; i < num_attributes; i++) { + HV *hv_elem = (HV*) SvRV(sv_2mortal(av_shift(sv_attributes))); + Z_AttributeElement *elem; + elem = (Z_AttributeElement *) odr_malloc(odr, sizeof(*elem)); + attributes->attributes[i] = elem; + + elem->attributeSet = 0; + + temp = hv_fetch(hv_elem, "attributeType", 13, 1); + elem->attributeType = odr_intdup(odr, SvIV(*temp)); + + temp = hv_fetch(hv_elem, "attributeValue", 14, 1); + + if (SvIOK(*temp)) { + elem->which = Z_AttributeValue_numeric; + elem->value.numeric = odr_intdup(odr, SvIV(*temp)); + } else { + STRLEN s_len; + char *s_buf = SvPV(*temp, s_len); + Z_ComplexAttribute *c = odr_malloc(odr, sizeof *c); + elem->which = Z_AttributeValue_complex; + elem->value.complex = c; + + c->num_list = 1; + c->list = (Z_StringOrNumeric **) odr_malloc(odr, + sizeof(*c->list)); + c->list[0] = (Z_StringOrNumeric *) odr_malloc(odr, + sizeof(**c->list)); + c->list[0]->which = Z_StringOrNumeric_string; + c->list[0]->u.string = odr_strdupn(odr, s_buf, s_len); + c->num_semanticAction = 0; + c->semanticAction = 0; + } + hv_undef(hv_elem); + } + + temp = hv_fetch(facet_field_hv, "terms", 5, 1); + + sv_terms = (AV *) SvRV(*temp); + if (SvTYPE(sv_terms) == SVt_PVAV) { + num_terms = av_len(sv_terms) + 1; + } else { + num_terms = 0; + } + *fl = facet_field_create(odr, attributes, num_terms); + for (i = 0; i < num_terms; i++) { + STRLEN s_len; + char *s_buf; + HV *hv_elem = (HV*) SvRV(sv_2mortal(av_shift(sv_terms))); + + Z_FacetTerm *facet_term = + (Z_FacetTerm *) odr_malloc(odr, sizeof(*facet_term)); + (*fl)->terms[i] = facet_term; + + temp = hv_fetch(hv_elem, "count", 5, 1); + facet_term->count = odr_intdup(odr, SvIV(*temp)); + + temp = hv_fetch(hv_elem, "term", 4, 1); + + s_buf = SvPV(*temp, s_len); + facet_term->term = z_Term_create(odr, Z_Term_general, s_buf, s_len); + hv_undef(hv_elem); + } +} + +static void f_SV_to_FacetList(SV *sv, Z_OtherInformation **oip, ODR odr) +{ + AV *entries = (AV *) SvRV(sv); + int num_facets; + if (entries && SvTYPE(entries) == SVt_PVAV && + (num_facets = av_len(entries) + 1) > 0) + { + Z_OtherInformation *oi; + Z_OtherInformationUnit *oiu; + Z_FacetList *facet_list = facet_list_create(odr, num_facets); + int i; + for (i = 0; i < num_facets; i++) { + HV *facet_field = (HV*) SvRV(sv_2mortal(av_shift(entries))); + f_SV_to_FacetField(facet_field, &facet_list->elements[i], odr); + hv_undef(facet_field); + } + oi = odr_malloc(odr, sizeof(*oi)); + oiu = odr_malloc(odr, sizeof(*oiu)); + oi->num_elements = 1; + oi->list = odr_malloc(odr, oi->num_elements * sizeof(*oi->list)); + oiu->category = 0; + oiu->which = Z_OtherInfo_externallyDefinedInfo; + oiu->information.externallyDefinedInfo = odr_malloc(odr, sizeof(*oiu->information.externallyDefinedInfo)); + oiu->information.externallyDefinedInfo->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_facet_1); + oiu->information.externallyDefinedInfo->descriptor = 0; + oiu->information.externallyDefinedInfo->indirect_reference = 0; + oiu->information.externallyDefinedInfo->which = Z_External_userFacets; + oiu->information.externallyDefinedInfo->u.facetList = facet_list; + oi->list[0] = oiu; + *oip = oi; + } +} + +static HV *parse_extra_args(Z_SRW_extra_arg *args) +{ + HV *href = newHV(); + + for (; args; args = args->next) + { + hv_store(href, args->name, strlen(args->name), + newSVpv(args->value, 0), 0); + } + return href; +} int bend_search(void *handle, bend_search_rr *rr) { HV *href; AV *aref; SV **temp; - SV *hits; - SV *err_code; - SV *err_str; - char *ODR_errstr; - STRLEN len; 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; + SV *facetSV; + char *ptr; + STRLEN len; dSP; ENTER; @@ -562,136 +923,173 @@ int bend_search(void *handle, bend_search_rr *rr) { av_push(aref, newSVpv(*basenames++, 0)); } - href = newHV(); +#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); - hv_store(href, "RPN", 3, zquery2perl(rr->query), 0); + hv_store(href, "PRESENT_NUMBER", 14, newSViv(rr->present_number), 0); + hv_store(href, "EXTRA_ARGS", 10, + newRV( (SV*) parse_extra_args(rr->extra_args)), 0); + if ((rpnSV = zquery2perl(rr->query)) != 0) { + hv_store(href, "RPN", 3, rpnSV, 0); + } + facetSV = f_FacetList_to_SV(yaz_oi_get_facetlist(&rr->search_input)); + if (facetSV) { + hv_store(href, "INPUTFACETS", 11, facetSV, 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); - + XPUSHs(sv_2mortal(newRV( (SV*) href))); - + 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; - + temp = hv_fetch(href, "OUTPUTFACETS", 12, 1); + if (SvTYPE(*temp) != SVt_NULL) + f_SV_to_FacetList(*temp, &rr->search_info, rr->stream); + + temp = hv_fetch(href, "EXTRA_RESPONSE_DATA", 19, 0); + if (temp) + { + ptr = SvPV(*temp, len); + rr->extra_response_data = odr_strdupn(rr->stream, ptr, len); + } + + temp = hv_fetch(href, "ESTIMATED" "_HIT_" "COUNT", 19, 0); + if (temp) + { + rr->estimated_hit_count = SvIV(*temp); + } 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); + if (query) + wrbuf_destroy(query); + PUTBACK; + FREETMPS; + LEAVE; return 0; } -/* ### this is worryingly similar to oid2str() */ -WRBUF oid2dotted(int *oid) +/* ### I am not 100% about the memory management in this handler */ +int bend_delete(void *handle, bend_delete_rr *rr) { + Zfront_handle *zhandle = (Zfront_handle *)handle; + HV *href; + CV* handler_cv; + int i; + SV **temp; + SV *point; - WRBUF buf = wrbuf_alloc(); - int dot = 0; + dSP; + ENTER; + SAVETMPS; - 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; -} - + href = newHV(); + 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); -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++); + PUSHMARK(sp); + XPUSHs(sv_2mortal(newRV( (SV*) href))); + PUTBACK; + + handler_cv = simpleserver_sv2cv(delete_ref); + + if (rr->function == 1) { + /* Delete all result sets in the session */ + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); + temp = hv_fetch(href, "STATUS", 6, 1); + rr->delete_status = SvIV(*temp); + } else { + rr->delete_status = 0; + /* + * For some reason, deleting two or more result-sets in + * one operation goes horribly wrong, and ### I don't have + * time to debug it right now. + */ + if (rr->num_setnames > 1) { + rr->delete_status = 3; /* "System problem at target" */ + /* There's no way to sent delete-msg using the GFS */ + return 0; + } + + for (i = 0; i < rr->num_setnames; i++) { + hv_store(href, "SETNAME", 7, newSVpv(rr->setnames[i], 0), 0); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); + temp = hv_fetch(href, "STATUS", 6, 1); + rr->statuses[i] = SvIV(*temp); + if (rr->statuses[i] != 0) + rr->delete_status = rr->statuses[i]; + } } - *oid = -1; + + SPAGAIN; + + temp = hv_fetch(href, "HANDLE", 6, 1); + point = newSVsv(*temp); + + hv_undef(href); + + zhandle->handle = point; + + sv_free( (SV*) href); + + PUTBACK; + FREETMPS; + LEAVE; + return 0; } @@ -701,24 +1099,21 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) HV *href; SV **temp; SV *basename; - SV *record; SV *last; SV *err_code; SV *err_string; 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; - oident *oid; WRBUF oid_dotted; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; Z_RecordComposition *composition; Z_ElementSetNames *simple; + Z_CompSpec *complex; STRLEN length; dSP; @@ -728,16 +1123,27 @@ 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); - hv_store(href, "RECORD", 6, newSVpv("", 0), 0); hv_store(href, "LAST", 4, newSViv(0), 0); 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) @@ -749,15 +1155,41 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) if (simple->which == Z_ElementSetNames_generic) { hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0); - } + } else { rr->errcode = 26; + rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition"); + 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 + { +#if 0 /* For now ignore this error, which is ubiquitous in SRU */ + rr->errcode = 26; + rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN"); + return 0; +#endif /*0*/ } } else { rr->errcode = 26; + rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex"); + return 0; } } @@ -766,16 +1198,15 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) XPUSHs(sv_2mortal(newRV( (SV*) href))); 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; temp = hv_fetch(href, "BASENAME", 8, 1); basename = newSVsv(*temp); - temp = hv_fetch(href, "RECORD", 6, 1); - record = newSVsv(*temp); temp = hv_fetch(href, "LAST", 4, 1); last = newSVsv(*temp); @@ -792,85 +1223,97 @@ 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, 0); + if (temp != 0) + { + schema = newSVsv(*temp); + ptr = SvPV(schema, length); + if (length > 0) + rr->schema = odr_strdupn(rr->stream, ptr, length); + } + temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); - PUTBACK; - FREETMPS; - LEAVE; - - hv_undef(href); - ptr = SvPV(basename, length); - ODR_basename = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_basename, ptr); - rr->basename = ODR_basename; + rr->basename = odr_strdupn(rr->stream, ptr, length); 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 */ - { - printf("Net::Z3950::SimpleServer: WARNING: OID structure too long, max length is %d\n", MAX_OID); - } - rr->output_format_raw = ODR_oid_buf; - - ptr = SvPV(record, length); - oid = oid_getentbyoid(ODR_oid_buf); - if (oid->value == VAL_GRS1) /* Treat GRS-1 records separately */ + + rr->output_format = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_RECSYN, ptr, rr->stream); + if (!rr->output_format) { - rr->record = (char *) read_grs1(ptr, rr->stream); - rr->len = -1; + printf("Net::Z3950::SimpleServer: WARNING: Bad OID %s\n", ptr); + rr->output_format = + odr_oiddup(rr->stream, yaz_oid_recsyn_sutrs); } - else + temp = hv_fetch(href, "RECORD", 6, 0); + if (temp) { - ODR_record = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_record, ptr); - rr->record = ODR_record; - rr->len = length; + SV *record = newSVsv(*temp); + ptr = SvPV(record, 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 + { + rr->record = odr_strdupn(rr->stream, ptr, length); + rr->len = length; + } + sv_free(record); } + hv_undef(href); + zhandle->handle = point; handle = zhandle; rr->last_in_set = SvIV(last); - + if (!(rr->errcode)) { rr->errcode = SvIV(err_code); ptr = SvPV(err_string, length); - ODR_errstr = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_errstr, ptr); - rr->errstring = ODR_errstr; + rr->errstring = odr_strdupn(rr->stream, ptr, length); } 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); sv_free(last); sv_free(err_string); sv_free(err_code), sv_free(sur_flag); sv_free(rep_form); - + + if (schema) + sv_free(schema); + + PUTBACK; + FREETMPS; + LEAVE; + return 0; } int bend_present(void *handle, bend_present_rr *rr) { - HV *href; SV **temp; SV *err_code; SV *err_string; - SV *hits; SV *point; STRLEN len; Z_RecordComposition *composition; Z_ElementSetNames *simple; - char *ODR_errstr; + Z_CompSpec *complex; char *ptr; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; /* WRBUF oid_dotted; */ @@ -879,6 +1322,7 @@ int bend_present(void *handle, bend_present_rr *rr) 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); @@ -887,7 +1331,6 @@ int bend_present(void *handle, bend_present_rr *rr) 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) { @@ -898,28 +1341,51 @@ int bend_present(void *handle, bend_present_rr *rr) if (simple->which == Z_ElementSetNames_generic) { hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0); - } + } + else + { + rr->errcode = 26; + rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition"); + 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; + rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN"); return 0; } } else { rr->errcode = 26; + rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex"); return 0; } } PUSHMARK(sp); - + XPUSHs(sv_2mortal(newRV( (SV*) href))); - + PUTBACK; - - 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; temp = hv_fetch(href, "ERR_CODE", 8, 1); @@ -928,30 +1394,23 @@ 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; + rr->errstring = odr_strdupn(rr->stream, ptr, len); /* 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; @@ -965,13 +1424,6 @@ int bend_esrequest(void *handle, bend_esrequest_rr *rr) } -int bend_delete(void *handle, bend_delete_rr *rr) -{ - perl_call_sv(delete_ref, G_VOID | G_DISCARD | G_NOARGS); - return 0; -} - - int bend_scan(void *handle, bend_scan_rr *rr) { HV *href; @@ -979,9 +1431,9 @@ int bend_scan(void *handle, bend_scan_rr *rr) AV *list; AV *entries; HV *scan_item; - struct scan_entry *scan_list; struct scan_entry *buffer; int *step_size = rr->step_size; + int scan_list_size = rr->num_entries; int i; char **basenames; SV **temp; @@ -991,23 +1443,28 @@ int bend_scan(void *handle, bend_scan_rr *rr) SV *status = sv_newmortal(); SV *number = sv_newmortal(); char *ptr; - char *ODR_errstr; STRLEN len; - int term_len; - SV *term_tmp; SV *entries_ref; - Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; + SV *rpnSV; dSP; ENTER; SAVETMPS; href = newHV(); list = newAV(); + + /* RPN is better than TERM since it includes attributes */ + if ((rpnSV = f_Term_to_SV(rr->term->term, rr->term->attributes)) != 0) { + setMember(href, "RPN", rpnSV); + } + if (rr->term->term->which == Z_Term_general) { - term_len = rr->term->term->u.general->len; - hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, term_len), 0); + Odr_oct *oterm = rr->term->term->u.general; + hv_store(href, "TERM", 4, newSVpv((char*) oterm->buf, + oterm->len), 0); } else { rr->errcode = 229; /* Unsupported term type */ return 0; @@ -1017,9 +1474,12 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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); + hv_store(href, "EXTRA_ARGS", 10, + newRV( (SV*) parse_extra_args(rr->extra_args)), 0); aref = newAV(); basenames = rr->basenames; for (i = 0; i < rr->num_bases; i++) @@ -1034,7 +1494,8 @@ int bend_scan(void *handle, bend_scan_rr *rr) PUTBACK; - perl_call_sv(scan_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( scan_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -1049,40 +1510,49 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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); + temp = hv_fetch(href, "EXTRA_RESPONSE_DATA", 19, 0); + if (temp) + { + ptr = SvPV(*temp, len); + rr->extra_response_data = odr_strdupn(rr->stream, ptr, len); + } + 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->errstring = odr_strdupn(rr->stream, ptr, len); 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; + buffer = rr->entries; entries = (AV *)SvRV(entries_ref); - for (i = 0; i < rr->num_entries; i++) + 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->term = odr_strdupn(rr->stream, ptr, len); + temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); buffer->occurrences = SvIV(*temp); + temp = hv_fetch(scan_item, "DISPLAY_TERM", 12, 0); + if (temp) + { + ptr = SvPV(*temp, len); + buffer->display_term = odr_strdupn(rr->stream, ptr,len); + } buffer++; hv_undef(scan_item); } - rr->entries = scan_list; + zhandle->handle = point; handle = zhandle; sv_free(err_code); @@ -1102,32 +1572,90 @@ int bend_scan(void *handle, bend_scan_rr *rr) return 0; } - -bend_initresult *bend_init(bend_initrequest *q) +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 *id; - 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; - char *user = NULL; - char *passwd = NULL; + Zfront_handle *zhandle = (Zfront_handle *)handle; + + dSP; + ENTER; + SAVETMPS; + + 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 = odr_strdupn(q->stream, explain, len); + + return 0; +} + + +/* + * You'll laugh when I tell you this ... Astonishingly, it turns out + * that ActivePerl (which is widely used on Windows) has, in the + * header file Perl\lib\CORE\XSUB.h, the following heinous crime: + * # define open PerlLIO_open + * This of course screws up the use of the "open" member of the + * Z_IdAuthentication structure below, so we have to undo this + * brain-damage. + */ +#ifdef open +#undef open +#endif + +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; - /*q->bend_sort = bend_sort;*/ + 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; @@ -1137,7 +1665,10 @@ bend_initresult *bend_init(bend_initrequest *q) q->bend_present = bend_present; } /*q->bend_esrequest = bend_esrequest;*/ - /*q->bend_delete = bend_delete;*/ + if (delete_ref) + { + q->bend_delete = bend_delete; + } if (fetch_ref) { q->bend_fetch = bend_fetch; @@ -1146,131 +1677,193 @@ bend_initresult *bend_init(bend_initrequest *q) { q->bend_scan = bend_scan; } - href = newHV(); + if (explain_ref) + { + q->bend_explain = bend_explain; + } + + href = newHV(); + + /* ### These should be given initial values from the client */ 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 *openpass = xstrdup (q->auth->u.open); - char *cp = strchr (openpass, '/'); + char *cp; + user = nmem_strdup (odr_getmem (q->stream), q->auth->u.open); + cp = strchr (user, '/'); if (cp) { + /* password after / given */ *cp = '\0'; - user = nmem_strdup (odr_getmem (q->stream), openpass); - passwd = nmem_strdup (odr_getmem (q->stream), cp + 1); + passwd = cp+1; } - xfree(openpass); } 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 */ - hv_store(href, "USER", 4, newSVpv(user, 0), 0); - hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0); + if (user) + hv_store(href, "USER", 4, newSVpv(user, 0), 0); + if (passwd) + hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0); } - PUSHMARK(sp); + 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); - id = newSVsv(*temp); + 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 = odr_strdupn(q->stream, ptr, len); 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; -#if 0 /* implementation_id support is not yet in mainstream Yaz */ - ptr = SvPV(id, len); - q->implementation_id = (char *)xmalloc(len + 1); - strcpy(q->implementation_id, ptr); -#endif - 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; } - 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); + + PUSHMARK(sp); + + XPUSHs(sv_2mortal(newRV((SV *)href))); + + PUTBACK; + + handler_cv = simpleserver_sv2cv( close_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); + + SPAGAIN; + + sv_free((SV*) href); } + else + sv_free(zhandle->handle); + PUTBACK; + FREETMPS; + LEAVE; + stop_flag = zhandle->stop_flag; + nmem_destroy(zhandle->nmem); + simpleserver_free(); + + if (stop_flag) + exit(0); + return; +} + +static void start_stop(struct statserv_options_block *sob, SV *handler_ref) +{ + HV *href; + dSP; + ENTER; + SAVETMPS; href = newHV(); - hv_store(href, "HANDLE", 6, zhandle->handle, 0); + hv_store(href, "CONFIG", 6, newSVpv(sob->configname, 0), 0); PUSHMARK(sp); - XPUSHs(sv_2mortal(newRV((SV *)href))); + XPUSHs(sv_2mortal(newRV((SV*) href))); PUTBACK; - - perl_call_sv(close_ref, G_SCALAR | G_DISCARD); - + + if (handler_ref != NULL) + { + CV* handler_cv = simpleserver_sv2cv( handler_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); + } + SPAGAIN; PUTBACK; FREETMPS; LEAVE; - xfree(handle); - - return; + } +void bend_start(struct statserv_options_block *sob) +{ + start_stop(sob, start_ref); +} 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 CODE: init_ref = newSVsv(arg); - + void set_close_handler(arg) @@ -1326,6 +1919,17 @@ set_scan_handler(arg) CODE: scan_ref = newSVsv(arg); +void +set_explain_handler(arg) + SV *arg + CODE: + explain_ref = newSVsv(arg); + +void +set_start_handler(arg) + SV *arg + CODE: + start_ref = newSVsv(arg); int start_server(...) @@ -1335,6 +1939,7 @@ start_server(...) char *ptr; int i; STRLEN len; + struct statserv_options_block *sob; CODE: argv_buf = (char **)xmalloc((items + 1) * sizeof(char *)); argv = argv_buf; @@ -1342,10 +1947,21 @@ start_server(...) { ptr = SvPV(ST(i), len); *argv_buf = (char *)xmalloc(len + 1); - strcpy(*argv_buf++, ptr); + strcpy(*argv_buf++, ptr); } *argv_buf = NULL; - + + sob = statserv_getcontrol(); + sob->bend_start = bend_start; + statserv_setcontrol(sob); + + 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 @@ -1365,4 +1981,21 @@ ScanPartial() OUTPUT: RETVAL - + +void +yazlog(arg) + SV *arg + CODE: + STRLEN len; + char *ptr; + ptr = SvPV(arg, len); + yaz_log(YLOG_LOG, "%.*s", (int) len, ptr); + +int +yaz_diag_srw_to_bib1(srw_code) + int srw_code + +int +yaz_diag_bib1_to_srw(bib1_code) + int bib1_code +