/*
- * $Id: SimpleServer.xs,v 1.44 2006-05-31 16:39:30 quinn Exp $
+ * $Id: SimpleServer.xs,v 1.53 2006-07-26 11:09:14 mike Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
SV *esrequest_ref;
SV *delete_ref;
SV *scan_ref;
+ SV *explain_ref;
NMEM nmem;
int stop_flag; /* is used to stop server prematurely .. */
} Zfront_handle;
SV *esrequest_ref = NULL;
SV *delete_ref = NULL;
SV *scan_ref = NULL;
+SV *explain_ref = NULL;
PerlInterpreter *root_perl_context;
int MAX_OID = 15;
}
+/* Decode the Z_SortAttributes struct and store the whole thing into the
+ * hash by reference
+ */
+int simpleserver_ExpandSortAttributes (HV *sort_spec, Z_SortAttributes *sattr)
+{
+ WRBUF attrset_wr = wrbuf_alloc();
+ AV *list = newAV();
+ Z_AttributeList *attr_list = sattr->list;
+ int i;
+
+ oid2str(sattr->id, attrset_wr);
+ hv_store(sort_spec, "ATTRSET", 7,
+ newSVpv(attrset_wr->buf, attrset_wr->pos), 0);
+ wrbuf_free(attrset_wr, 1);
+
+ hv_store(sort_spec, "SORT_ATTR", 9, newRV( sv_2mortal( (SV*) list ) ), 0);
+
+ for (i = 0; i < attr_list->num_attributes; i++)
+ {
+ 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);
+
+ if (attr->which == Z_AttributeValue_numeric)
+ {
+ hv_store(attr_spec, "ATTR_VALUE", 10,
+ newSViv(*attr->value.numeric), 0);
+ } else {
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+
/* Decode the Z_SortKeySpec struct and store the whole thing in a perl hash */
int simpleserver_SortKeySpecToHash (HV *sort_spec, Z_SortKeySpec *spec)
{
}
else if (key->which == Z_SortKey_sortAttributes)
{
- Z_SortAttributes *attr = key->u.sortAttributes;
-
- return 0;
+ return simpleserver_ExpandSortAttributes(sort_spec,
+ key->u.sortAttributes);
}
else
{
#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, "REPL_SET", 8, newSViv(rr->replace_set), 0);
hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
hv_store(href, "ERR_STR", 7, newSVpv("", 0), 0);
SV *sur_flag;
SV *point;
SV *rep_form;
+ SV *schema;
char *ptr;
char *ODR_record;
char *ODR_basename;
rr->errcode = 0;
href = newHV();
hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0);
+ if (rr->schema)
+ hv_store(href, "SCHEMA", 6, newSVpv(rr->schema, 0), 0);
temp = hv_store(href, "OFFSET", 6, newSViv(rr->number), 0);
if (rr->request_format_raw != 0) {
oid_dotted = oid2dotted(rr->request_format_raw);
}
else
{
+#if 0 /* For now ignore this error, which is ubiquitous in SRU */
+ fprintf(stderr, "complex is weird\n");
rr->errcode = 26;
return 0;
+#endif /*0*/
}
}
else
temp = hv_fetch(href, "REP_FORM", 8, 1);
rep_form = newSVsv(*temp);
+ temp = hv_fetch(href, "SCHEMA", 6, 1);
+ 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);
+ }
+ }
+
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
+ sv_free(schema);
PUTBACK;
FREETMPS;
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);
+ hv_store(href, "TERM", 4, newSVpv((char*) rr->term->term->u.general->buf, term_len), 0);
} else {
rr->errcode = 229; /* Unsupported term type */
return 0;
return 0;
}
+int bend_explain(void *handle, bend_explain_rr *q)
+{
+ HV *href;
+ CV *handler_cv = 0;
+ SV **temp;
+ char *explain;
+ SV *explainsv;
+ STRLEN len;
+ Zfront_handle *zhandle = (Zfront_handle *)handle;
+
+ dSP;
+ ENTER;
+ SAVETMPS;
+
+ href = newHV();
+ hv_store(href, "EXPLAIN", 7, newSVpv("", 0), 0);
+ hv_store(href, "DATABASE", 8, newSVpv(q->database, 0), 0);
+ hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+
+ PUSHMARK(sp);
+ XPUSHs(sv_2mortal(newRV((SV*) href)));
+ PUTBACK;
+
+ handler_cv = simpleserver_sv2cv(explain_ref);
+ perl_call_sv((SV*) handler_cv, G_SCALAR | G_DISCARD);
+
+ SPAGAIN;
+
+ temp = hv_fetch(href, "EXPLAIN", 7, 1);
+ explainsv = newSVsv(*temp);
+
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
+
+ explain = SvPV(explainsv, len);
+ q->explain_buf = (char*) odr_malloc(q->stream, len + 1);
+ strcpy(q->explain_buf, explain);
+
+ return 0;
+}
+
bend_initresult *bend_init(bend_initrequest *q)
{
int dummy = simpleserver_clone();
{
q->bend_scan = bend_scan;
}
+ if (explain_ref)
+ {
+ q->bend_explain = bend_explain;
+ }
href = newHV();
hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
CODE:
scan_ref = newSVsv(arg);
+void
+set_explain_handler(arg)
+ SV *arg
+ CODE:
+ explain_ref = newSVsv(arg);
int
start_server(...)