/*
- * Copyright (c) 1995-2003, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Id: zget.c,v 1.2 2003-11-27 15:37:23 adam Exp $
+ * $Id: zget.c,v 1.9 2005-01-16 21:56:42 adam Exp $
+ */
+/**
+ * \file zget.c
+ * \brief Implements Z39.50 package creator utilities
*/
#include <yaz/proto.h>
ODR_MASK_SET(r->protocolVersion, Z_ProtocolVersion_1);
ODR_MASK_SET(r->protocolVersion, Z_ProtocolVersion_2);
- r->preferredMessageSize = odr_intdup(o, 30*1024);
- r->maximumRecordSize = odr_intdup(o, 30*1024);
+ r->preferredMessageSize = odr_intdup(o, 1024*1024);
+ r->maximumRecordSize = odr_intdup(o, 1024*1024);
r->idAuthentication = 0;
r->implementationId = "81";
r->implementationName = "YAZ";
r->maximumRecordSize = odr_intdup(o, 30*1024);
r->result = odr_intdup(o, 1);
r->implementationId = "81";
- r->implementationName = "Index Data/YAZ";
+ r->implementationName = "YAZ";
r->implementationVersion = YAZ_VERSION
#ifdef YAZ_DATE_STR
" (" YAZ_DATE_STR ")"
odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->deleteFunction = odr_intdup(o, Z_DeleteRequest_list);
+ r->deleteFunction = odr_intdup(o, Z_DeleteResultSetRequest_list);
r->num_resultSetList = 0;
r->resultSetList = 0;
r->otherInfo = 0;
odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->requestedAction = odr_intdup(o, Z_TriggerResourceCtrl_resourceReport);
+ r->requestedAction = odr_intdup(o, Z_TriggerResourceControlRequest_resourceReport);
r->prefResourceReportFormat = 0;
r->resultSetWanted = 0;
r->otherInfo = 0;
odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->which = Z_AccessRequest_simpleForm;
+ r->which = Z_AccessControlRequest_simpleForm;
r->u.simpleForm = 0;
r->otherInfo = 0;
return r;
odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->which = Z_AccessResponse_simpleForm;
+ r->which = Z_AccessControlResponse_simpleForm;
r->u.simpleForm = 0;
r->diagnostic = 0;
r->otherInfo = 0;
odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->resourceReportStatus = odr_intdup(o, Z_ResourceReportStatus_success);
+ r->resourceReportStatus = odr_intdup(o, Z_ResourceReportResponse_success);
r->resourceReport = 0;
r->otherInfo = 0;
return r;
Z_SortResponse *r = (Z_SortResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->sortStatus = odr_intdup(o, Z_SortStatus_success);
- r->resultSetStatus = odr_intdup(o, Z_SortResultSetStatus_empty);
+ r->sortStatus = odr_intdup(o, Z_SortResponse_success);
+ r->resultSetStatus = odr_intdup(o, Z_SortResponse_empty);
r->diagnostics = 0;
r->resultCount = 0;
r->otherInfo = 0;
r->u.duplicateDetectionResponse = zget_DuplicateDetectionResponse(o);
break;
default:
- fprintf(stderr, "Bad APDU-type to zget_APDU");
- exit(1);
+ return 0;
}
return r;
}
+
+Z_DefaultDiagFormat *zget_DefaultDiagFormat(ODR o, int error,
+ const char *addinfo)
+{
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
+ odr_malloc (o, sizeof(*dr));
+
+ dr->diagnosticSetId = yaz_oidval_to_z3950oid (o, CLASS_DIAGSET, VAL_BIB1);
+ dr->condition = odr_intdup(o, error);
+ dr->which = Z_DefaultDiagFormat_v2Addinfo;
+ dr->u.v2Addinfo = odr_strdup (o, addinfo ? addinfo : "");
+ return dr;
+}
+
+Z_DiagRec *zget_DiagRec(ODR o, int error, const char *addinfo)
+{
+ Z_DiagRec *dr = (Z_DiagRec*) odr_malloc(o, sizeof(*dr));
+ dr->which = Z_DiagRec_defaultFormat;
+ dr->u.defaultFormat = zget_DefaultDiagFormat(o, error, addinfo);
+ return dr;
+}
+
+Z_DiagRecs *zget_DiagRecs(ODR o, int error, const char *addinfo)
+{
+ Z_DiagRecs *drecs = (Z_DiagRecs*) odr_malloc(o, sizeof(*drecs));
+ Z_DiagRec **dr = (Z_DiagRec**) odr_malloc(o, sizeof(**dr));
+ drecs->diagRecs = dr;
+ dr[0] = zget_DiagRec(o, error, addinfo);
+ drecs->num_diagRecs = 1;
+ return drecs;
+}
+
+Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
+ int error, const char *addinfo)
+{
+ Z_NamePlusRecord *rec = (Z_NamePlusRecord *) odr_malloc (o, sizeof(*rec));
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (o, sizeof(*drec));
+
+ if (dbname)
+ rec->databaseName = odr_strdup(o, dbname);
+ else
+ rec->databaseName = 0;
+ rec->which = Z_NamePlusRecord_surrogateDiagnostic;
+ rec->u.surrogateDiagnostic = drec;
+ drec->which = Z_DiagRec_defaultFormat;
+ drec->u.defaultFormat = zget_DefaultDiagFormat(o, error, addinfo);
+ return rec;
+}
+
+Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
+{
+ Z_External *x, *x2;
+ oident oid;
+ Z_OtherInformation *u;
+ Z_OtherInformationUnit *l;
+ Z_DiagnosticFormat *d;
+ Z_DiagnosticFormat_s *e;
+
+ x = (Z_External*) odr_malloc(odr, sizeof *x);
+ x->descriptor = 0;
+ x->indirect_reference = 0;
+ oid.proto = PROTO_Z3950;
+ oid.oclass = CLASS_USERINFO;
+ oid.value = VAL_USERINFO1;
+ x->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
+ x->which = Z_External_userInfo1;
+
+ u = odr_malloc(odr, sizeof *u);
+ x->u.userInfo1 = u;
+ u->num_elements = 1;
+ u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
+ u->list[0] = (Z_OtherInformationUnit*) odr_malloc(odr, sizeof *u->list[0]);
+ l = u->list[0];
+ l->category = 0;
+ l->which = Z_OtherInfo_externallyDefinedInfo;
+
+ x2 = (Z_External*) odr_malloc(odr, sizeof *x);
+ l->information.externallyDefinedInfo = x2;
+ x2->descriptor = 0;
+ x2->indirect_reference = 0;
+ oid.oclass = CLASS_DIAGSET;
+ oid.value = VAL_DIAG1;
+ x2->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
+ x2->which = Z_External_diag1;
+
+ d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
+ x2->u.diag1 = d;
+ d->num = 1;
+ d->elements = (Z_DiagnosticFormat_s**) odr_malloc (odr, sizeof *d->elements);
+ d->elements[0] = (Z_DiagnosticFormat_s*) odr_malloc (odr, sizeof *d->elements[0]);
+ e = d->elements[0];
+
+ e->which = Z_DiagnosticFormat_s_defaultDiagRec;
+ e->u.defaultDiagRec = zget_DefaultDiagFormat(odr, error, addinfo);
+ e->message = 0;
+ return x;
+}
+