- switch (s->which) {
- case Z_RPNStructure_simple: {
- Z_Operand *o = s->u.simple;
-
- switch (o->which) {
- case Z_Operand_APT: {
- Z_AttributesPlusTerm *at = o->u.attributesPlusTerm;
-
- if (at->attributes) {
- int i;
- char ibuf[16];
-
- for (i = 0; i < at->attributes->num_attributes; i++) {
- wrbuf_puts(buf, "@attr ");
- if (at->attributes->attributes[i]->attributeSet) {
- oid2str(at->attributes->attributes[i]->attributeSet, buf);
- wrbuf_putc(buf, ' ');
- }
- sprintf(ibuf, "%d=", *at->attributes->attributes[i]->attributeType);
- assert(at->attributes->attributes[i]->which == Z_AttributeValue_numeric);
- wrbuf_puts(buf, ibuf);
- sprintf(ibuf, "%d ", *at->attributes->attributes[i]->value.numeric);
- wrbuf_puts(buf, ibuf);
- }
- }
- switch (at->term->which) {
- case Z_Term_general: {
- wrbuf_putc(buf, '"');
- wrbuf_write(buf, (char*) at->term->u.general->buf, at->term->u.general->len);
- wrbuf_puts(buf, "\" ");
- break;
- }
- default: abort();
- }
- break;
+ WRBUF buf = wrbuf_alloc();
+
+ if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101)
+ return 0;
+ yaz_rpnquery_to_wrbuf(buf, q->u.type_1);
+ return buf;
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/util.c */
+#include <stdarg.h>
+void fatal(char *fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "FATAL (SimpleServer): ");
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+ abort();
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */
+/*
+ * Creates a new Perl object of type `class'; the newly-created scalar
+ * that is a reference to the blessed thingy `referent' is returned.
+ */
+static SV *newObject(char *class, SV *referent)
+{
+ HV *stash;
+ SV *sv;
+
+ sv = newRV_noinc((SV*) referent);
+ stash = gv_stashpv(class, 0);
+ if (stash == 0)
+ fatal("attempt to create object of undefined class '%s'", class);
+ /*assert(stash != 0);*/
+ sv_bless(sv, stash);
+ return sv;
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */
+static void setMember(HV *hv, char *name, SV *val)
+{
+ /* We don't increment `val's reference count -- I think this is
+ * right because it's created with a refcount of 1, and in fact
+ * the reference via this hash is the only reference to it in
+ * general.
+ */
+ if (!hv_store(hv, name, (U32) strlen(name), val, (U32) 0))
+ fatal("couldn't store member in hash");
+}
+
+
+/* Lifted verbatim from Net::Z3950 yazwrap/receive.c */
+static SV *translateOID(Odr_oid *x)
+{
+ /* Yaz represents an OID by an int array terminated by a negative
+ * value, typically -1; we represent it as a reference to a
+ * blessed scalar string of "."-separated elements.
+ */
+ char buf[1000];
+ int i;
+
+ *buf = '\0';
+ for (i = 0; x[i] >= 0; i++) {
+ sprintf(buf + strlen(buf), "%d", (int) x[i]);
+ if (x[i+1] >- 0)
+ strcat(buf, ".");
+ }
+
+ /*
+ * ### We'd like to return a blessed scalar (string) here, but of
+ * course you can't do that in Perl: only references can be
+ * blessed, so we'd have to return a _reference_ to a string, and
+ * bless _that_. Better to do without the blessing, I think.
+ */
+ if (1) {
+ return newSVpv(buf, 0);
+ } else {
+ return newObject("Net::Z3950::APDU::OID", newSVpv(buf, 0));
+ }
+}
+
+
+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));