X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=aa80eaabb368260e689519b5412455f1a41ecb9b;hp=e783166ea25b9a5ab7175aace3eabcbaa3865f5a;hb=cf966225c35eccdd7fa20dbe842dd9594fccc375;hpb=f9991f4bea920ffc0951fede99e6e96d48922b0c diff --git a/SimpleServer.xs b/SimpleServer.xs index e783166..aa80eaa 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* - * $Id: SimpleServer.xs,v 1.62 2007-05-23 07:55:07 adam Exp $ + * $Id: SimpleServer.xs,v 1.71 2007-08-17 16:24:40 mike Exp $ * ---------------------------------------------------------------------- * * Copyright (c) 2000-2004, Index Data. @@ -32,6 +32,7 @@ #include "proto.h" #include "embed.h" #include "XSUB.h" +#include #include #include #include @@ -56,8 +57,10 @@ 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; @@ -68,12 +71,14 @@ typedef struct { 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; @@ -88,6 +93,28 @@ PerlInterpreter *root_perl_context; #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; char *buf; @@ -374,31 +401,58 @@ 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; switch (s->which) { - case Z_RPNStructure_simple: { - Z_Operand *o = s->u.simple; - Z_AttributesPlusTerm *at; - if (o->which == Z_Operand_resultSetId) { - SV *sv2; - /* This code causes a SIGBUS on my machine, and I have no - idea why. It seems as clear as day to me */ - 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; + default: + fatal("unknown RPN node type %d", (int) s->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_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); } - if (o->which != Z_Operand_APT) - fatal("can't handle RPN simples other than APT and RSID"); + sv = newObject(type, (SV*) (av = newAV())); + if ((tmp = rpn2perl(c->s1)) == 0) + return 0; + av_push(av, tmp); + if ((tmp = rpn2perl(c->s2)) == 0) + return 0; + av_push(av, tmp); + 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; @@ -414,9 +468,24 @@ static SV *rpn2perl(Z_RPNStructure *s) translateOID(elem->attributeSet)); setMember(hv2, "attributeType", newSViv(*elem->attributeType)); - assert(elem->which == Z_AttributeValue_numeric); - setMember(hv2, "attributeValue", - newSViv(*elem->value.numeric)); + 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); @@ -424,30 +493,8 @@ static SV *rpn2perl(Z_RPNStructure *s) 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_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); - } - sv = newObject(type, (SV*) (av = newAV())); - if ((tmp = rpn2perl(c->s1)) == 0) - return 0; - av_push(av, tmp); - if ((tmp = rpn2perl(c->s2)) == 0) - return 0; - av_push(av, tmp); - return sv; - } - default: fatal("unknown RPN node type %d", (int) s->which); - } - + } } + return 0; } @@ -613,6 +660,7 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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); @@ -674,12 +722,9 @@ int bend_search(void *handle, bend_search_rr *rr) 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; @@ -710,6 +755,7 @@ int bend_search(void *handle, bend_search_rr *rr) 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); if ((rpnSV = zquery2perl(rr->query)) != 0) { @@ -748,10 +794,7 @@ int bend_search(void *handle, bend_search_rr *rr) 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); @@ -806,6 +849,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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 != 0) { oid_dotted = oid2dotted(rr->request_format); @@ -822,6 +868,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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) @@ -1004,6 +1051,7 @@ int bend_present(void *handle, bend_present_rr *rr) 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); @@ -1161,6 +1209,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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); @@ -1215,7 +1264,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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); @@ -1264,6 +1313,7 @@ int bend_explain(void *handle, bend_explain_rr *q) 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); @@ -1308,6 +1358,7 @@ bend_initresult *bend_init(bend_initrequest *q) ENTER; SAVETMPS; + zhandle->ghandle = _global_ghandle; zhandle->nmem = nmem; zhandle->stop_flag = 0; @@ -1345,6 +1396,7 @@ bend_initresult *bend_init(bend_initrequest *q) 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) { @@ -1433,6 +1485,7 @@ void bend_close(void *handle) if (close_ref) { href = newHV(); + hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0); hv_store(href, "HANDLE", 6, zhandle->handle, 0); PUSHMARK(sp); @@ -1469,6 +1522,13 @@ PROTOTYPES: DISABLE void +set_ghandle(arg) + SV *arg + CODE: + _global_ghandle = newSVsv(arg); + + +void set_init_handler(arg) SV *arg CODE: @@ -1588,3 +1648,12 @@ yazlog(arg) 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 +