X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=2062ac3c8f4c9c034c8afa29c716ebd62c55ae74;hp=a09403f2858fe9671b18c835052c6c3a96840def;hb=c987ce263013255ff651b58eb78b63200feb31c1;hpb=1778a36a88fa8a4b0ca1aa1c39e079b953f6bc98 diff --git a/SimpleServer.xs b/SimpleServer.xs index a09403f..2062ac3 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* - * $Id: SimpleServer.xs,v 1.43 2006-04-21 07:30:15 sondberg Exp $ + * $Id: SimpleServer.xs,v 1.63 2007-05-23 10:22:00 sondberg Exp $ * ---------------------------------------------------------------------- * * Copyright (c) 2000-2004, Index Data. @@ -35,7 +35,10 @@ #include #include #include +#include #include +#include +#include #ifdef WIN32 #else #include @@ -50,7 +53,7 @@ #define sv_undef PL_sv_undef #endif -NMEM_MUTEX simpleserver_mutex; +YAZ_MUTEX simpleserver_mutex; typedef struct { SV *handle; @@ -64,6 +67,7 @@ typedef struct { SV *esrequest_ref; SV *delete_ref; SV *scan_ref; + SV *explain_ref; NMEM nmem; int stop_flag; /* is used to stop server prematurely .. */ } Zfront_handle; @@ -79,10 +83,10 @@ SV *present_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 CV * simpleserver_sv2cv(SV *handler) { STRLEN len; @@ -126,7 +130,7 @@ void tst_clones(void) int simpleserver_clone(void) { #ifdef USE_ITHREADS - nmem_mutex_enter(simpleserver_mutex); + yaz_mutex_enter(simpleserver_mutex); if (1) { PerlInterpreter *current = PERL_GET_CONTEXT; @@ -142,14 +146,14 @@ int simpleserver_clone(void) { 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; @@ -164,7 +168,7 @@ void simpleserver_free(void) { perl_free(current_interp); } } - nmem_mutex_leave(simpleserver_mutex); + yaz_mutex_leave(simpleserver_mutex); } @@ -192,7 +196,7 @@ Z_GenericRecord *read_grs1(char *str, ODR o) } 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); @@ -207,7 +211,7 @@ Z_GenericRecord *read_grs1(char *str, ODR o) } 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') @@ -219,25 +223,22 @@ Z_GenericRecord *read_grs1(char *str, ODR o) 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; @@ -259,7 +260,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o) - static void oid2str(Odr_oid *o, WRBUF buf) { for (; *o >= 0; o++) { @@ -271,6 +271,13 @@ static void oid2str(Odr_oid *o, WRBUF buf) } } +WRBUF oid2dotted(Odr_oid *oid) +{ + WRBUF buf = wrbuf_alloc(); + oid2str(oid, buf); + return buf; +} + WRBUF zquery2pquery(Z_Query *q) { @@ -445,6 +452,44 @@ static SV *rpn2perl(Z_RPNStructure *s) } +/* 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) { @@ -477,7 +522,7 @@ int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec) oid2str(zspec->schema.oid, elementSpec); hv_store(sort_spec, "ELEMENTSPEC_VALUE", 17, newSVpv(elementSpec->buf, elementSpec->pos), 0); - wrbuf_free(elementSpec, 1); + wrbuf_destroy(elementSpec); } else if (zspec->which == Z_Schema_uri) { @@ -487,9 +532,8 @@ int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec) } else if (key->which == Z_SortKey_sortAttributes) { - Z_SortAttributes *attr = key->u.sortAttributes; - - return 0; + return simpleserver_ExpandSortAttributes(sort_spec, + key->u.sortAttributes); } else { @@ -659,6 +703,8 @@ int bend_search(void *handle, bend_search_rr *rr) #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); @@ -717,7 +763,7 @@ int bend_search(void *handle, bend_search_rr *rr) sv_free( (SV*) aref); sv_free( (SV*) href); if (query) - wrbuf_free(query, 1); + wrbuf_destroy(query); PUTBACK; FREETMPS; LEAVE; @@ -725,71 +771,6 @@ int bend_search(void *handle, bend_search_rr *rr) } -/* ### this is worryingly similar to oid2str() */ -WRBUF oid2dotted(int *oid) -{ - - WRBUF buf = wrbuf_alloc(); - int dot = 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; -} - - -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++); - } - *oid = -1; - return 0; -} - - int bend_fetch(void *handle, bend_fetch_rr *rr) { HV *href; @@ -802,18 +783,18 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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; @@ -823,9 +804,14 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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); - if (rr->request_format_raw != 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(); @@ -856,13 +842,32 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) rr->errcode = 26; } } + 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 */ + fprintf(stderr, "complex is weird\n"); + rr->errcode = 26; + return 0; +#endif /*0*/ + } + } else { - /* This is where we end up in the case of - * SRU. Since record composition ("element - * sets") are meaningless in SRU anyway, we - * just skip this. - */ + rr->errcode = 26; + return 0; } } @@ -898,6 +903,16 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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); @@ -910,16 +925,18 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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; @@ -945,7 +962,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) } 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); @@ -955,6 +972,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) sv_free(sur_flag); sv_free(rep_form); + if (schema) + sv_free(schema); + PUTBACK; FREETMPS; LEAVE; @@ -974,6 +994,7 @@ int bend_present(void *handle, bend_present_rr *rr) STRLEN len; Z_RecordComposition *composition; Z_ElementSetNames *simple; + Z_CompSpec *complex; char *ODR_errstr; char *ptr; Zfront_handle *zhandle = (Zfront_handle *)handle; @@ -1012,6 +1033,25 @@ int bend_present(void *handle, bend_present_rr *rr) 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; + return 0; + } + } else { rr->errcode = 26; @@ -1114,7 +1154,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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; @@ -1210,6 +1250,48 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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, "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(); @@ -1254,6 +1336,10 @@ bend_initresult *bend_init(bend_initrequest *q) { q->bend_scan = bend_scan; } + if (explain_ref) + { + q->bend_explain = bend_explain; + } href = newHV(); hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0); @@ -1446,6 +1532,11 @@ set_scan_handler(arg) CODE: scan_ref = newSVsv(arg); +void +set_explain_handler(arg) + SV *arg + CODE: + explain_ref = newSVsv(arg); int start_server(...) @@ -1466,7 +1557,7 @@ 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();