-/*
- * $Id: SimpleServer.xs,v 1.71 2007-08-17 16:24:40 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-2011 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>
}
}
+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;
- SV *sv2;
- char *rsid;
- Z_Operand *o = s->u.simple;
- Z_AttributesPlusTerm *at;
+ Z_Operand *o;
switch (s->which) {
- default:
- fatal("unknown RPN node type %d", (int) s->which);
+ 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;
+ }
+
+ 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);
return sv;
}
- case Z_RPNStructure_simple: switch (o->which) {
default:
- fatal("unknown RPN simple type %d", (int) o->which);
-
- case Z_Operand_resultSetId:
- /* This code causes a SIGBUS on my machine, and I have no
- idea why. It seems as clear as day to me */
- rsid = (char*) o->u.resultSetId;
- printf("Encoding resultSetId '%s'\n", rsid);
- sv = newObject("Net::Z3950::RPN::RSID", (SV*) (hv = newHV()));
- printf("Made sv=0x%lx, hv=0x%lx\n",
- (unsigned long) sv ,(unsigned long) hv);
- sv2 = newSVpv(rsid, strlen(rsid));
- setMember(hv, "id", sv2);
- printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2);
- return sv;
-
- case Z_Operand_APT:
- at = o->u.attributesPlusTerm;
- if (at->term->which != Z_Term_general)
- fatal("can't handle RPN terms other than general");
-
- sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV()));
- if (at->attributes) {
- int i;
- SV *attrs = newObject("Net::Z3950::RPN::Attributes",
- (SV*) (av = newAV()));
- for (i = 0; i < at->attributes->num_attributes; i++) {
- Z_AttributeElement *elem = at->attributes->attributes[i];
- HV *hv2;
- SV *tmp = newObject("Net::Z3950::RPN::Attribute",
- (SV*) (hv2 = newHV()));
- if (elem->attributeSet)
- setMember(hv2, "attributeSet",
- translateOID(elem->attributeSet));
- setMember(hv2, "attributeType",
- newSViv(*elem->attributeType));
- if (elem->which == Z_AttributeValue_numeric) {
- setMember(hv2, "attributeValue",
- newSViv(*elem->value.numeric));
- } else {
- assert(elem->which == Z_AttributeValue_complex);
- Z_ComplexAttribute *complex = elem->value.complex;
- Z_StringOrNumeric *son;
- /* We ignore semantic actions and multiple values */
- assert(complex->num_list > 0);
- son = complex->list[0];
- if (son->which == Z_StringOrNumeric_numeric) {
- setMember(hv2, "attributeValue",
- newSViv(*son->u.numeric));
- } else { /*Z_StringOrNumeric_string*/
- setMember(hv2, "attributeValue",
- newSVpv(son->u.string, 0));
- }
- }
- 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;
- } }
+ fatal("unknown RPN node type %d", (int) s->which);
+ }
return 0;
}
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;
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)
{
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);
}
+/* ### 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;
+
+ dSP;
+ ENTER;
+ SAVETMPS;
+
+ href = newHV();
+ hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0);
+ hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+ hv_store(href, "STATUS", 6, newSViv(0), 0);
+
+ 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];
+ }
+ }
+
+ 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;
+}
+
+
int bend_fetch(void *handle, bend_fetch_rr *rr)
{
HV *href;
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
+ return 0;
}
}
else if (composition->which == Z_RecordComp_complex)
else
{
#if 0 /* For now ignore this error, which is ubiquitous in SRU */
- fprintf(stderr, "complex is weird\n");
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;
}
}
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)
{
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
return 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;
}
}
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);
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;
}
-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;
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;
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();
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;
}
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);
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