X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=abd5850751a9cc0a1fd7069df77d9f84ae152048;hp=004a8a0e66a916a2fc21b999faa57b468397c704;hb=86e7011ae2c02e51dc3b5e0ecf4c8e4d2f416cc3;hpb=aa7443b391681a7f67c05fe1ca86a5b214e92e0c diff --git a/SimpleServer.xs b/SimpleServer.xs index 004a8a0..abd5850 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* This file is part of simpleserver. - * Copyright (C) 2000-2011 Index Data. + * Copyright (C) 2000-2015 Index Data. * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -40,13 +40,14 @@ #include #include #include +#include #ifdef WIN32 #else #include #endif #include #include -#define GRS_MAX_FIELDS 500 +#define GRS_MAX_FIELDS 500 #ifdef ASN_COMPILED #include #endif @@ -59,19 +60,6 @@ YAZ_MUTEX simpleserver_mutex; typedef struct { 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 *search_ref; - SV *fetch_ref; - SV *present_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; @@ -104,22 +92,20 @@ PerlInterpreter *root_perl_context; */ char *string_or_undef(SV **svp, ODR stream) { STRLEN len; - char *ptr, *buf; + char *ptr; if (!SvOK(*svp)) return 0; ptr = SvPV(*svp, len); - buf = (char*) odr_malloc(stream, len+1); - strcpy(buf, ptr); - return buf; + return odr_strdupn(stream, ptr, len); } CV * simpleserver_sv2cv(SV *handler) { STRLEN len; char *buf; - + if (SvPOK(handler)) { CV *ret; buf = SvPV( handler, len); @@ -127,7 +113,7 @@ CV * simpleserver_sv2cv(SV *handler) { fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf ); exit(1); } - + return ret; } else { return (CV *) handler; @@ -138,7 +124,7 @@ CV * simpleserver_sv2cv(SV *handler) { #ifdef USE_ITHREADS void tst_clones(void) { - int i; + int i; PerlInterpreter *parent = PERL_GET_CONTEXT; for (i = 0; i<5000; i++) { @@ -187,7 +173,7 @@ void simpleserver_free(void) { PerlInterpreter *current_interp = PERL_GET_CONTEXT; /* If current Perl Interp is different from root interp, then - * we're in threaded mode and we must destroy.. + * we're in threaded mode and we must destroy.. */ if (current_interp != root_perl_context) { PL_perl_destruct_level = 2; @@ -209,15 +195,16 @@ Z_GenericRecord *read_grs1(char *str, ODR o) original = str; r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r)); - r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); + r->elements = (Z_TaggedElement **) + odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); r->num_elements = 0; - + for (;;) { Z_TaggedElement *t; Z_ElementData *c; int len; - + ptr = strchr(str, '\n'); if (!ptr) { return r; @@ -254,7 +241,8 @@ Z_GenericRecord *read_grs1(char *str, ODR o) 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)); + r->elements[r->num_elements] = t = (Z_TaggedElement *) + odr_malloc(o, sizeof(Z_TaggedElement)); t->tagType = odr_intdup(o, type); t->tagValue = (Z_StringOrNumeric *) odr_malloc(o, sizeof(Z_StringOrNumeric)); @@ -271,7 +259,8 @@ Z_GenericRecord *read_grs1(char *str, ODR o) t->tagOccurrence = 0; t->metaData = 0; t->appliedVariant = 0; - t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData)); + t->content = c = (Z_ElementData *) + odr_malloc(o, sizeof(Z_ElementData)); if (*buf == '{') { c->which = Z_ElementData_subtree; @@ -305,13 +294,13 @@ WRBUF oid2dotted(Odr_oid *oid) oid2str(oid, buf); return buf; } - + WRBUF zquery2pquery(Z_Query *q) { WRBUF buf = wrbuf_alloc(); - if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) + if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) return 0; yaz_rpnquery_to_wrbuf(buf, q->u.type_1); return buf; @@ -480,7 +469,7 @@ static SV *rpn2perl(Z_RPNStructure *s) case Z_Operand_APT: return f_Term_to_SV(o->u.attributesPlusTerm->term, - o->u.attributesPlusTerm->attributes); + o->u.attributesPlusTerm->attributes); default: fatal("unknown RPN simple type %d", (int) o->which); } @@ -493,7 +482,7 @@ static SV *rpn2perl(Z_RPNStructure *s) 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"); + case Z_Operator_prox: type = "Net::Z3950::RPN::Prox"; break; default: fatal("unknown RPN operator %d", (int) c->roperator->which); } sv = newObject(type, (SV*) (av = newAV())); @@ -503,13 +492,28 @@ static SV *rpn2perl(Z_RPNStructure *s) if ((tmp = rpn2perl(c->s2)) == 0) return 0; av_push(av, tmp); + if (c->roperator->which == Z_Operator_prox) { + Z_ProximityOperator prox = *c->roperator->u.prox; + HV *hv; + tmp = newObject("Net::Z3950::RPN::Prox::Attributes", (SV*) (hv = newHV())); + setMember(hv, "exclusion", newSViv(*prox.exclusion)); + setMember(hv, "distance", newSViv(*prox.distance)); + setMember(hv, "ordered", newSViv(*prox.ordered)); + setMember(hv, "relationType", newSViv(*prox.relationType)); + if (prox.which == Z_ProximityOperator_known) { + setMember(hv, "known", newSViv(*prox.u.known)); + } else { + setMember(hv, "zprivate", newSViv(*prox.u.zprivate)); + } + av_push(av, tmp); + } return sv; } default: fatal("unknown RPN node type %d", (int) s->which); } - + return 0; } @@ -531,11 +535,11 @@ int simpleserver_ExpandSortAttributes (HV *sort_spec, Z_SortAttributes *sattr) hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0); - for (i = 0; i < attr_list->num_attributes; i++) + for (i = 0; i < attr_list->num_attributes; i++) { - Z_AttributeElement *attr = *attr_list->attributes++; + 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); @@ -573,7 +577,7 @@ int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec) else if (key->which == Z_SortKey_elementSpec) { Z_Specification *zspec = key->u.elementSpec; - + hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16, newSViv(zspec->which), 0); @@ -616,7 +620,7 @@ static SV *zquery2perl(Z_Query *q) SV *sv; HV *hv; - if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) + if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) return 0; sv = newObject("Net::Z3950::APDU::Query", (SV*) (hv = newHV())); if (q->u.type_1->attributeSetId) @@ -639,16 +643,15 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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; ENTER; SAVETMPS; - + aref = newAV(); input_setnames = rr->input_setnames; for (i = 0; i < rr->num_input_setnames; i++) @@ -670,7 +673,7 @@ int bend_sort(void *handle, bend_sort_rr *rr) return 0; } } - + href = newHV(); hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0); hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0); @@ -706,24 +709,22 @@ int bend_sort(void *handle, bend_sort_rr *rr) 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; + rr->errstring = odr_strdupn(rr->stream, ptr, len); zhandle->handle = point; sv_free(err_code); sv_free(err_str); sv_free(status); - + PUTBACK; FREETMPS; LEAVE; @@ -741,7 +742,7 @@ static SV *f_FacetField_to_SV(Z_FacetField *facet_field) if (facet_field->attributes) { setMember(hv, "attributes", attributes2perl(facet_field->attributes)); - } + } terms = newObject("Net::Z3950::FacetTerms", (SV *) (av = newAV())); for (i = 0; i < facet_field->num_terms; i++) { @@ -758,10 +759,10 @@ static SV *f_FacetField_to_SV(Z_FacetField *facet_field) strlen(z_term->u.characterString)); } tmp = newObject("Net::Z3950::FacetTerm", (SV *) (hv = newHV())); - + setMember(hv, "count", sv_count); setMember(hv, "term", sv_term); - + av_push(av, tmp); } setMember(hv, "terms", terms); @@ -775,7 +776,7 @@ static SV *f_FacetList_to_SV(Z_FacetList *facet_list) AV *av; int i; sv = newObject("Net::Z3950::FacetList", (SV *) (av = newAV())); - + for (i = 0; i < facet_list->num; i++) { SV *sv = f_FacetField_to_SV(facet_list->elements[i]); av_push(av, sv); @@ -830,9 +831,7 @@ static void f_SV_to_FacetField(HV *facet_field_hv, Z_FacetField **fl, ODR odr) c->list[0] = (Z_StringOrNumeric *) odr_malloc(odr, sizeof(**c->list)); c->list[0]->which = Z_StringOrNumeric_string; - c->list[0]->u.string = odr_malloc(odr, s_len + 1); - memcpy(c->list[0]->u.string, s_buf, s_len); - c->list[0]->u.string[s_len] = '\0'; + c->list[0]->u.string = odr_strdupn(odr, s_buf, s_len); c->num_semanticAction = 0; c->semanticAction = 0; } @@ -852,7 +851,7 @@ static void f_SV_to_FacetField(HV *facet_field_hv, Z_FacetField **fl, ODR odr) STRLEN s_len; char *s_buf; HV *hv_elem = (HV*) SvRV(sv_2mortal(av_shift(sv_terms))); - + Z_FacetTerm *facet_term = (Z_FacetTerm *) odr_malloc(odr, sizeof(*facet_term)); (*fl)->terms[i] = facet_term; @@ -872,7 +871,7 @@ static void f_SV_to_FacetList(SV *sv, Z_OtherInformation **oip, ODR odr) { AV *entries = (AV *) SvRV(sv); int num_facets; - if (entries && SvTYPE(entries) == SVt_PVAV && + if (entries && SvTYPE(entries) == SVt_PVAV && (num_facets = av_len(entries) + 1) > 0) { Z_OtherInformation *oi; @@ -901,6 +900,18 @@ static void f_SV_to_FacetList(SV *sv, Z_OtherInformation **oip, ODR odr) } } +static HV *parse_extra_args(Z_SRW_extra_arg *args) +{ + HV *href = newHV(); + + for (; args; args = args->next) + { + hv_store(href, args->name, strlen(args->name), + newSVpv(args->value, 0), 0); + } + return href; +} + int bend_search(void *handle, bend_search_rr *rr) { HV *href; @@ -914,6 +925,8 @@ int bend_search(void *handle, bend_search_rr *rr) CV* handler_cv = 0; SV *rpnSV; SV *facetSV; + char *ptr; + STRLEN len; dSP; ENTER; @@ -931,9 +944,10 @@ int bend_search(void *handle, bend_search_rr *rr) zhandle->stop_flag = 1; } #endif - href = newHV(); + href = newHV(); + hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0); - if (rr->srw_sortKeys && *rr->srw_sortKeys) + 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); @@ -943,6 +957,9 @@ int bend_search(void *handle, bend_search_rr *rr) 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, "PRESENT_NUMBER", 14, newSViv(rr->present_number), 0); + hv_store(href, "EXTRA_ARGS", 10, + newRV( (SV*) parse_extra_args(rr->extra_args)), 0); if ((rpnSV = zquery2perl(rr->query)) != 0) { hv_store(href, "RPN", 3, rpnSV, 0); } @@ -962,14 +979,14 @@ int bend_search(void *handle, bend_search_rr *rr) newSVpv(rr->query->u.type_104->u.cql, 0), 0); } else - { + { rr->errcode = 108; return 0; } PUSHMARK(sp); - + XPUSHs(sv_2mortal(newRV( (SV*) href))); - + PUTBACK; handler_cv = simpleserver_sv2cv( search_ref ); @@ -992,7 +1009,19 @@ int bend_search(void *handle, bend_search_rr *rr) temp = hv_fetch(href, "OUTPUTFACETS", 12, 1); if (SvTYPE(*temp) != SVt_NULL) f_SV_to_FacetList(*temp, &rr->search_info, rr->stream); - + + temp = hv_fetch(href, "EXTRA_RESPONSE_DATA", 19, 0); + if (temp) + { + ptr = SvPV(*temp, len); + rr->extra_response_data = odr_strdupn(rr->stream, ptr, len); + } + + temp = hv_fetch(href, "ESTIMATED" "_HIT_" "COUNT", 19, 0); + if (temp) + { + rr->estimated_hit_count = SvIV(*temp); + } hv_undef(href); av_undef(aref); @@ -1070,7 +1099,7 @@ int bend_delete(void *handle, bend_delete_rr *rr) zhandle->handle = point; - sv_free( (SV*) href); + sv_free( (SV*) href); PUTBACK; FREETMPS; @@ -1085,7 +1114,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) HV *href; SV **temp; SV *basename; - SV *record; SV *last; SV *err_code; SV *err_string; @@ -1094,9 +1122,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) SV *rep_form; SV *schema = 0; char *ptr; - char *ODR_record; - char *ODR_basename; - char *ODR_errstr; WRBUF oid_dotted; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; @@ -1129,7 +1154,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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, "RECORD", 6, newSVpv("", 0), 0); hv_store(href, "LAST", 4, newSViv(0), 0); hv_store(href, "ERR_CODE", 8, newSViv(0), 0); hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0); @@ -1146,7 +1170,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) if (simple->which == Z_ElementSetNames_generic) { hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0); - } + } else { rr->errcode = 26; @@ -1189,7 +1213,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) XPUSHs(sv_2mortal(newRV( (SV*) href))); PUTBACK; - + handler_cv = simpleserver_sv2cv( fetch_ref ); perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); @@ -1198,8 +1222,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) temp = hv_fetch(href, "BASENAME", 8, 1); basename = newSVsv(*temp); - temp = hv_fetch(href, "RECORD", 6, 1); - record = newSVsv(*temp); temp = hv_fetch(href, "LAST", 4, 1); last = newSVsv(*temp); @@ -1216,26 +1238,20 @@ 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) { + temp = hv_fetch(href, "SCHEMA", 6, 0); + 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); - } + if (length > 0) + rr->schema = odr_strdupn(rr->stream, ptr, length); } temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); - - hv_undef(href); - ptr = SvPV(basename, length); - ODR_basename = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_basename, ptr); - rr->basename = ODR_basename; + rr->basename = odr_strdupn(rr->stream, ptr, length); ptr = SvPV(rep_form, length); @@ -1247,38 +1263,41 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) rr->output_format = odr_oiddup(rr->stream, yaz_oid_recsyn_sutrs); } - ptr = SvPV(record, length); - /* 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; - } - else + temp = hv_fetch(href, "RECORD", 6, 0); + if (temp) { - ODR_record = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_record, ptr); - rr->record = ODR_record; - rr->len = length; + SV *record = newSVsv(*temp); + ptr = SvPV(record, length); + /* 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; + } + else + { + rr->record = odr_strdupn(rr->stream, ptr, length); + rr->len = length; + } + sv_free(record); } + hv_undef(href); + zhandle->handle = point; handle = zhandle; rr->last_in_set = SvIV(last); - + if (!(rr->errcode)) { rr->errcode = SvIV(err_code); ptr = SvPV(err_string, length); - ODR_errstr = (char *)odr_malloc(rr->stream, length + 1); - strcpy(ODR_errstr, ptr); - rr->errstring = ODR_errstr; + rr->errstring = odr_strdupn(rr->stream, ptr, length); } rr->surrogate_flag = SvIV(sur_flag); wrbuf_destroy(oid_dotted); sv_free((SV*) href); sv_free(basename); - sv_free(record); sv_free(last); sv_free(err_string); sv_free(err_code), @@ -1291,7 +1310,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) PUTBACK; FREETMPS; LEAVE; - + return 0; } @@ -1307,7 +1326,6 @@ int bend_present(void *handle, bend_present_rr *rr) Z_RecordComposition *composition; Z_ElementSetNames *simple; Z_CompSpec *complex; - char *ODR_errstr; char *ptr; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; @@ -1338,7 +1356,7 @@ int bend_present(void *handle, bend_present_rr *rr) if (simple->which == Z_ElementSetNames_generic) { hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0); - } + } else { rr->errcode = 26; @@ -1375,14 +1393,14 @@ int bend_present(void *handle, bend_present_rr *rr) } PUSHMARK(sp); - + XPUSHs(sv_2mortal(newRV( (SV*) href))); - + PUTBACK; - + handler_cv = simpleserver_sv2cv( present_ref ); perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); - + SPAGAIN; temp = hv_fetch(href, "ERR_CODE", 8, 1); @@ -1397,14 +1415,12 @@ int bend_present(void *handle, bend_present_rr *rr) PUTBACK; FREETMPS; LEAVE; - + hv_undef(href); rr->errcode = SvIV(err_code); ptr = SvPV(err_string, len); - ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); - strcpy(ODR_errstr, ptr); - rr->errstring = ODR_errstr; + rr->errstring = odr_strdupn(rr->stream, ptr, len); /* wrbuf_free(oid_dotted, 1);*/ zhandle->handle = point; handle = zhandle; @@ -1430,9 +1446,9 @@ int bend_scan(void *handle, bend_scan_rr *rr) AV *list; AV *entries; HV *scan_item; - struct scan_entry *scan_list; struct scan_entry *buffer; int *step_size = rr->step_size; + int scan_list_size = rr->num_entries; int i; char **basenames; SV **temp; @@ -1442,9 +1458,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) SV *status = sv_newmortal(); SV *number = sv_newmortal(); char *ptr; - char *ODR_errstr; STRLEN len; - int term_len; SV *entries_ref; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; @@ -1463,8 +1477,9 @@ 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((char*) rr->term->term->u.general->buf, term_len), 0); + Odr_oct *oterm = rr->term->term->u.general; + hv_store(href, "TERM", 4, newSVpv((char*) oterm->buf, + oterm->len), 0); } else { rr->errcode = 229; /* Unsupported term type */ return 0; @@ -1478,6 +1493,8 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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); + hv_store(href, "EXTRA_ARGS", 10, + newRV( (SV*) parse_extra_args(rr->extra_args)), 0); aref = newAV(); basenames = rr->basenames; for (i = 0; i < rr->num_bases; i++) @@ -1508,40 +1525,49 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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_ref = newSVsv(*temp); + temp = hv_fetch(href, "EXTRA_RESPONSE_DATA", 19, 0); + if (temp) + { + ptr = SvPV(*temp, len); + rr->extra_response_data = odr_strdupn(rr->stream, ptr, len); + } + 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->errstring = odr_strdupn(rr->stream, ptr, len); 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; + buffer = rr->entries; entries = (AV *)SvRV(entries_ref); 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); 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->term = odr_strdupn(rr->stream, ptr, len); + temp = hv_fetch(scan_item, "OCCURRENCE", 10, 1); buffer->occurrences = SvIV(*temp); + temp = hv_fetch(scan_item, "DISPLAY_TERM", 12, 0); + if (temp) + { + ptr = SvPV(*temp, len); + buffer->display_term = odr_strdupn(rr->stream, ptr,len); + } buffer++; hv_undef(scan_item); } - rr->entries = scan_list; + zhandle->handle = point; handle = zhandle; sv_free(err_code); @@ -1598,8 +1624,7 @@ int bend_explain(void *handle, bend_explain_rr *q) LEAVE; explain = SvPV(explainsv, len); - q->explain_buf = (char*) odr_malloc(q->stream, len + 1); - strcpy(q->explain_buf, explain); + q->explain_buf = odr_strdupn(q->stream, explain, len); return 0; } @@ -1629,8 +1654,8 @@ bend_initresult *bend_init(bend_initrequest *q) dSP; STRLEN len; NMEM nmem = nmem_create(); - Zfront_handle *zhandle = (Zfront_handle *) nmem_malloc (nmem, - sizeof(*zhandle)); + Zfront_handle *zhandle = (Zfront_handle *) + nmem_malloc(nmem, sizeof(*zhandle)); SV *handle; HV *href; SV **temp; @@ -1644,7 +1669,7 @@ bend_initresult *bend_init(bend_initrequest *q) if (sort_ref) { - q->bend_sort = bend_sort; + q->bend_sort = bend_sort; } if (search_ref) { @@ -1655,7 +1680,8 @@ bend_initresult *bend_init(bend_initrequest *q) q->bend_present = bend_present; } /*q->bend_esrequest = bend_esrequest;*/ - if (delete_ref) { + if (delete_ref) + { q->bend_delete = bend_delete; } if (fetch_ref) @@ -1671,7 +1697,7 @@ bend_initresult *bend_init(bend_initrequest *q) q->bend_explain = bend_explain; } - href = newHV(); + href = newHV(); /* ### These should be given initial values from the client */ hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0); @@ -1707,7 +1733,7 @@ bend_initresult *bend_init(bend_initrequest *q) hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0); } - PUSHMARK(sp); + PUSHMARK(sp); XPUSHs(sv_2mortal(newRV((SV*) href))); @@ -1738,8 +1764,7 @@ bend_initresult *bend_init(bend_initrequest *q) temp = hv_fetch(href, "ERR_STR", 7, 1); ptr = SvPV(*temp, len); - r->errstring = (char *)odr_malloc(q->stream, len + 1); - strcpy(r->errstring, ptr); + r->errstring = odr_strdupn(q->stream, ptr, len); temp = hv_fetch(href, "HANDLE", 6, 1); handle= newSVsv(*temp); @@ -1753,8 +1778,8 @@ bend_initresult *bend_init(bend_initrequest *q) PUTBACK; FREETMPS; LEAVE; - - return r; + + return r; } void bend_close(void *handle) @@ -1778,10 +1803,10 @@ void bend_close(void *handle) XPUSHs(sv_2mortal(newRV((SV *)href))); PUTBACK; - + handler_cv = simpleserver_sv2cv( close_ref ); perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); - + SPAGAIN; sv_free((SV*) href); @@ -1846,14 +1871,14 @@ set_ghandle(arg) SV *arg CODE: _global_ghandle = newSVsv(arg); - + void set_init_handler(arg) SV *arg CODE: init_ref = newSVsv(arg); - + void set_close_handler(arg) @@ -1937,7 +1962,7 @@ start_server(...) { ptr = SvPV(ST(i), len); *argv_buf = (char *)xmalloc(len + 1); - strcpy(*argv_buf++, ptr); + strcpy(*argv_buf++, ptr); } *argv_buf = NULL; @@ -1971,7 +1996,7 @@ ScanPartial() OUTPUT: RETVAL - + void yazlog(arg) SV *arg