X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.c;h=9756c5485aee4219a20208ddcd34825be60d51be;hp=811468956d3d27a95be42b27a188f90aeb26239c;hb=382b672ba466b8a986b8ffe4d9984df610763035;hpb=9a63dcdf4759d7856d96d85e0d2276dcf9949b49 diff --git a/SimpleServer.c b/SimpleServer.c index 8114689..9756c54 100644 --- a/SimpleServer.c +++ b/SimpleServer.c @@ -34,9 +34,22 @@ */ /*$Log: SimpleServer.c,v $ -/*Revision 1.8 2001-03-13 14:19:28 sondberg -/*Added a modified version of ztest.pl called grs_test.pl, which shows how to -/*implement support of GRS-1 record syntax. +/*Revision 1.13 2001-08-30 13:15:11 sondberg +/*Corrected a memory leak, one more to go. +/* +/*Revision 1.10 2001/08/29 11:48:36 sondberg +/*Added routines +/* +/* Net::Z3950::SimpleServer::ScanSuccess +/* Net::Z3950::SimpleServer::ScanPartial +/* +/*and a bit of documentation. +/* +/*Revision 1.9 2001/08/24 14:00:20 sondberg +/*Added support for scan. +/* +/*Revision 1.8 2001/05/21 11:07:02 sondberg +/*Extended maximum numbers of GRS-1 elements. Should be done dynamically. /* /*Revision 1.7 2001/03/13 14:17:15 sondberg /*Added support for GRS-1. @@ -53,7 +66,7 @@ #include #include #include -#define GRS_MAX_FIELDS 50 +#define GRS_MAX_FIELDS 500 #ifdef ASN_COMPILED #include #endif @@ -135,6 +148,11 @@ Z_GenericRecord *read_grs1(char *str, ODR o) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); r->num_elements = 0; } + 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); + 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; @@ -780,8 +798,130 @@ int bend_delete(void *handle, bend_delete_rr *rr) int bend_scan(void *handle, bend_scan_rr *rr) { - perl_call_sv(scan_ref, G_VOID | G_DISCARD | G_NOARGS); - return 0; + HV *href; + AV *aref; + AV *list; + AV *entries; + HV *scan_item; + struct scan_entry *scan_list; + struct scan_entry *buffer; + int *step_size = rr->step_size; + int i; + char **basenames; + SV **temp; + SV *err_code = sv_newmortal(); + SV *err_str = sv_newmortal(); + SV *point = sv_newmortal(); + SV *status = sv_newmortal(); + SV *number = sv_newmortal(); + char *ptr; + char *ODR_errstr; + STRLEN len; + int term_len; + SV *term_tmp; + + Zfront_handle *zhandle = (Zfront_handle *)handle; + + dSP; + ENTER; + SAVETMPS; + href = newHV(); + list = newAV(); + 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); + } else { + rr->errcode = 229; /* Unsupported term type */ + return 0; + } + hv_store(href, "STEP", 4, newSViv(*step_size), 0); + hv_store(href, "NUMBER", 6, newSViv(rr->num_entries), 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, "HANDLE", 6, zhandle->handle, 0); + hv_store(href, "STATUS", 6, newSViv(BEND_SCAN_SUCCESS), 0); + hv_store(href, "ENTRIES", 7, newRV((SV *) list), 0); + aref = newAV(); + basenames = rr->basenames; + for (i = 0; i < rr->num_bases; i++) + { + av_push(aref, newSVpv(*basenames++, 0)); + } + hv_store(href, "DATABASES", 9, newRV( (SV*) aref), 0); + + PUSHMARK(sp); + + XPUSHs(sv_2mortal(newRV( (SV*) href))); + + PUTBACK; + + perl_call_sv(scan_ref, G_SCALAR | G_DISCARD); + + SPAGAIN; + + temp = hv_fetch(href, "ERR_CODE", 8, 1); + err_code = newSVsv(*temp); + + temp = hv_fetch(href, "ERR_STR", 7, 1); + err_str = newSVsv(*temp); + + temp = hv_fetch(href, "HANDLE", 6, 1); + point = newSVsv(*temp); + + temp = hv_fetch(href, "STATUS", 6, 1); + status = newSVsv(*temp); + + temp = hv_fetch(href, "NUMBER", 6, 1); + number = newSVsv(*temp); + + temp = hv_fetch(href, "ENTRIES", 7, 1); + entries = (AV *)SvRV(newSVsv(*temp)); + + PUTBACK; + FREETMPS; + LEAVE; + + ptr = SvPV(err_str, len); + ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); + strcpy(ODR_errstr, ptr); + rr->errstring = ODR_errstr; + rr->errcode = SvIV(err_code); + rr->num_entries = SvIV(number); + rr->status = SvIV(status); + scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list)); + buffer = scan_list; + for (i = 0; i < rr->num_entries; i++) + { + scan_item = (HV *)SvRV_noinc(sv_2mortal(av_shift(entries))); + temp = hv_fetch(scan_item, "TERM", 4, 1); + ptr = SvPV(*temp, len); + buffer->term = (char *) odr_malloc (rr->stream, len + 1); + strcpy(buffer->term, ptr); + temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); + buffer->occurrences = SvIV(*temp); + buffer++; + hv_undef(scan_item); + /*sv_free((SV *)scan_item);*/ + } + rr->entries = scan_list; + zhandle->handle = point; + handle = zhandle; + sv_free(err_code); + sv_free(err_str); + sv_free(status); + sv_free(number); + hv_undef(href); + sv_free((SV *)href); + av_undef(aref); + sv_free((SV *)aref); + av_undef(list); + sv_free((SV *)list); + av_undef(entries); + sv_free((SV *)entries); + + return 0; } @@ -821,7 +961,10 @@ bend_initresult *bend_init(bend_initrequest *q) { q->bend_fetch = bend_fetch; } - /*q->bend_scan = bend_scan;*/ + if (scan_ref) + { + q->bend_scan = bend_scan; + } href = newHV(); hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0); hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0); @@ -912,17 +1055,17 @@ void bend_close(void *handle) } -#line 912 "SimpleServer.c" +#line 1056 "SimpleServer.c" XS(XS_Net__Z3950__SimpleServer_set_init_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_init_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_init_handler(arg)"); { SV * arg = ST(0); -#line 908 "SimpleServer.xs" +#line 1052 "SimpleServer.xs" init_ref = newSVsv(arg); -#line 922 "SimpleServer.c" +#line 1066 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -931,12 +1074,12 @@ XS(XS_Net__Z3950__SimpleServer_set_close_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_close_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_close_handler(arg)"); { SV * arg = ST(0); -#line 915 "SimpleServer.xs" +#line 1059 "SimpleServer.xs" close_ref = newSVsv(arg); -#line 936 "SimpleServer.c" +#line 1080 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -945,12 +1088,12 @@ XS(XS_Net__Z3950__SimpleServer_set_sort_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_sort_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_sort_handler(arg)"); { SV * arg = ST(0); -#line 922 "SimpleServer.xs" +#line 1066 "SimpleServer.xs" sort_ref = newSVsv(arg); -#line 950 "SimpleServer.c" +#line 1094 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -959,12 +1102,12 @@ XS(XS_Net__Z3950__SimpleServer_set_search_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_search_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_search_handler(arg)"); { SV * arg = ST(0); -#line 928 "SimpleServer.xs" +#line 1072 "SimpleServer.xs" search_ref = newSVsv(arg); -#line 964 "SimpleServer.c" +#line 1108 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -973,12 +1116,12 @@ XS(XS_Net__Z3950__SimpleServer_set_fetch_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_fetch_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_fetch_handler(arg)"); { SV * arg = ST(0); -#line 935 "SimpleServer.xs" +#line 1079 "SimpleServer.xs" fetch_ref = newSVsv(arg); -#line 978 "SimpleServer.c" +#line 1122 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -987,12 +1130,12 @@ XS(XS_Net__Z3950__SimpleServer_set_present_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_present_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_present_handler(arg)"); { SV * arg = ST(0); -#line 942 "SimpleServer.xs" +#line 1086 "SimpleServer.xs" present_ref = newSVsv(arg); -#line 992 "SimpleServer.c" +#line 1136 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -1001,12 +1144,12 @@ XS(XS_Net__Z3950__SimpleServer_set_esrequest_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_esrequest_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_esrequest_handler(arg)"); { SV * arg = ST(0); -#line 949 "SimpleServer.xs" +#line 1093 "SimpleServer.xs" esrequest_ref = newSVsv(arg); -#line 1006 "SimpleServer.c" +#line 1150 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -1015,12 +1158,12 @@ XS(XS_Net__Z3950__SimpleServer_set_delete_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_delete_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_delete_handler(arg)"); { SV * arg = ST(0); -#line 956 "SimpleServer.xs" +#line 1100 "SimpleServer.xs" delete_ref = newSVsv(arg); -#line 1020 "SimpleServer.c" +#line 1164 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -1029,12 +1172,12 @@ XS(XS_Net__Z3950__SimpleServer_set_scan_handler) { dXSARGS; if (items != 1) - Perl_croak(aTHX_ "Usage: Net::Z3950::SimpleServer::set_scan_handler(arg)"); + croak("Usage: Net::Z3950::SimpleServer::set_scan_handler(arg)"); { SV * arg = ST(0); -#line 963 "SimpleServer.xs" +#line 1107 "SimpleServer.xs" scan_ref = newSVsv(arg); -#line 1034 "SimpleServer.c" +#line 1178 "SimpleServer.c" } XSRETURN_EMPTY; } @@ -1043,16 +1186,15 @@ XS(XS_Net__Z3950__SimpleServer_start_server) { dXSARGS; { -#line 969 "SimpleServer.xs" +#line 1113 "SimpleServer.xs" char **argv; char **argv_buf; char *ptr; int i; STRLEN len; -#line 1049 "SimpleServer.c" +#line 1193 "SimpleServer.c" int RETVAL; - dXSTARG; -#line 975 "SimpleServer.xs" +#line 1119 "SimpleServer.xs" argv_buf = (char **)xmalloc((items + 1) * sizeof(char *)); argv = argv_buf; for (i = 0; i < items; i++) @@ -1064,8 +1206,41 @@ XS(XS_Net__Z3950__SimpleServer_start_server) *argv_buf = NULL; RETVAL = statserv_main(items, argv, bend_init, bend_close); -#line 1064 "SimpleServer.c" - XSprePUSH; PUSHi((IV)RETVAL); +#line 1207 "SimpleServer.c" + ST(0) = sv_newmortal(); + sv_setiv(ST(0), (IV)RETVAL); + } + XSRETURN(1); +} + +XS(XS_Net__Z3950__SimpleServer_ScanSuccess) +{ + dXSARGS; + if (items != 0) + croak("Usage: Net::Z3950::SimpleServer::ScanSuccess()"); + { + int RETVAL; +#line 1137 "SimpleServer.xs" + RETVAL = BEND_SCAN_SUCCESS; +#line 1223 "SimpleServer.c" + ST(0) = sv_newmortal(); + sv_setiv(ST(0), (IV)RETVAL); + } + XSRETURN(1); +} + +XS(XS_Net__Z3950__SimpleServer_ScanPartial) +{ + dXSARGS; + if (items != 0) + croak("Usage: Net::Z3950::SimpleServer::ScanPartial()"); + { + int RETVAL; +#line 1144 "SimpleServer.xs" + RETVAL = BEND_SCAN_PARTIAL; +#line 1239 "SimpleServer.c" + ST(0) = sv_newmortal(); + sv_setiv(ST(0), (IV)RETVAL); } XSRETURN(1); } @@ -1090,6 +1265,8 @@ XS(boot_Net__Z3950__SimpleServer) newXS("Net::Z3950::SimpleServer::set_delete_handler", XS_Net__Z3950__SimpleServer_set_delete_handler, file); newXS("Net::Z3950::SimpleServer::set_scan_handler", XS_Net__Z3950__SimpleServer_set_scan_handler, file); newXS("Net::Z3950::SimpleServer::start_server", XS_Net__Z3950__SimpleServer_start_server, file); + newXS("Net::Z3950::SimpleServer::ScanSuccess", XS_Net__Z3950__SimpleServer_ScanSuccess, file); + newXS("Net::Z3950::SimpleServer::ScanPartial", XS_Net__Z3950__SimpleServer_ScanPartial, file); XSRETURN_YES; }