/*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2001, Index Data.
* See the file LICENSE for details.
*
* NT Service interface by
* Chas Woodfield, Fretwell Downing Datasystems.
*
* $Log: ztest.c,v $
- * Revision 1.33 2000-08-10 08:41:26 adam
+ * Revision 1.37 2001-02-20 11:25:32 adam
+ * Added ill_get_APDU and ill_get_Cancel.
+ *
+ * Revision 1.36 2001/01/30 21:34:18 adam
+ * Added step-size for Scan backend interface.
+ *
+ * Revision 1.35 2000/11/23 10:58:33 adam
+ * SSL comstack support. Separate POSIX thread support library.
+ *
+ * Revision 1.34 2000/09/04 08:58:15 adam
+ * Added prefix yaz_ for most logging utility functions.
+ *
+ * Revision 1.33 2000/08/10 08:41:26 adam
* Fixes for ILL.
*
* Revision 1.32 2000/04/05 07:39:55 adam
{
Z_External *r = (Z_External*) n->itemRequest;
ILL_ItemRequest *item_req = 0;
- ILL_Request *ill_req = 0;
+ ILL_APDU *ill_apdu = 0;
if (r->direct_reference)
{
oident *ent = oid_getentbyoid(r->direct_reference);
odr_offset(rr->decode));
#if 0
yaz_log(LOG_LOG, "PDU dump:");
- odr_dumpBER(log_file(),
+ odr_dumpBER(yaz_log_file(),
r->u.single_ASN1_type->buf,
r->u.single_ASN1_type->len);
#endif
}
if (!item_req && r->which == ODR_EXTERNAL_single)
{
- yaz_log (LOG_LOG, "Decode ILLRequest begin");
+ yaz_log (LOG_LOG, "Decode ILL APDU begin");
odr_setbuf(rr->decode,
r->u.single_ASN1_type->buf,
r->u.single_ASN1_type->len, 0);
- if (!ill_Request (rr->decode, &ill_req, 0, 0))
+ if (!ill_APDU (rr->decode, &ill_apdu, 0, 0))
{
yaz_log (LOG_LOG,
- "Couldn't decode ILLRequest %s near %d",
+ "Couldn't decode ILL APDU %s near %d",
odr_errmsg(odr_geterror(rr->decode)),
odr_offset(rr->decode));
yaz_log(LOG_LOG, "PDU dump:");
- odr_dumpBER(log_file(),
+ odr_dumpBER(yaz_log_file(),
r->u.single_ASN1_type->buf,
r->u.single_ASN1_type->len);
}
else
- yaz_log(LOG_LOG, "Decode ILLRequest OK");
+ yaz_log(LOG_LOG, "Decode ILL APDU OK");
if (rr->print)
{
- ill_Request (rr->print, &ill_req, 0,
- "ILLRequest");
+ ill_APDU (rr->print, &ill_apdu, 0,
+ "ILL APDU");
odr_reset (rr->print);
}
}
r->output_format = r->request_format;
if (r->request_format == VAL_SUTRS)
{
+#if 0
+/* this section returns a huge record (for testing non-blocking write, etc) */
+ r->len = 980000;
+ r->record = odr_malloc (r->stream, r->len);
+ memset (r->record, 'x', r->len);
+#else
+/* this section returns a small record */
char buf[100];
sprintf(buf, "This is dummy SUTRS record number %d\n", r->number);
+
r->len = strlen(buf);
r->record = (char *) odr_malloc (r->stream, r->len+1);
strcpy(r->record, buf);
+#endif
}
else if (r->request_format == VAL_GRS1)
{
q->errcode = 229; /* unsupported term type */
return 0;
}
+ if (*q->step_size != 0)
+ {
+ q->errcode = 205; /*Only zero step size supported for Scan */
+ return 0;
+ }
if (q->term->term->u.general->len >= 80)
{
q->errcode = 11; /* term too long */