X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=f172139e4fe66f5e8df4eead173986823d1f603a;hp=7146877db341de753361bb1c434cc3c7d36afe76;hb=d3d5e958649ccb8de97abc4698ec6e0b8b050d6a;hpb=4956f4b56e38c33e1f1dc81819112a9ab6551334 diff --git a/SimpleServer.xs b/SimpleServer.xs index 7146877..f172139 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* - * $Id: SimpleServer.xs,v 1.60 2007-04-17 20:26:58 adam Exp $ + * $Id: SimpleServer.xs,v 1.66 2007-08-10 16:37:05 mike Exp $ * ---------------------------------------------------------------------- * * Copyright (c) 2000-2004, Index Data. @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef WIN32 #else #include @@ -55,8 +56,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; @@ -67,12 +70,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; @@ -84,10 +89,31 @@ SV *delete_ref = NULL; SV *scan_ref = NULL; SV *explain_ref = NULL; PerlInterpreter *root_perl_context; -int MAX_OID = 15; #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; @@ -227,21 +253,18 @@ Z_GenericRecord *read_grs1(char *str, ODR o) 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; @@ -274,7 +297,7 @@ static void oid2str(Odr_oid *o, WRBUF buf) } } -WRBUF oid2dotted(int *oid) +WRBUF oid2dotted(Odr_oid *oid) { WRBUF buf = wrbuf_alloc(); oid2str(oid, buf); @@ -616,6 +639,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); @@ -677,12 +701,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; @@ -713,6 +734,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) { @@ -751,10 +773,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); @@ -791,7 +810,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) char *ODR_record; char *ODR_basename; char *ODR_errstr; - int *ODR_oid_buf; WRBUF oid_dotted; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; @@ -810,6 +828,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); @@ -826,6 +847,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) @@ -927,16 +949,17 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) ptr = SvPV(rep_form, length); - ODR_oid_buf = (int *)odr_malloc(rr->stream, (MAX_OID + 1) * sizeof(int)); - if (oid_dotstring_to_oid(ptr, ODR_oid_buf)) + 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 = ODR_oid_buf; - ptr = SvPV(record, length); /* Treat GRS-1 records separately */ - if (!oid_oidcmp(ODR_oid_buf, yaz_oid_recsyn_grs_1)) + if (!oid_oidcmp(rr->output_format, yaz_oid_recsyn_grs_1)) { rr->record = (char *) read_grs1(ptr, rr->stream); rr->len = -1; @@ -1007,6 +1030,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); @@ -1164,6 +1188,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); @@ -1267,6 +1292,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); @@ -1311,6 +1337,7 @@ bend_initresult *bend_init(bend_initrequest *q) ENTER; SAVETMPS; + zhandle->ghandle = _global_ghandle; zhandle->nmem = nmem; zhandle->stop_flag = 0; @@ -1348,6 +1375,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) { @@ -1436,6 +1464,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); @@ -1472,6 +1501,13 @@ PROTOTYPES: DISABLE void +set_ghandle(arg) + SV *arg + CODE: + _global_ghandle = newSVsv(arg); + + +void set_init_handler(arg) SV *arg CODE: @@ -1591,3 +1627,8 @@ 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 +