-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: zget.c,v 1.13 2007-04-12 13:52:57 adam Exp $
*/
/**
* \file zget.c
* \brief Implements Z39.50 package creator utilities
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/proto.h>
#include <yaz/oid_db.h>
-Z_InitRequest *zget_InitRequest(ODR o)
+static Z_InitRequest *zget_InitRequest(ODR o)
{
Z_InitRequest *r = (Z_InitRequest *)odr_malloc(o, sizeof(*r));
r->implementationId = "81";
r->implementationName = "YAZ";
r->implementationVersion = YAZ_VERSION
-#ifdef YAZ_DATE_STR
- " (" YAZ_DATE_STR ")"
-#endif
-#ifdef YAZ_OS
- " " YAZ_OS
+#ifdef YAZ_VERSION_SHA1
+ " " YAZ_VERSION_SHA1
#endif
;
r->userInformationField = 0;
return r;
}
-Z_InitResponse *zget_InitResponse(ODR o)
+static Z_InitResponse *zget_InitResponse(ODR o)
{
Z_InitResponse *r = (Z_InitResponse *)odr_malloc(o, sizeof(*r));
ODR_MASK_ZERO(r->protocolVersion);
r->preferredMessageSize = odr_intdup(o, 30*1024);
r->maximumRecordSize = odr_intdup(o, 30*1024);
- r->result = odr_intdup(o, 1);
+ r->result = odr_booldup(o, 1);
r->implementationId = "81";
r->implementationName = "YAZ";
r->implementationVersion = YAZ_VERSION
-#ifdef YAZ_DATE_STR
- " (" YAZ_DATE_STR ")"
-#endif
-#ifdef YAZ_OS
- " " YAZ_OS
+#ifdef YAZ_VERSION_SHA1
+ " " YAZ_VERSION_SHA1
#endif
;
r->userInformationField = 0;
return r;
}
-Z_SearchRequest *zget_SearchRequest(ODR o)
+static Z_SearchRequest *zget_SearchRequest(ODR o)
{
Z_SearchRequest *r = (Z_SearchRequest *)odr_malloc(o, sizeof(*r));
r->smallSetUpperBound = odr_intdup(o, 0);
r->largeSetLowerBound = odr_intdup(o, 1);
r->mediumSetPresentNumber = odr_intdup(o, 0);
- r->replaceIndicator = odr_intdup(o, 1);
+ r->replaceIndicator = odr_booldup(o, 1);
r->resultSetName = "default";
r->num_databaseNames = 0;
r->databaseNames = 0;
return r;
}
-Z_SearchResponse *zget_SearchResponse(ODR o)
+static Z_SearchResponse *zget_SearchResponse(ODR o)
{
Z_SearchResponse *r = (Z_SearchResponse *)odr_malloc(o, sizeof(*r));
r->resultCount = odr_intdup(o, 0);
r->numberOfRecordsReturned = odr_intdup(o, 0);
r->nextResultSetPosition = odr_intdup(o, 0);
- r->searchStatus = odr_intdup(o, 1);
+ r->searchStatus = odr_booldup(o, 1);
r->resultSetStatus = 0;
r->presentStatus = 0;
r->records = 0;
return r;
}
-Z_PresentRequest *zget_PresentRequest(ODR o)
+static Z_PresentRequest *zget_PresentRequest(ODR o)
{
Z_PresentRequest *r = (Z_PresentRequest *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_PresentResponse *zget_PresentResponse(ODR o)
+static Z_PresentResponse *zget_PresentResponse(ODR o)
{
Z_PresentResponse *r = (Z_PresentResponse *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
+static Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
{
Z_DeleteResultSetRequest *r = (Z_DeleteResultSetRequest *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
+static Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
{
Z_DeleteResultSetResponse *r = (Z_DeleteResultSetResponse *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_ScanRequest *zget_ScanRequest(ODR o)
+static Z_ScanRequest *zget_ScanRequest(ODR o)
{
Z_ScanRequest *r = (Z_ScanRequest *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_ScanResponse *zget_ScanResponse(ODR o)
+static Z_ScanResponse *zget_ScanResponse(ODR o)
{
Z_ScanResponse *r = (Z_ScanResponse *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
+static Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
{
Z_TriggerResourceControlRequest *r = (Z_TriggerResourceControlRequest *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
+static Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
{
Z_ResourceControlRequest *r = (Z_ResourceControlRequest *)
odr_malloc(o, sizeof(*r));
r->suspendedFlag = 0;
r->resourceReport = 0;
r->partialResultsAvailable = 0;
- r->responseRequired = odr_intdup(o, 0);
+ r->responseRequired = odr_booldup(o, 0);
r->triggeredRequestFlag = 0;
r->otherInfo = 0;
return r;
}
-Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
+static Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
{
Z_ResourceControlResponse *r = (Z_ResourceControlResponse *)
odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->continueFlag = odr_intdup(o, 1);
+ r->continueFlag = odr_booldup(o, 1);
r->resultSetWanted = 0;
r->otherInfo = 0;
return r;
}
-Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
+static Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
{
Z_AccessControlRequest *r = (Z_AccessControlRequest *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
+static Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
{
Z_AccessControlResponse *r = (Z_AccessControlResponse *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_Segment *zget_Segment(ODR o)
+static Z_Segment *zget_Segment(ODR o)
{
Z_Segment *r = (Z_Segment *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_Close *zget_Close(ODR o)
+static Z_Close *zget_Close(ODR o)
{
Z_Close *r = (Z_Close *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
+static Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
{
Z_ResourceReportRequest *r = (Z_ResourceReportRequest *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
+static Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
{
Z_ResourceReportResponse *r = (Z_ResourceReportResponse *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_SortRequest *zget_SortRequest(ODR o)
+static Z_SortRequest *zget_SortRequest(ODR o)
{
Z_SortRequest *r = (Z_SortRequest *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_SortResponse *zget_SortResponse(ODR o)
+static Z_SortResponse *zget_SortResponse(ODR o)
{
Z_SortResponse *r = (Z_SortResponse *)odr_malloc(o, sizeof(*r));
return r;
}
-Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
+static Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
{
Z_ExtendedServicesRequest *r = (Z_ExtendedServicesRequest *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
+static Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
{
Z_ExtendedServicesResponse *r = (Z_ExtendedServicesResponse *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_DuplicateDetectionRequest *zget_DuplicateDetectionRequest(ODR o)
+static Z_DuplicateDetectionRequest *zget_DuplicateDetectionRequest(ODR o)
{
Z_DuplicateDetectionRequest *r = (Z_DuplicateDetectionRequest *)
odr_malloc(o, sizeof(*r));
return r;
}
-Z_DuplicateDetectionResponse *zget_DuplicateDetectionResponse(ODR o)
+static Z_DuplicateDetectionResponse *zget_DuplicateDetectionResponse(ODR o)
{
Z_DuplicateDetectionResponse *r = (Z_DuplicateDetectionResponse *)
odr_malloc(o, sizeof(*r));
Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
odr_malloc (o, sizeof(*dr));
- dr->diagnosticSetId = yaz_string_to_oid_odr(
- yaz_oid_std(), CLASS_DIAGSET, OID_STR_BIB1, o);
+ dr->diagnosticSetId = odr_oiddup(o, yaz_oid_diagset_bib_1);
dr->condition = odr_intdup(o, error);
dr->which = Z_DefaultDiagFormat_v2Addinfo;
dr->u.v2Addinfo = odr_strdup (o, addinfo ? addinfo : "");
x = (Z_External*) odr_malloc(odr, sizeof *x);
x->descriptor = 0;
x->indirect_reference = 0;
- x->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_USERINFO,
- OID_STR_USERINFO_1,
- odr);
+ x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
x->which = Z_External_userInfo1;
- u = odr_malloc(odr, sizeof *u);
+ u = (Z_OtherInformation *) odr_malloc(odr, sizeof *u);
x->u.userInfo1 = u;
u->num_elements = 1;
u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
l->information.externallyDefinedInfo = x2;
x2->descriptor = 0;
x2->indirect_reference = 0;
- x2->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_DIAGSET,
- OID_STR_DIAG1,
- odr);
+ x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
int octet_len;
ODR encode;
- u = odr_malloc(odr, sizeof *u);
+ u = (Z_OtherInformation *) odr_malloc(odr, sizeof *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]);
x2->descriptor = 0;
x2->indirect_reference = 0;
- x2->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_DIAGSET,
- OID_STR_DIAG1,
- odr);
+ x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
x = (Z_External*) odr_malloc(odr, sizeof *x);
x->descriptor = 0;
x->indirect_reference = 0;
- x->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_USERINFO,
- OID_STR_USERINFO_1,
- odr);
-
+ x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
x->which = Z_External_octet;
x->u.octet_aligned = (Odr_oct *) odr_malloc(odr, sizeof(Odr_oct));
- x->u.octet_aligned->buf = odr_malloc(odr, octet_len);
+ x->u.octet_aligned->buf = (unsigned char *) odr_malloc(odr, octet_len);
memcpy(x->u.octet_aligned->buf, octet_buf, octet_len);
x->u.octet_aligned->len = octet_len;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff