X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=6e2ba0ed5b60caad5d06d80c6bcb21c5e0081fc9;hp=a09403f2858fe9671b18c835052c6c3a96840def;hb=b76d965f82b76a458000edb32eb55f97b5333caa;hpb=1778a36a88fa8a4b0ca1aa1c39e079b953f6bc98 diff --git a/SimpleServer.xs b/SimpleServer.xs index a09403f..6e2ba0e 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* - * $Id: SimpleServer.xs,v 1.43 2006-04-21 07:30:15 sondberg Exp $ + * $Id: SimpleServer.xs,v 1.50 2006-07-24 23:05:22 mike Exp $ * ---------------------------------------------------------------------- * * Copyright (c) 2000-2004, Index Data. @@ -64,6 +64,7 @@ typedef struct { 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; @@ -79,6 +80,7 @@ SV *present_ref = NULL; SV *esrequest_ref = NULL; SV *delete_ref = NULL; SV *scan_ref = NULL; +SV *explain_ref = NULL; PerlInterpreter *root_perl_context; int MAX_OID = 15; @@ -445,6 +447,44 @@ static SV *rpn2perl(Z_RPNStructure *s) } +/* 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) { @@ -487,9 +527,8 @@ 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 { @@ -659,6 +698,8 @@ int bend_search(void *handle, bend_search_rr *rr) #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); @@ -802,6 +843,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) SV *sur_flag; SV *point; SV *rep_form; + SV *schema; char *ptr; char *ODR_record; char *ODR_basename; @@ -814,6 +856,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) Z_RecordComposition *composition; Z_ElementSetNames *simple; + Z_CompSpec *complex; STRLEN length; dSP; @@ -823,6 +866,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) 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); @@ -856,13 +901,32 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) rr->errcode = 26; } } + else if (composition->which == Z_RecordComp_complex) + { + if (composition->u.complex->generic && + + composition->u.complex->generic && + composition->u.complex->generic->elementSpec && + composition->u.complex->generic->elementSpec->which == + Z_ElementSpec_elementSetName) + { + complex = composition->u.complex; + hv_store(href, "COMP", 4, + newSVpv(complex->generic->elementSpec->u.elementSetName, 0), 0); + } + 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 { - /* This is where we end up in the case of - * SRU. Since record composition ("element - * sets") are meaningless in SRU anyway, we - * just skip this. - */ + rr->errcode = 26; + return; } } @@ -898,6 +962,9 @@ 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", 8, 1); + schema = newSVsv(*temp); + temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); @@ -909,6 +976,10 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) strcpy(ODR_basename, ptr); rr->basename = ODR_basename; + ptr = SvPV(schema, length); + rr->schema = (char *)odr_malloc(rr->stream, length + 1); + strcpy(rr->schema, ptr); + ptr = SvPV(rep_form, length); ODR_oid_buf = (int *)odr_malloc(rr->stream, (MAX_OID + 1) * sizeof(int)); if (dotted2oid(ptr, ODR_oid_buf) == -1) /* Maximum number of OID elements exceeded */ @@ -954,6 +1025,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) sv_free(err_code), sv_free(sur_flag); sv_free(rep_form); + sv_free(schema); PUTBACK; FREETMPS; @@ -974,6 +1046,7 @@ int bend_present(void *handle, bend_present_rr *rr) STRLEN len; Z_RecordComposition *composition; Z_ElementSetNames *simple; + Z_CompSpec *complex; char *ODR_errstr; char *ptr; Zfront_handle *zhandle = (Zfront_handle *)handle; @@ -1012,10 +1085,29 @@ int bend_present(void *handle, bend_present_rr *rr) return 0; } } + else if (composition->which == Z_RecordComp_complex) + { + if (composition->u.complex->generic && + + composition->u.complex->generic && + composition->u.complex->generic->elementSpec && + composition->u.complex->generic->elementSpec->which == + Z_ElementSpec_elementSetName) + { + complex = composition->u.complex; + hv_store(href, "COMP", 4, + newSVpv(complex->generic->elementSpec->u.elementSetName, 0), 0); + } + else + { + rr->errcode = 26; + return 0; + } + } else { rr->errcode = 26; - return 0; + return; } } @@ -1210,6 +1302,48 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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(); @@ -1254,6 +1388,10 @@ bend_initresult *bend_init(bend_initrequest *q) { q->bend_scan = bend_scan; } + if (explain_ref) + { + q->bend_explain = bend_explain; + } href = newHV(); hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0); @@ -1446,6 +1584,11 @@ set_scan_handler(arg) CODE: scan_ref = newSVsv(arg); +void +set_explain_handler(arg) + SV *arg + CODE: + explain_ref = newSVsv(arg); int start_server(...)