* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
typedef struct {
SV *ghandle; /* Global handle specified at creation */
SV *handle; /* Per-connection handle set at Init */
typedef struct {
SV *ghandle; /* Global handle specified at creation */
SV *handle; /* Per-connection handle set at Init */
PerlInterpreter *current_interp = PERL_GET_CONTEXT;
/* If current Perl Interp is different from root interp, then
PerlInterpreter *current_interp = PERL_GET_CONTEXT;
/* If current Perl Interp is different from root interp, then
t->tagType = odr_intdup(o, type);
t->tagValue = (Z_StringOrNumeric *)
odr_malloc(o, sizeof(Z_StringOrNumeric));
t->tagType = odr_intdup(o, type);
t->tagValue = (Z_StringOrNumeric *)
odr_malloc(o, sizeof(Z_StringOrNumeric));
hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0);
hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0);
av_push(list, newRV( sv_2mortal( (SV*) attr_spec ) ));
hv_store(attr_spec, "ATTR_TYPE", 9, newSViv(*attr->attributeType), 0);
av_push(list, newRV( sv_2mortal( (SV*) attr_spec ) ));
hv_store(attr_spec, "ATTR_TYPE", 9, newSViv(*attr->attributeType), 0);
hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16,
newSViv(zspec->which), 0);
hv_store(sort_spec, "ELEMENTSPEC_TYPE", 16,
newSViv(zspec->which), 0);
return 0;
sv = newObject("Net::Z3950::APDU::Query", (SV*) (hv = newHV()));
if (q->u.type_1->attributeSetId)
return 0;
sv = newObject("Net::Z3950::APDU::Query", (SV*) (hv = newHV()));
if (q->u.type_1->attributeSetId)
href = newHV();
hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0);
hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0);
href = newHV();
hv_store(href, "INPUT", 5, newRV( (SV*) aref), 0);
hv_store(href, "OUTPUT", 6, newSVpv(rr->output_setname, 0), 0);
sv_free( (SV*) aref);
sv_free( (SV*) href);
sv_free( (SV*) sort_seq);
rr->errcode = SvIV(err_code);
rr->sort_status = SvIV(status);
sv_free( (SV*) aref);
sv_free( (SV*) href);
sv_free( (SV*) sort_seq);
rr->errcode = SvIV(err_code);
rr->sort_status = SvIV(status);
- 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);
if (facet_field->attributes) {
setMember(hv, "attributes",
attributes2perl(facet_field->attributes));
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++) {
terms = newObject("Net::Z3950::FacetTerms", (SV *) (av = newAV()));
for (i = 0; i < facet_field->num_terms; i++) {
strlen(z_term->u.characterString));
}
tmp = newObject("Net::Z3950::FacetTerm", (SV *) (hv = newHV()));
strlen(z_term->u.characterString));
}
tmp = newObject("Net::Z3950::FacetTerm", (SV *) (hv = newHV()));
setMember(hv, "count", sv_count);
setMember(hv, "term", sv_term);
setMember(hv, "count", sv_count);
setMember(hv, "term", sv_term);
c->list[0] = (Z_StringOrNumeric *) odr_malloc(odr,
sizeof(**c->list));
c->list[0]->which = Z_StringOrNumeric_string;
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);
Z_FacetTerm *facet_term =
(Z_FacetTerm *) odr_malloc(odr, sizeof(*facet_term));
(*fl)->terms[i] = facet_term;
Z_FacetTerm *facet_term =
(Z_FacetTerm *) odr_malloc(odr, sizeof(*facet_term));
(*fl)->terms[i] = facet_term;
+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;
+}
+
hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
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, "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, "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, "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);
}
if ((rpnSV = zquery2perl(rr->query)) != 0) {
hv_store(href, "RPN", 3, rpnSV, 0);
}
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, "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_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, "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, "LAST", 4, newSViv(0), 0);
hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
hv_store(href, "ERR_STR", 7, 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);
if (simple->which == Z_ElementSetNames_generic)
{
hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
if (simple->which == Z_ElementSetNames_generic)
{
hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
handler_cv = simpleserver_sv2cv( fetch_ref );
perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
handler_cv = simpleserver_sv2cv( fetch_ref );
perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
temp = hv_fetch(href, "BASENAME", 8, 1);
basename = newSVsv(*temp);
temp = hv_fetch(href, "BASENAME", 8, 1);
basename = newSVsv(*temp);
temp = hv_fetch(href, "LAST", 4, 1);
last = newSVsv(*temp);
temp = hv_fetch(href, "LAST", 4, 1);
last = newSVsv(*temp);
temp = hv_fetch(href, "REP_FORM", 8, 1);
rep_form = newSVsv(*temp);
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)
+ {
- 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);
}
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
- 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(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);
if (!(rr->errcode))
{
rr->errcode = SvIV(err_code);
ptr = SvPV(err_string, length);
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);
if (simple->which == Z_ElementSetNames_generic)
{
hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
if (simple->which == Z_ElementSetNames_generic)
{
hv_store(href, "COMP", 4, newSVpv(simple->u.generic, 0), 0);
handler_cv = simpleserver_sv2cv( present_ref );
perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
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);
SPAGAIN;
temp = hv_fetch(href, "ERR_CODE", 8, 1);
hv_undef(href);
rr->errcode = SvIV(err_code);
ptr = SvPV(err_string, len);
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);
- 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);
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, "HANDLE", 6, zhandle->handle, 0);
hv_store(href, "STATUS", 6, newSViv(BEND_SCAN_SUCCESS), 0);
hv_store(href, "ENTRIES", 7, newRV((SV *) list), 0);
temp = hv_fetch(href, "STATUS", 6, 1);
status = 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_ref = 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);
+ }
+
- 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);
rr->errcode = SvIV(err_code);
rr->num_entries = SvIV(number);
rr->status = SvIV(status);
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);
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);
+ temp = hv_fetch(scan_item, "DISPLAY_TERM", 12, 0);
+ if (temp)
+ {
+ ptr = SvPV(*temp, len);
+ buffer->display_term = odr_strdupn(rr->stream, ptr,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);
/* ### These should be given initial values from the client */
hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
/* ### These should be given initial values from the client */
hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
}
hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
}
temp = hv_fetch(href, "ERR_STR", 7, 1);
ptr = SvPV(*temp, len);
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);
temp = hv_fetch(href, "HANDLE", 6, 1);
handle= newSVsv(*temp);
handler_cv = simpleserver_sv2cv( close_ref );
perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
handler_cv = simpleserver_sv2cv( close_ref );
perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);