/* This file is part of simpleserver.
- * Copyright (C) 2000-2013 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:
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()));
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;
}
}
}
+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;
}
#endif
href = newHV();
+
hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
if (rr->srw_sortKeys && *rr->srw_sortKeys)
hv_store(href, "SRW_SORTKEYS", 12, newSVpv(rr->srw_sortKeys, 0), 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);
}
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);
HV *href;
SV **temp;
SV *basename;
- SV *record;
SV *last;
SV *err_code;
SV *err_string;
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);
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);
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
-
- hv_undef(href);
-
ptr = SvPV(basename, length);
rr->basename = odr_strdupn(rr->stream, ptr, length);
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)
{
- rr->record = odr_strdupn(rr->stream, ptr, length);
- 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);
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),
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;
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++)
rr->errcode = SvIV(err_code);
rr->num_entries = SvIV(number);
rr->status = SvIV(status);
- if (yaz_version(NULL, NULL) >= 0x4022c &&
- rr->num_entries <= scan_list_size)
- {
- /* entries has been initialized by yaz and is big enough
- to hold all entries */
- scan_list = rr->entries;
- }
- else
- {
- 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++)
{
buffer++;
hv_undef(scan_item);
}
- rr->entries = scan_list;
zhandle->handle = point;
handle = zhandle;