X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=eb492e3f30eb104248b6cbee9095f0e2a48d0d32;hp=788b92941cdd0049315bc66fe6c8b0290bf66231;hb=bbae3fcc7f1b9cf30cbfdd1ab3d7784b618ad6cc;hpb=28f39047a9ca5a732023f1187c21dd8213c432cd diff --git a/SimpleServer.xs b/SimpleServer.xs index 788b929..eb492e3 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,30 +1,28 @@ -/* - * $Id: SimpleServer.xs,v 1.79 2007-09-10 14:50:31 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, - * provided that: - * - * 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. +/* 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: * - * 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. + * * 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. * - * 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. */ #include "EXTERN.h" @@ -34,8 +32,10 @@ #include "XSUB.h" #include #include +#include #include #include +#include #include #include #include @@ -46,7 +46,7 @@ #endif #include #include -#define GRS_MAX_FIELDS 500 +#define GRS_MAX_FIELDS 500 #ifdef ASN_COMPILED #include #endif @@ -59,19 +59,6 @@ YAZ_MUTEX simpleserver_mutex; typedef struct { 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; - SV *search_ref; - SV *fetch_ref; - SV *present_ref; - 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; @@ -89,6 +76,7 @@ SV *esrequest_ref = NULL; SV *delete_ref = NULL; SV *scan_ref = NULL; SV *explain_ref = NULL; +SV *start_ref = NULL; PerlInterpreter *root_perl_context; #define GRS_BUF_SIZE 8192 @@ -118,7 +106,7 @@ char *string_or_undef(SV **svp, ODR stream) { CV * simpleserver_sv2cv(SV *handler) { STRLEN len; char *buf; - + if (SvPOK(handler)) { CV *ret; buf = SvPV( handler, len); @@ -126,7 +114,7 @@ CV * simpleserver_sv2cv(SV *handler) { fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf ); exit(1); } - + return ret; } else { return (CV *) handler; @@ -137,7 +125,7 @@ CV * simpleserver_sv2cv(SV *handler) { #ifdef USE_ITHREADS void tst_clones(void) { - int i; + int i; PerlInterpreter *parent = PERL_GET_CONTEXT; for (i = 0; i<5000; i++) { @@ -186,7 +174,7 @@ void simpleserver_free(void) { 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.. + * we're in threaded mode and we must destroy.. */ if (current_interp != root_perl_context) { PL_perl_destruct_level = 2; @@ -210,13 +198,13 @@ Z_GenericRecord *read_grs1(char *str, ODR o) 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; @@ -304,13 +292,13 @@ WRBUF oid2dotted(Odr_oid *oid) 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) + 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; @@ -395,23 +383,14 @@ static SV *translateOID(Odr_oid *x) } } - -static SV *apt2perl(Z_AttributesPlusTerm *at) +static SV *attributes2perl(Z_AttributeList *list) { - SV *sv; - HV *hv; AV *av; - - 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]; + 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())); @@ -441,13 +420,25 @@ static SV *apt2perl(Z_AttributesPlusTerm *at) } av_push(av, tmp); } - setMember(hv, "attributes", attrs); - } - setMember(hv, "term", newSVpv((char*) at->term->u.general->buf, - at->term->u.general->len)); - return sv; + 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) { @@ -475,8 +466,8 @@ static SV *rpn2perl(Z_RPNStructure *s) } case Z_Operand_APT: - return apt2perl(o->u.attributesPlusTerm); - + return f_Term_to_SV(o->u.attributesPlusTerm->term, + o->u.attributesPlusTerm->attributes); default: fatal("unknown RPN simple type %d", (int) o->which); } @@ -505,7 +496,7 @@ static SV *rpn2perl(Z_RPNStructure *s) default: fatal("unknown RPN node type %d", (int) s->which); } - + return 0; } @@ -527,11 +518,11 @@ int simpleserver_ExpandSortAttributes (HV *sort_spec, Z_SortAttributes *sattr) hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0); - for (i = 0; i < attr_list->num_attributes; i++) + for (i = 0; i < attr_list->num_attributes; i++) { - Z_AttributeElement *attr = *attr_list->attributes++; + 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); @@ -569,7 +560,7 @@ int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec) else if (key->which == Z_SortKey_elementSpec) { Z_Specification *zspec = key->u.elementSpec; - + hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16, newSViv(zspec->which), 0); @@ -612,7 +603,7 @@ 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) @@ -640,11 +631,11 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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++) @@ -666,7 +657,7 @@ int bend_sort(void *handle, bend_sort_rr *rr) return 0; } } - + href = newHV(); hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0); hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0); @@ -702,14 +693,14 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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); @@ -719,7 +710,7 @@ int bend_sort(void *handle, bend_sort_rr *rr) sv_free(err_code); sv_free(err_str); sv_free(status); - + PUTBACK; FREETMPS; LEAVE; @@ -727,6 +718,175 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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_malloc(odr, s_len + 1); + memcpy(c->list[0]->u.string, s_buf, s_len); + c->list[0]->u.string[s_len] = '\0'; + 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; + } +} int bend_search(void *handle, bend_search_rr *rr) { @@ -740,6 +900,7 @@ int bend_search(void *handle, bend_search_rr *rr) Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; SV *rpnSV; + SV *facetSV; dSP; ENTER; @@ -757,9 +918,9 @@ int bend_search(void *handle, bend_search_rr *rr) zhandle->stop_flag = 1; } #endif - href = newHV(); + href = newHV(); hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0); - if (rr->srw_sortKeys && *rr->srw_sortKeys) + 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); @@ -769,9 +930,15 @@ int bend_search(void *handle, bend_search_rr *rr) 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, "PRESENT_NUMBER", 14, newSViv(rr->present_number), 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) { @@ -783,14 +950,14 @@ int bend_search(void *handle, bend_search_rr *rr) 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; handler_cv = simpleserver_sv2cv( search_ref ); @@ -810,6 +977,10 @@ int bend_search(void *handle, bend_search_rr *rr) temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); + temp = hv_fetch(href, "OUTPUTFACETS", 12, 1); + if (SvTYPE(*temp) != SVt_NULL) + f_SV_to_FacetList(*temp, &rr->search_info, rr->stream); + hv_undef(href); av_undef(aref); @@ -865,7 +1036,7 @@ int bend_delete(void *handle, bend_delete_rr *rr) 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; + return 0; } for (i = 0; i < rr->num_setnames; i++) { @@ -887,7 +1058,7 @@ int bend_delete(void *handle, bend_delete_rr *rr) zhandle->handle = point; - sv_free( (SV*) href); + sv_free( (SV*) href); PUTBACK; FREETMPS; @@ -963,7 +1134,7 @@ 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; @@ -1006,7 +1177,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) XPUSHs(sv_2mortal(newRV( (SV*) href))); PUTBACK; - + handler_cv = simpleserver_sv2cv( fetch_ref ); perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); @@ -1048,7 +1219,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) hv_undef(href); - + ptr = SvPV(basename, length); ODR_basename = (char *)odr_malloc(rr->stream, length + 1); strcpy(ODR_basename, ptr); @@ -1081,7 +1252,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) zhandle->handle = point; handle = zhandle; rr->last_in_set = SvIV(last); - + if (!(rr->errcode)) { rr->errcode = SvIV(err_code); @@ -1108,7 +1279,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) PUTBACK; FREETMPS; LEAVE; - + return 0; } @@ -1119,7 +1290,6 @@ int bend_present(void *handle, bend_present_rr *rr) SV **temp; SV *err_code; SV *err_string; - SV *hits; SV *point; STRLEN len; Z_RecordComposition *composition; @@ -1146,7 +1316,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) { @@ -1157,7 +1326,7 @@ 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; @@ -1194,14 +1363,14 @@ int bend_present(void *handle, bend_present_rr *rr) } PUSHMARK(sp); - + XPUSHs(sv_2mortal(newRV( (SV*) href))); - + PUTBACK; - + 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); @@ -1210,19 +1379,15 @@ 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); @@ -1233,7 +1398,6 @@ int bend_present(void *handle, bend_present_rr *rr) handle = zhandle; sv_free(err_code); sv_free(err_string); - sv_free(hits); sv_free( (SV*) href); return 0; @@ -1281,7 +1445,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) list = newAV(); /* RPN is better than TERM since it includes attributes */ - if ((rpnSV = apt2perl(rr->term)) != 0) { + if ((rpnSV = f_Term_to_SV(rr->term->term, rr->term->attributes)) != 0) { setMember(href, "RPN", rpnSV); } @@ -1332,7 +1496,7 @@ 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); @@ -1358,9 +1522,9 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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); + buffer->term = (char *) odr_malloc (rr->stream, len + 1); strcpy(buffer->term, ptr); - temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); + temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); buffer->occurrences = SvIV(*temp); buffer++; hv_undef(scan_item); @@ -1428,6 +1592,21 @@ int bend_explain(void *handle, bend_explain_rr *q) 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(); @@ -1480,10 +1659,13 @@ bend_initresult *bend_init(bend_initrequest *q) q->bend_explain = bend_explain; } - href = newHV(); + 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); @@ -1513,7 +1695,7 @@ bend_initresult *bend_init(bend_initrequest *q) hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0); } - PUSHMARK(sp); + PUSHMARK(sp); XPUSHs(sv_2mortal(newRV((SV*) href))); @@ -1559,8 +1741,8 @@ bend_initresult *bend_init(bend_initrequest *q) PUTBACK; FREETMPS; LEAVE; - - return r; + + return r; } void bend_close(void *handle) @@ -1584,10 +1766,10 @@ void bend_close(void *handle) 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); @@ -1606,6 +1788,41 @@ void bend_close(void *handle) return; } +static void start_stop(struct statserv_options_block *sob, SV *handler_ref) +{ + HV *href; + dSP; + ENTER; + SAVETMPS; + + href = newHV(); + hv_store(href, "CONFIG", 6, newSVpv(sob->configname, 0), 0); + + PUSHMARK(sp); + + XPUSHs(sv_2mortal(newRV((SV*) href))); + + PUTBACK; + + 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; + + +} + +void bend_start(struct statserv_options_block *sob) +{ + start_stop(sob, start_ref); +} MODULE = Net::Z3950::SimpleServer PACKAGE = Net::Z3950::SimpleServer @@ -1617,14 +1834,14 @@ 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) @@ -1686,6 +1903,12 @@ set_explain_handler(arg) CODE: explain_ref = newSVsv(arg); +void +set_start_handler(arg) + SV *arg + CODE: + start_ref = newSVsv(arg); + int start_server(...) PREINIT: @@ -1694,6 +1917,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; @@ -1701,16 +1925,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 @@ -1730,7 +1959,7 @@ ScanPartial() OUTPUT: RETVAL - + void yazlog(arg) SV *arg @@ -1738,7 +1967,7 @@ yazlog(arg) STRLEN len; char *ptr; ptr = SvPV(arg, len); - yaz_log(YLOG_LOG, "%.*s", len, ptr); + yaz_log(YLOG_LOG, "%.*s", (int) len, ptr); int yaz_diag_srw_to_bib1(srw_code)