/*
- * $Id: SimpleServer.xs,v 1.70 2007-08-17 16:21:41 mike Exp $
+ * $Id: SimpleServer.xs,v 1.86 2010-02-04 16:30:20 mike Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
}
+static SV *apt2perl(Z_AttributesPlusTerm *at)
+{
+ 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];
+ 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);
+ }
+ setMember(hv, "attributes", attrs);
+ }
+ setMember(hv, "term", newSVpv((char*) at->term->u.general->buf,
+ at->term->u.general->len));
+ return sv;
+}
+
+
static SV *rpn2perl(Z_RPNStructure *s)
{
SV *sv;
HV *hv;
AV *av;
- SV *sv2;
- char *rsid;
Z_Operand *o;
- Z_AttributesPlusTerm *at;
switch (s->which) {
case Z_RPNStructure_simple:
o = s->u.simple;
switch (o->which) {
- case Z_Operand_resultSetId:
+ 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 *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);
+ /*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);
+ /*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;
+ return apt2perl(o->u.attributesPlusTerm);
default:
- fatal("can't handle RPN simples other than APT and RSID");
-
+ fatal("unknown RPN simple type %d", (int) o->which);
}
case Z_RPNStructure_complex: {
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);
av_push(av, tmp);
return sv;
}
+
default:
fatal("unknown RPN node type %d", (int) s->which);
}
-
+
return 0;
}
}
+/* ### 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 = apt2perl(rr->term)) != 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