-/*
- * $Id: SimpleServer.xs,v 1.83 2008-09-02 15:16:34 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"
#include "XSUB.h"
#include <assert.h>
#include <yaz/backend.h>
+#include <yaz/facet.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
+#include <yaz/pquery.h>
#include <yaz/querytowrbuf.h>
#include <stdio.h>
#include <yaz/mutex.h>
#endif
#include <stdlib.h>
#include <ctype.h>
-#define GRS_MAX_FIELDS 500
+#define GRS_MAX_FIELDS 500
#ifdef ASN_COMPILED
#include <yaz/ill.h>
#endif
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;
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
CV * simpleserver_sv2cv(SV *handler) {
STRLEN len;
char *buf;
-
+
if (SvPOK(handler)) {
CV *ret;
buf = SvPV( handler, len);
fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf );
exit(1);
}
-
+
return ret;
} else {
return (CV *) handler;
#ifdef USE_ITHREADS
void tst_clones(void)
{
- int i;
+ int i;
PerlInterpreter *parent = PERL_GET_CONTEXT;
for (i = 0; i<5000; i++)
{
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;
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;
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;
}
}
-
-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()));
}
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)
{
}
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);
}
default:
fatal("unknown RPN node type %d", (int) s->which);
}
-
+
return 0;
}
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);
else if (key->which == Z_SortKey_elementSpec)
{
Z_Specification *zspec = key->u.elementSpec;
-
+
hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16,
newSViv(zspec->which), 0);
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)
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++)
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_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);
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_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)
{
Zfront_handle *zhandle = (Zfront_handle *)handle;
CV* handler_cv = 0;
SV *rpnSV;
+ SV *facetSV;
dSP;
ENTER;
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);
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)
{
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 );
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);
zhandle->handle = point;
- sv_free( (SV*) href);
+ sv_free( (SV*) href);
PUTBACK;
FREETMPS;
if (simple->which == Z_ElementSetNames_generic)
{
hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
- }
+ }
else
{
rr->errcode = 26;
XPUSHs(sv_2mortal(newRV( (SV*) href)));
PUTBACK;
-
+
handler_cv = simpleserver_sv2cv( fetch_ref );
perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
hv_undef(href);
-
+
ptr = SvPV(basename, length);
ODR_basename = (char *)odr_malloc(rr->stream, length + 1);
strcpy(ODR_basename, ptr);
zhandle->handle = point;
handle = zhandle;
rr->last_in_set = SvIV(last);
-
+
if (!(rr->errcode))
{
rr->errcode = SvIV(err_code);
PUTBACK;
FREETMPS;
LEAVE;
-
+
return 0;
}
SV **temp;
SV *err_code;
SV *err_string;
- SV *hits;
SV *point;
STRLEN len;
Z_RecordComposition *composition;
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)
{
if (simple->which == Z_ElementSetNames_generic)
{
hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
- }
+ }
else
{
rr->errcode = 26;
}
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);
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);
handle = zhandle;
sv_free(err_code);
sv_free(err_string);
- sv_free(hits);
sv_free( (SV*) href);
return 0;
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);
}
temp = hv_fetch(href, "STATUS", 6, 1);
status = newSVsv(*temp);
-
+
temp = hv_fetch(href, "NUMBER", 6, 1);
number = newSVsv(*temp);
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);
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, "PASS", 4, newSVpv(passwd, 0), 0);
}
- PUSHMARK(sp);
+ PUSHMARK(sp);
XPUSHs(sv_2mortal(newRV((SV*) href)));
PUTBACK;
FREETMPS;
LEAVE;
-
- return r;
+
+ return r;
}
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);
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
SV *arg
CODE:
_global_ghandle = newSVsv(arg);
-
+
void
set_init_handler(arg)
SV *arg
CODE:
init_ref = newSVsv(arg);
-
+
void
set_close_handler(arg)
CODE:
explain_ref = newSVsv(arg);
+void
+set_start_handler(arg)
+ SV *arg
+ CODE:
+ start_ref = newSVsv(arg);
+
int
start_server(...)
PREINIT:
char *ptr;
int i;
STRLEN len;
+ struct statserv_options_block *sob;
CODE:
argv_buf = (char **)xmalloc((items + 1) * sizeof(char *));
argv = argv_buf;
{
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
OUTPUT:
RETVAL
-
+
void
yazlog(arg)
SV *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)
projects / simpleserver-moved-to-github.git / blobdiff