/*
- * $Id: SimpleServer.xs,v 1.76 2007-08-20 21:27:50 mike Exp $
+ * $Id: SimpleServer.xs,v 1.81 2007-12-20 13:52:06 mike Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
setMember(hv2, "attributeValue",
newSViv(*elem->value.numeric));
} else {
- assert(elem->which == Z_AttributeValue_complex);
- Z_ComplexAttribute *c = elem->value.complex;
+ Z_ComplexAttribute *c;
Z_StringOrNumeric *son;
+ assert(elem->which == Z_AttributeValue_complex);
+ c = elem->value.complex;
/* We ignore semantic actions and multiple values */
assert(c->num_list > 0);
son = c->list[0];
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
+ return 0;
}
}
else if (composition->which == Z_RecordComp_complex)
else
{
#if 0 /* For now ignore this error, which is ubiquitous in SRU */
- fprintf(stderr, "complex is weird\n");
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN");
return 0;
#endif /*0*/
}
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex");
return 0;
}
}
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
return 0;
}
}
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN");
return 0;
}
}
else
{
rr->errcode = 26;
+ rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex");
return 0;
}
}
}
href = newHV();
+
+ /* ### These should be given initial values from the client */
hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
+
hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
hv_store(href, "ERR_STR", 7, newSViv(0), 0);
hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);