/*
- * $Id: SimpleServer.xs,v 1.36 2006-01-30 21:29:41 adam Exp $
+ * $Id: SimpleServer.xs,v 1.77 2007-09-07 16:54:01 mike Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
#include "proto.h"
#include "embed.h"
#include "XSUB.h"
+#include <assert.h>
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
#include <stdio.h>
+#include <yaz/mutex.h>
+#include <yaz/oid_db.h>
#ifdef WIN32
#else
#include <unistd.h>
#define sv_undef PL_sv_undef
#endif
-NMEM_MUTEX simpleserver_mutex;
+YAZ_MUTEX simpleserver_mutex;
typedef struct {
- SV *handle;
-
+ 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 *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;
#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;
SV *esrequest_ref = NULL;
SV *delete_ref = NULL;
SV *scan_ref = NULL;
+SV *explain_ref = NULL;
PerlInterpreter *root_perl_context;
-int MAX_OID = 15;
-#define GRS_BUF_SIZE 512
+#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, *buf;
+
+ if (!SvOK(*svp))
+ return 0;
+
+ ptr = SvPV(*svp, len);
+ buf = (char*) odr_malloc(stream, len+1);
+ strcpy(buf, ptr);
+ return buf;
+}
+
CV * simpleserver_sv2cv(SV *handler) {
STRLEN len;
int simpleserver_clone(void) {
#ifdef USE_ITHREADS
- nmem_mutex_enter(simpleserver_mutex);
+ yaz_mutex_enter(simpleserver_mutex);
if (1)
{
PerlInterpreter *current = PERL_GET_CONTEXT;
PERL_SET_CONTEXT( perl_interp );
}
}
- nmem_mutex_leave(simpleserver_mutex);
+ yaz_mutex_leave(simpleserver_mutex);
#endif
return 0;
}
void simpleserver_free(void) {
- nmem_mutex_enter(simpleserver_mutex);
+ yaz_mutex_enter(simpleserver_mutex);
if (1)
{
PerlInterpreter *current_interp = PERL_GET_CONTEXT;
perl_free(current_interp);
}
}
- nmem_mutex_leave(simpleserver_mutex);
+ yaz_mutex_leave(simpleserver_mutex);
}
}
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);
}
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')
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;
+ 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;
-
static void oid2str(Odr_oid *o, WRBUF buf)
{
for (; *o >= 0; o++) {
}
}
-
-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;
}
-
+
WRBUF zquery2pquery(Z_Query *q)
{
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;
}
}
+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 {
+ assert(elem->which == Z_AttributeValue_complex);
+ Z_ComplexAttribute *c = elem->value.complex;
+ Z_StringOrNumeric *son;
+ /* 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;
+ Z_Operand *o;
switch (s->which) {
- case Z_RPNStructure_simple: {
- Z_Operand *o = s->u.simple;
- Z_AttributesPlusTerm *at;
- if (o->which == Z_Operand_resultSetId) {
- SV *sv2;
+ 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);
+ /*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;
}
- if (o->which != Z_Operand_APT)
- fatal("can't handle RPN simples other than APT and RSID");
- 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_Operand_APT:
+ return apt2perl(o->u.attributesPlusTerm);
+
+ default:
+ fatal("unknown RPN simple type %d", (int) o->which);
}
- setMember(hv, "term", newSVpv((char*) at->term->u.general->buf,
- at->term->u.general->len));
- return sv;
- }
+
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);
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 *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;
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);
temp = hv_fetch(href, "STATUS", 6, 1);
status = newSVsv(*temp);
- PUTBACK;
- FREETMPS;
- LEAVE;
+ temp = hv_fetch(href, "HANDLE", 6, 1);
+ point = newSVsv(*temp);
- hv_undef(href),
+ 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);
rr->errstring = ODR_err_str;
+ zhandle->handle = point;
sv_free(err_code);
sv_free(err_str);
sv_free(status);
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
+
return 0;
}
HV *href;
AV *aref;
SV **temp;
- char *ODR_errstr;
- STRLEN len;
int i;
char **basenames;
WRBUF query;
- char *ptr;
SV *point;
Zfront_handle *zhandle = (Zfront_handle *)handle;
CV* handler_cv = 0;
+ SV *rpnSV;
dSP;
ENTER;
#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);
+ if ((rpnSV = zquery2perl(rr->query)) != 0) {
+ hv_store(href, "RPN", 3, rpnSV, 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);
rr->errcode = SvIV(*temp);
temp = hv_fetch(href, "ERR_STR", 7, 1);
- ptr = SvPV(*temp, len);
- ODR_errstr = (char *)odr_malloc(rr->stream, len + 1);
- strcpy(ODR_errstr, ptr);
- rr->errstring = ODR_errstr;
+ rr->errstring = string_or_undef(temp, rr->stream);
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
zhandle->handle = point;
sv_free( (SV*) aref);
sv_free( (SV*) href);
- wrbuf_free(query, 1);
+ if (query)
+ wrbuf_destroy(query);
PUTBACK;
FREETMPS;
LEAVE;
}
-/* ### 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;
+
+ dSP;
+ ENTER;
+ SAVETMPS;
- WRBUF buf = wrbuf_alloc();
- int dot = 0;
+ 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);
- 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;
-}
-
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newRV( (SV*) href)));
+ PUTBACK;
-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++);
+ 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;
+ }
+
+ 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;
}
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;
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, "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)
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;
}
}
temp = hv_fetch(href, "REP_FORM", 8, 1);
rep_form = newSVsv(*temp);
+ temp = hv_fetch(href, "SCHEMA", 6, 1);
+ if (temp != 0) {
+ schema = newSVsv(*temp);
+ ptr = SvPV(schema, length);
+ if (length > 0) {
+ rr->schema = (char *)odr_malloc(rr->stream, length + 1);
+ strcpy(rr->schema, ptr);
+ }
+ }
+
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
rr->basename = ODR_basename;
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 */
+
+ rr->output_format = yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, ptr, rr->stream);
+ if (!rr->output_format)
{
- printf("Net::Z3950::SimpleServer: WARNING: OID structure too long, max length is %d\n", MAX_OID);
+ printf("Net::Z3950::SimpleServer: WARNING: Bad OID %s\n", ptr);
+ rr->output_format =
+ odr_oiddup(rr->stream, yaz_oid_recsyn_sutrs);
}
- 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 */
+ /* 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;
}
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(sur_flag);
sv_free(rep_form);
+ if (schema)
+ sv_free(schema);
+
PUTBACK;
FREETMPS;
LEAVE;
STRLEN len;
Z_RecordComposition *composition;
Z_ElementSetNames *simple;
+ Z_CompSpec *complex;
char *ODR_errstr;
char *ptr;
Zfront_handle *zhandle = (Zfront_handle *)handle;
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);
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;
}
}
}
-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;
- hv_store(href, "TERM", 4, newSVpv(rr->term->term->u.general->buf, term_len), 0);
+ hv_store(href, "TERM", 4, newSVpv((char*) rr->term->term->u.general->buf, term_len), 0);
} else {
rr->errcode = 229; /* Unsupported term type */
return 0;
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);
scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list));
buffer = scan_list;
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);
return 0;
}
+int bend_explain(void *handle, bend_explain_rr *q)
+{
+ HV *href;
+ CV *handler_cv = 0;
+ SV **temp;
+ char *explain;
+ SV *explainsv;
+ STRLEN len;
+ 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 = (char*) odr_malloc(q->stream, len + 1);
+ strcpy(q->explain_buf, explain);
+
+ return 0;
+}
+
bend_initresult *bend_init(bend_initrequest *q)
{
int dummy = simpleserver_clone();
bend_initresult *r = (bend_initresult *)
odr_malloc (q->stream, sizeof(*r));
char *ptr;
- char *user = NULL;
- char *passwd = NULL;
CV* handler_cv = 0;
dSP;
STRLEN len;
ENTER;
SAVETMPS;
+ zhandle->ghandle = _global_ghandle;
zhandle->nmem = nmem;
zhandle->stop_flag = 0;
- /*q->bend_sort = bend_sort;*/
+
+ if (sort_ref)
+ {
+ q->bend_sort = bend_sort;
+ }
if (search_ref)
{
q->bend_search = bend_search;
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;
{
q->bend_scan = bend_scan;
}
+ if (explain_ref)
+ {
+ q->bend_explain = bend_explain;
+ }
href = newHV();
hv_store(href, "IMP_ID", 6, 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);
if (close_ref)
{
href = newHV();
+ hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0);
hv_store(href, "HANDLE", 6, zhandle->handle, 0);
PUSHMARK(sp);
void
+set_ghandle(arg)
+ SV *arg
+ CODE:
+ _global_ghandle = newSVsv(arg);
+
+
+void
set_init_handler(arg)
SV *arg
CODE:
CODE:
scan_ref = newSVsv(arg);
+void
+set_explain_handler(arg)
+ SV *arg
+ CODE:
+ explain_ref = newSVsv(arg);
int
start_server(...)
}
*argv_buf = NULL;
root_perl_context = PERL_GET_CONTEXT;
- nmem_mutex_create(&simpleserver_mutex);
+ yaz_mutex_create(&simpleserver_mutex);
#if 0
/* only for debugging perl_clone .. */
tst_clones();
char *ptr;
ptr = SvPV(arg, len);
yaz_log(YLOG_LOG, "%.*s", len, ptr);
+
+int
+yaz_diag_srw_to_bib1(srw_code)
+ int srw_code
+
+int
+yaz_diag_bib1_to_srw(bib1_code)
+ int bib1_code
+
projects / simpleserver-moved-to-github.git / blobdiff