projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upload doc+dox script
[yaz-moved-to-github.git]
/
src
/
zget.c
diff --git
a/src/zget.c
b/src/zget.c
index
01a6330
..
d0c23d6
100644
(file)
--- a/
src/zget.c
+++ b/
src/zget.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: zget.c,v 1.10 2005-01-27 09:06:12 adam Exp $
*/
/**
* \file zget.c
*/
/**
* \file zget.c
@@
-10,6
+8,7
@@
*/
#include <yaz/proto.h>
*/
#include <yaz/proto.h>
+#include <yaz/oid_db.h>
Z_InitRequest *zget_InitRequest(ODR o)
{
Z_InitRequest *zget_InitRequest(ODR o)
{
@@
-19,7
+18,7
@@
Z_InitRequest *zget_InitRequest(ODR o)
r->options = (Odr_bitmask *)odr_malloc(o, sizeof(*r->options));
ODR_MASK_ZERO(r->options);
r->protocolVersion = (Odr_bitmask *)
r->options = (Odr_bitmask *)odr_malloc(o, sizeof(*r->options));
ODR_MASK_ZERO(r->options);
r->protocolVersion = (Odr_bitmask *)
- odr_malloc(o, sizeof(*r->protocolVersion));
+ odr_malloc(o, sizeof(*r->protocolVersion));
ODR_MASK_SET(r->options, Z_Options_search);
ODR_MASK_SET(r->options, Z_Options_present);
ODR_MASK_SET(r->options, Z_Options_search);
ODR_MASK_SET(r->options, Z_Options_present);
@@
-35,13
+34,10
@@
Z_InitRequest *zget_InitRequest(ODR o)
r->implementationId = "81";
r->implementationName = "YAZ";
r->implementationVersion = YAZ_VERSION
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
#endif
- ;
+ ;
r->userInformationField = 0;
r->otherInfo = 0;
return r;
r->userInformationField = 0;
r->otherInfo = 0;
return r;
@@
-58,17
+54,14
@@
Z_InitResponse *zget_InitResponse(ODR o)
ODR_MASK_ZERO(r->protocolVersion);
r->preferredMessageSize = odr_intdup(o, 30*1024);
r->maximumRecordSize = odr_intdup(o, 30*1024);
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
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
#endif
- ;
+ ;
r->userInformationField = 0;
r->otherInfo = 0;
return r;
r->userInformationField = 0;
r->otherInfo = 0;
return r;
@@
-82,7
+75,7
@@
Z_SearchRequest *zget_SearchRequest(ODR o)
r->smallSetUpperBound = odr_intdup(o, 0);
r->largeSetLowerBound = odr_intdup(o, 1);
r->mediumSetPresentNumber = odr_intdup(o, 0);
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;
r->resultSetName = "default";
r->num_databaseNames = 0;
r->databaseNames = 0;
@@
-103,7
+96,7
@@
Z_SearchResponse *zget_SearchResponse(ODR o)
r->resultCount = odr_intdup(o, 0);
r->numberOfRecordsReturned = odr_intdup(o, 0);
r->nextResultSetPosition = odr_intdup(o, 0);
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;
r->resultSetStatus = 0;
r->presentStatus = 0;
r->records = 0;
@@
-147,7
+140,7
@@
Z_PresentResponse *zget_PresentResponse(ODR o)
Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
{
Z_DeleteResultSetRequest *r = (Z_DeleteResultSetRequest *)
Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
{
Z_DeleteResultSetRequest *r = (Z_DeleteResultSetRequest *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->deleteFunction = odr_intdup(o, Z_DeleteResultSetRequest_list);
r->referenceId = 0;
r->deleteFunction = odr_intdup(o, Z_DeleteResultSetRequest_list);
@@
-160,7
+153,7
@@
Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
{
Z_DeleteResultSetResponse *r = (Z_DeleteResultSetResponse *)
Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
{
Z_DeleteResultSetResponse *r = (Z_DeleteResultSetResponse *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->deleteOperationStatus = odr_intdup(o, Z_DeleteStatus_success);
r->referenceId = 0;
r->deleteOperationStatus = odr_intdup(o, Z_DeleteStatus_success);
@@
-206,7
+199,7
@@
Z_ScanResponse *zget_ScanResponse(ODR o)
Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
{
Z_TriggerResourceControlRequest *r = (Z_TriggerResourceControlRequest *)
Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
{
Z_TriggerResourceControlRequest *r = (Z_TriggerResourceControlRequest *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->requestedAction = odr_intdup(o, Z_TriggerResourceControlRequest_resourceReport);
r->referenceId = 0;
r->requestedAction = odr_intdup(o, Z_TriggerResourceControlRequest_resourceReport);
@@
-219,13
+212,13
@@
Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
{
Z_ResourceControlRequest *r = (Z_ResourceControlRequest *)
Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
{
Z_ResourceControlRequest *r = (Z_ResourceControlRequest *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->suspendedFlag = 0;
r->resourceReport = 0;
r->partialResultsAvailable = 0;
r->referenceId = 0;
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;
r->triggeredRequestFlag = 0;
r->otherInfo = 0;
return r;
@@
-234,10
+227,10
@@
Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
{
Z_ResourceControlResponse *r = (Z_ResourceControlResponse *)
Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
{
Z_ResourceControlResponse *r = (Z_ResourceControlResponse *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->referenceId = 0;
- r->continueFlag = odr_intdup(o, 1);
+ r->continueFlag = odr_booldup(o, 1);
r->resultSetWanted = 0;
r->otherInfo = 0;
return r;
r->resultSetWanted = 0;
r->otherInfo = 0;
return r;
@@
-246,7
+239,7
@@
Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
{
Z_AccessControlRequest *r = (Z_AccessControlRequest *)
Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
{
Z_AccessControlRequest *r = (Z_AccessControlRequest *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->which = Z_AccessControlRequest_simpleForm;
r->referenceId = 0;
r->which = Z_AccessControlRequest_simpleForm;
@@
-258,7
+251,7
@@
Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
{
Z_AccessControlResponse *r = (Z_AccessControlResponse *)
Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
{
Z_AccessControlResponse *r = (Z_AccessControlResponse *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->which = Z_AccessControlResponse_simpleForm;
r->referenceId = 0;
r->which = Z_AccessControlResponse_simpleForm;
@@
-296,7
+289,7
@@
Z_Close *zget_Close(ODR o)
Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
{
Z_ResourceReportRequest *r = (Z_ResourceReportRequest *)
Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
{
Z_ResourceReportRequest *r = (Z_ResourceReportRequest *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->opId = 0;
r->referenceId = 0;
r->opId = 0;
@@
-308,7
+301,7
@@
Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
{
Z_ResourceReportResponse *r = (Z_ResourceReportResponse *)
Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
{
Z_ResourceReportResponse *r = (Z_ResourceReportResponse *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->resourceReportStatus = odr_intdup(o, Z_ResourceReportResponse_success);
r->referenceId = 0;
r->resourceReportStatus = odr_intdup(o, Z_ResourceReportResponse_success);
@@
-345,7
+338,7
@@
Z_SortResponse *zget_SortResponse(ODR o)
Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
{
Z_ExtendedServicesRequest *r = (Z_ExtendedServicesRequest *)
Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
{
Z_ExtendedServicesRequest *r = (Z_ExtendedServicesRequest *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->function = odr_intdup(o, Z_ExtendedServicesRequest_create);
r->referenceId = 0;
r->function = odr_intdup(o, Z_ExtendedServicesRequest_create);
@@
-365,7
+358,7
@@
Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
{
Z_ExtendedServicesResponse *r = (Z_ExtendedServicesResponse *)
Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
{
Z_ExtendedServicesResponse *r = (Z_ExtendedServicesResponse *)
- odr_malloc(o, sizeof(*r));
+ odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->operationStatus = odr_intdup(o, Z_ExtendedServicesResponse_done);
r->referenceId = 0;
r->operationStatus = odr_intdup(o, Z_ExtendedServicesResponse_done);
@@
-486,7
+479,7
@@
Z_APDU *zget_APDU(ODR o, int which)
break;
case Z_APDU_extendedServicesResponse:
r->u.extendedServicesResponse = zget_ExtendedServicesResponse(o);
break;
case Z_APDU_extendedServicesResponse:
r->u.extendedServicesResponse = zget_ExtendedServicesResponse(o);
- break;
+ break;
case Z_APDU_duplicateDetectionRequest:
r->u.duplicateDetectionRequest = zget_DuplicateDetectionRequest(o);
break;
case Z_APDU_duplicateDetectionRequest:
r->u.duplicateDetectionRequest = zget_DuplicateDetectionRequest(o);
break;
@@
-494,18
+487,18
@@
Z_APDU *zget_APDU(ODR o, int which)
r->u.duplicateDetectionResponse = zget_DuplicateDetectionResponse(o);
break;
default:
r->u.duplicateDetectionResponse = zget_DuplicateDetectionResponse(o);
break;
default:
- return 0;
+ return 0;
}
return r;
}
Z_DefaultDiagFormat *zget_DefaultDiagFormat(ODR o, int error,
}
return r;
}
Z_DefaultDiagFormat *zget_DefaultDiagFormat(ODR o, int error,
- const char *addinfo)
+ const char *addinfo)
{
Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
{
Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
- odr_malloc (o, sizeof(*dr));
+ odr_malloc (o, sizeof(*dr));
- dr->diagnosticSetId = yaz_oidval_to_z3950oid (o, CLASS_DIAGSET, VAL_BIB1);
+ 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 : "");
dr->condition = odr_intdup(o, error);
dr->which = Z_DefaultDiagFormat_v2Addinfo;
dr->u.v2Addinfo = odr_strdup (o, addinfo ? addinfo : "");
@@
-531,15
+524,15
@@
Z_DiagRecs *zget_DiagRecs(ODR o, int error, const char *addinfo)
}
Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
}
Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
- int error, const char *addinfo)
+ 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)
{
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);
+ rec->databaseName = odr_strdup(o, dbname);
else
else
- rec->databaseName = 0;
+ rec->databaseName = 0;
rec->which = Z_NamePlusRecord_surrogateDiagnostic;
rec->u.surrogateDiagnostic = drec;
drec->which = Z_DiagRec_defaultFormat;
rec->which = Z_NamePlusRecord_surrogateDiagnostic;
rec->u.surrogateDiagnostic = drec;
drec->which = Z_DiagRec_defaultFormat;
@@
-550,7
+543,6
@@
Z_NamePlusRecord *zget_surrogateDiagRec(ODR o, const char *dbname,
Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
{
Z_External *x, *x2;
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_OtherInformation *u;
Z_OtherInformationUnit *l;
Z_DiagnosticFormat *d;
@@
-559,13
+551,10
@@
Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
x = (Z_External*) odr_malloc(odr, sizeof *x);
x->descriptor = 0;
x->indirect_reference = 0;
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->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
x->which = Z_External_userInfo1;
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);
x->u.userInfo1 = u;
u->num_elements = 1;
u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
@@
-578,9
+567,7
@@
Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
l->information.externallyDefinedInfo = x2;
x2->descriptor = 0;
x2->indirect_reference = 0;
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->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
@@
-597,10
+584,9
@@
Z_External *zget_init_diagnostics(ODR odr, int error, const char *addinfo)
}
Z_External *zget_init_diagnostics_octet(ODR odr, int error,
}
Z_External *zget_init_diagnostics_octet(ODR odr, int error,
- const char *addinfo)
+ const char *addinfo)
{
Z_External *x, *x2;
{
Z_External *x, *x2;
- oident oid;
Z_OtherInformation *u;
Z_OtherInformationUnit *l;
Z_DiagnosticFormat *d;
Z_OtherInformation *u;
Z_OtherInformationUnit *l;
Z_DiagnosticFormat *d;
@@
-609,7
+595,7
@@
Z_External *zget_init_diagnostics_octet(ODR odr, int error,
int octet_len;
ODR encode;
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]);
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]);
@@
-621,10
+607,8
@@
Z_External *zget_init_diagnostics_octet(ODR odr, int error,
l->information.externallyDefinedInfo = x2;
x2->descriptor = 0;
x2->indirect_reference = 0;
l->information.externallyDefinedInfo = x2;
x2->descriptor = 0;
x2->indirect_reference = 0;
- oid.oclass = CLASS_DIAGSET;
- oid.proto = PROTO_Z3950;
- oid.value = VAL_DIAG1;
- x2->direct_reference = odr_oiddup(odr, oid_getoidbyent(&oid));
+
+ x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
@@
-647,14
+631,10
@@
Z_External *zget_init_diagnostics_octet(ODR odr, int error,
x = (Z_External*) odr_malloc(odr, sizeof *x);
x->descriptor = 0;
x->indirect_reference = 0;
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->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->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;
memcpy(x->u.octet_aligned->buf, octet_buf, octet_len);
x->u.octet_aligned->len = octet_len;
@@
-663,3
+643,12
@@
Z_External *zget_init_diagnostics_octet(ODR odr, int error,
return x;
}
return x;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+