X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=aa80eaabb368260e689519b5412455f1a41ecb9b;hp=6af248f5b3945ea3de05e01e44a21ec13683831b;hb=cf966225c35eccdd7fa20dbe842dd9594fccc375;hpb=8b44ee5f70e299a90738ebda0a87e879d6130aca diff --git a/SimpleServer.xs b/SimpleServer.xs index 6af248f..aa80eaa 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,5 @@ /* - * $Id: SimpleServer.xs,v 1.65 2007-08-10 00:00:14 mike Exp $ + * $Id: SimpleServer.xs,v 1.71 2007-08-17 16:24:40 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 @@ -400,31 +401,58 @@ static SV *rpn2perl(Z_RPNStructure *s) SV *sv; HV *hv; AV *av; + SV *sv2; + char *rsid; + Z_Operand *o = s->u.simple; + Z_AttributesPlusTerm *at; switch (s->which) { - case Z_RPNStructure_simple: { - Z_Operand *o = s->u.simple; - Z_AttributesPlusTerm *at; - if (o->which == Z_Operand_resultSetId) { - SV *sv2; - /* This code causes a SIGBUS on my machine, and I have no - idea why. It seems as clear as day to me */ - char *rsid = (char*) o->u.resultSetId; - 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); - sv2 = newSVpv(rsid, strlen(rsid)); - setMember(hv, "id", sv2); - printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2); - return sv; + default: + fatal("unknown RPN node type %d", (int) s->which); + + 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_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); } - if (o->which != Z_Operand_APT) - fatal("can't handle RPN simples other than APT and RSID"); + sv = newObject(type, (SV*) (av = newAV())); + if ((tmp = rpn2perl(c->s1)) == 0) + return 0; + av_push(av, tmp); + if ((tmp = rpn2perl(c->s2)) == 0) + return 0; + av_push(av, tmp); + return sv; + } + + case Z_RPNStructure_simple: switch (o->which) { + default: + fatal("unknown RPN simple type %d", (int) 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 */ + rsid = (char*) o->u.resultSetId; + 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); + sv2 = newSVpv(rsid, strlen(rsid)); + setMember(hv, "id", sv2); + printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2); + return sv; + + case Z_Operand_APT: 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; @@ -440,9 +468,24 @@ static SV *rpn2perl(Z_RPNStructure *s) translateOID(elem->attributeSet)); setMember(hv2, "attributeType", newSViv(*elem->attributeType)); - assert(elem->which == Z_AttributeValue_numeric); - setMember(hv2, "attributeValue", - newSViv(*elem->value.numeric)); + if (elem->which == Z_AttributeValue_numeric) { + setMember(hv2, "attributeValue", + newSViv(*elem->value.numeric)); + } else { + assert(elem->which == Z_AttributeValue_complex); + Z_ComplexAttribute *complex = elem->value.complex; + Z_StringOrNumeric *son; + /* We ignore semantic actions and multiple values */ + assert(complex->num_list > 0); + son = complex->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); @@ -450,30 +493,8 @@ static SV *rpn2perl(Z_RPNStructure *s) 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_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); - } - sv = newObject(type, (SV*) (av = newAV())); - if ((tmp = rpn2perl(c->s1)) == 0) - return 0; - av_push(av, tmp); - if ((tmp = rpn2perl(c->s2)) == 0) - return 0; - av_push(av, tmp); - return sv; - } - default: fatal("unknown RPN node type %d", (int) s->which); - } - + } } + return 0; } @@ -1243,7 +1264,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); @@ -1627,3 +1648,12 @@ yazlog(arg) char *ptr; ptr = SvPV(arg, len); yaz_log(YLOG_LOG, "%.*s", len, ptr); + +int +yaz_diag_srw_to_bib1(srw_code) + int srw_code + +int +yaz_diag_bib1_to_srw(bib1_code) + int bib1_code +