X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=b13498c9e749d9e0fa8aab2c347d608afd553719;hp=f172139e4fe66f5e8df4eead173986823d1f603a;hb=73cbad3a91f1f244b357cfac07c15f176d18d624;hpb=d3d5e958649ccb8de97abc4698ec6e0b8b050d6a diff --git a/SimpleServer.xs b/SimpleServer.xs index f172139..b13498c 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* - * $Id: SimpleServer.xs,v 1.66 2007-08-10 16:37:05 mike Exp $ + * $Id: SimpleServer.xs,v 1.73 2007-08-20 10:59:11 mike Exp $ * ---------------------------------------------------------------------- * * Copyright (c) 2000-2004, Index Data. @@ -32,6 +32,7 @@ #include "proto.h" #include "embed.h" #include "XSUB.h" +#include #include #include #include @@ -395,69 +396,97 @@ static SV *translateOID(Odr_oid *x) } +static SV *apt2perl(Z_AttributesPlusTerm *at) +{ + SV *sv; + HV *hv; + AV *av; + + if (at->term->which != Z_Term_general) + fatal("can't handle RPN terms other than general"); + + sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV())); + if (at->attributes) { + int i; + SV *attrs = newObject("Net::Z3950::RPN::Attributes", + (SV*) (av = newAV())); + for (i = 0; i < at->attributes->num_attributes; i++) { + Z_AttributeElement *elem = at->attributes->attributes[i]; + HV *hv2; + SV *tmp = newObject("Net::Z3950::RPN::Attribute", + (SV*) (hv2 = newHV())); + if (elem->attributeSet) + setMember(hv2, "attributeSet", + translateOID(elem->attributeSet)); + setMember(hv2, "attributeType", + newSViv(*elem->attributeType)); + if (elem->which == Z_AttributeValue_numeric) { + setMember(hv2, "attributeValue", + newSViv(*elem->value.numeric)); + } else { + assert(elem->which == Z_AttributeValue_complex); + Z_ComplexAttribute *c = elem->value.complex; + Z_StringOrNumeric *son; + /* We ignore semantic actions and multiple values */ + assert(c->num_list > 0); + son = c->list[0]; + if (son->which == Z_StringOrNumeric_numeric) { + setMember(hv2, "attributeValue", + newSViv(*son->u.numeric)); + } else { /*Z_StringOrNumeric_string*/ + setMember(hv2, "attributeValue", + newSVpv(son->u.string, 0)); + } + } + av_push(av, tmp); + } + setMember(hv, "attributes", attrs); + } + setMember(hv, "term", newSVpv((char*) at->term->u.general->buf, + at->term->u.general->len)); + return sv; +} + + static SV *rpn2perl(Z_RPNStructure *s) { SV *sv; HV *hv; AV *av; + Z_Operand *o; switch (s->which) { - case Z_RPNStructure_simple: { - Z_Operand *o = s->u.simple; - Z_AttributesPlusTerm *at; - if (o->which == Z_Operand_resultSetId) { - SV *sv2; + case Z_RPNStructure_simple: + o = s->u.simple; + switch (o->which) { + case Z_Operand_resultSetId: { /* This code causes a SIGBUS on my machine, and I have no idea why. It seems as clear as day to me */ + SV *sv2; char *rsid = (char*) o->u.resultSetId; - printf("Encoding resultSetId '%s'\n", rsid); + /*printf("Encoding resultSetId '%s'\n", rsid);*/ sv = newObject("Net::Z3950::RPN::RSID", (SV*) (hv = newHV())); - printf("Made sv=0x%lx, hv=0x%lx\n", - (unsigned long) sv ,(unsigned long) hv); + /*printf("Made sv=0x%lx, hv=0x%lx\n", (unsigned long) sv ,(unsigned long) hv);*/ sv2 = newSVpv(rsid, strlen(rsid)); setMember(hv, "id", sv2); - printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2); + /*printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2);*/ return sv; } - if (o->which != Z_Operand_APT) - fatal("can't handle RPN simples other than APT and RSID"); - at = o->u.attributesPlusTerm; - if (at->term->which != Z_Term_general) - fatal("can't handle RPN terms other than general"); - - sv = newObject("Net::Z3950::RPN::Term", (SV*) (hv = newHV())); - if (at->attributes) { - int i; - SV *attrs = newObject("Net::Z3950::RPN::Attributes", - (SV*) (av = newAV())); - for (i = 0; i < at->attributes->num_attributes; i++) { - Z_AttributeElement *elem = at->attributes->attributes[i]; - HV *hv2; - SV *tmp = newObject("Net::Z3950::RPN::Attribute", - (SV*) (hv2 = newHV())); - if (elem->attributeSet) - setMember(hv2, "attributeSet", - translateOID(elem->attributeSet)); - setMember(hv2, "attributeType", - newSViv(*elem->attributeType)); - assert(elem->which == Z_AttributeValue_numeric); - setMember(hv2, "attributeValue", - newSViv(*elem->value.numeric)); - av_push(av, tmp); - } - setMember(hv, "attributes", attrs); + + case Z_Operand_APT: + return apt2perl(o->u.attributesPlusTerm); + + default: + fatal("unknown RPN simple type %d", (int) o->which); } - setMember(hv, "term", newSVpv((char*) at->term->u.general->buf, - at->term->u.general->len)); - return sv; - } + case Z_RPNStructure_complex: { SV *tmp; Z_Complex *c = s->u.complex; char *type = 0; /* vacuous assignment satisfies gcc -Wall */ switch (c->roperator->which) { - case Z_Operator_and: type = "Net::Z3950::RPN::And"; break; - case Z_Operator_or: type = "Net::Z3950::RPN::Or"; break; + 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"); default: fatal("unknown RPN operator %d", (int) c->roperator->which); @@ -471,9 +500,11 @@ static SV *rpn2perl(Z_RPNStructure *s) av_push(av, tmp); return sv; } - default: fatal("unknown RPN node type %d", (int) s->which); - } + default: + fatal("unknown RPN node type %d", (int) s->which); + } + return 0; } @@ -1169,12 +1200,19 @@ int bend_scan(void *handle, bend_scan_rr *rr) SV *entries_ref; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; + SV *rpnSV; dSP; ENTER; SAVETMPS; href = newHV(); list = newAV(); + + /* RPN is better than TERM since it includes attributes */ + if ((rpnSV = apt2perl(rr->term)) != 0) { + setMember(href, "RPN", rpnSV); + } + if (rr->term->term->which == Z_Term_general) { term_len = rr->term->term->u.general->len; @@ -1243,7 +1281,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) scan_list = (struct scan_entry *) odr_malloc (rr->stream, rr->num_entries * sizeof(*scan_list)); buffer = scan_list; entries = (AV *)SvRV(entries_ref); - for (i = 0; i < rr->num_entries; i++) + 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); @@ -1632,3 +1670,7 @@ int yaz_diag_srw_to_bib1(srw_code) int srw_code +int +yaz_diag_bib1_to_srw(bib1_code) + int bib1_code +