From 725fc033b729b22a1e0cfba614192b6fbfaeda4f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 10 May 2004 07:48:56 +0000 Subject: [PATCH] Do not mention windows.txt anymore. Point to HTML doc --- README | 13 ++++++++----- include/yaz/proto.h | 4 +++- src/seshigh.c | 16 ++++++++-------- src/sortspec.c | 14 +++++++------- src/zget.c | 16 ++++++++-------- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/README b/README index 166a387..3b3a860 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -YAZ toolkit - $Id: README,v 1.45 2004-01-05 09:34:41 adam Exp $ +YAZ toolkit - $Id: README,v 1.46 2004-05-10 07:48:56 adam Exp $ Copyright (C) 1995-2004, Index Data ApS. See the file LICENSE for details. @@ -7,11 +7,14 @@ The primary output of the source here is the YAZ library, which contains support functions for implementing the server or client role of Z39.50 and SRW. -Windows programmers: refer to the file windows.txt which describes how -to build the software using Microsoft Visual C++. - On Unix, GNU configure is used to configure YAZ and generate Makefiles. -Type "./configure", then "make" to build YAZ. +Type "./configure", then "make" to build YAZ. Read +doc/installation.unix.html for details. + +On Windows, a MS Visual Studio makefile is provided (nmake). The commands + cd \win + nmake +should do. Refer to doc/installation.win32.html for details. Note: If you are using the CVS snapshot of YAZ you must have autoconf, automake and libtool installed. Before running configure, create diff --git a/include/yaz/proto.h b/include/yaz/proto.h index 9dc54c2..2200e30 100644 --- a/include/yaz/proto.h +++ b/include/yaz/proto.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data * See the file LICENSE for details. * - * $Id: proto.h,v 1.13 2004-01-15 10:16:26 adam Exp $ + * $Id: proto.h,v 1.14 2004-05-10 07:48:56 adam Exp $ */ #ifndef Z_PROTO_H #define Z_PROTO_H @@ -46,6 +46,7 @@ YAZ_BEGIN_CDECL +#if 0 #define Z_PRES_SUCCESS Z_PresentStatus_success #define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1 #define Z_PRES_PARTIAL_2 Z_PresentStatus_partial_2 @@ -95,6 +96,7 @@ YAZ_BEGIN_CDECL #define Z_SortResultSetStatus_interim Z_SortResponse_interim #define Z_SortResultSetStatus_unchanged Z_SortResponse_unchanged #define Z_SortResultSetStatus_none Z_SortResponse_none +#endif typedef Z_External Z_DatabaseRecord; typedef struct Z_IOItemOrder Z_ItemOrder; diff --git a/src/seshigh.c b/src/seshigh.c index 1bdede6..6349c4e 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.23 2004-03-29 15:09:14 adam Exp $ + * $Id: seshigh.c,v 1.24 2004-05-10 07:48:56 adam Exp $ */ /* @@ -1321,7 +1321,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->implementation_name, odr_prepend(assoc->encode, "GFS", resp->implementationName)); - version = odr_strdup(assoc->encode, "$Revision: 1.23 $"); + version = odr_strdup(assoc->encode, "$Revision: 1.24 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; resp->implementationVersion = odr_prepend(assoc->encode, @@ -1499,7 +1499,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, records->u.databaseOrSurDiagnostics = reclist; reclist->num_records = 0; reclist->records = list; - *pres = Z_PRES_SUCCESS; + *pres = Z_PresentStatus_success; *num = 0; *next = 0; @@ -1543,7 +1543,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!freq.surrogate_flag) { char s[20]; - *pres = Z_PRES_FAILURE; + *pres = Z_PresentStatus_failure; /* for 'present request out of range', set addinfo to record position if not set */ if (freq.errcode == 13 && freq.errstring == 0) @@ -1573,7 +1573,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (this_length <= a->preferredMessageSize && recno > start) { yaz_log(LOG_DEBUG, " Dropped last normal-sized record"); - *pres = Z_PRES_PARTIAL_2; + *pres = Z_PresentStatus_partial_2; break; } /* record can only be fetched by itself */ @@ -1693,7 +1693,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, int *nulint = odr_intdup (assoc->encode, 0); bool_t *sr = odr_intdup(assoc->encode, 1); int *next = odr_intdup(assoc->encode, 0); - int *none = odr_intdup(assoc->encode, Z_RES_NONE); + int *none = odr_intdup(assoc->encode, Z_SearchResponse_none); apdu->which = Z_APDU_searchResponse; apdu->u.searchResponse = resp; @@ -1839,7 +1839,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, if (bprr->errcode) { resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); - *resp->presentStatus = Z_PRES_FAILURE; + *resp->presentStatus = Z_PresentStatus_failure; } } apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); @@ -2053,7 +2053,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, bsrr->stream = assoc->encode; bsrr->print = assoc->print; - bsrr->sort_status = Z_SortStatus_failure; + bsrr->sort_status = Z_SortResponse_failure; bsrr->errcode = 0; bsrr->errstring = 0; diff --git a/src/sortspec.c b/src/sortspec.c index 22ac90b..bc9e4b1 100644 --- a/src/sortspec.c +++ b/src/sortspec.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2001, Index Data. * See the file LICENSE for details. * - * $Id: sortspec.c,v 1.1 2003-10-27 12:21:35 adam Exp $ + * $Id: sortspec.c,v 1.2 2004-05-10 07:48:56 adam Exp $ */ #include @@ -77,8 +77,8 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) sk->which = Z_SortKey_sortField; sk->u.sortField = odr_strdup (out, sort_string); } - sks->sortRelation = odr_intdup (out, Z_SortRelation_ascending); - sks->caseSensitivity = odr_intdup (out, Z_SortCase_caseSensitive); + sks->sortRelation = odr_intdup (out, Z_SortKeySpec_ascending); + sks->caseSensitivity = odr_intdup (out, Z_SortKeySpec_caseSensitive); sks->which = Z_SortKeySpec_null; sks->u.null = odr_nullval (); @@ -90,20 +90,20 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg) case 'd': case 'D': case '>': - *sks->sortRelation = Z_SortRelation_descending; + *sks->sortRelation = Z_SortKeySpec_descending; break; case 'a': case 'A': case '<': - *sks->sortRelation = Z_SortRelation_ascending; + *sks->sortRelation = Z_SortKeySpec_ascending; break; case 'i': case 'I': - *sks->caseSensitivity = Z_SortCase_caseInsensitive; + *sks->caseSensitivity = Z_SortKeySpec_caseInsensitive; break; case 'S': case 's': - *sks->caseSensitivity = Z_SortCase_caseSensitive; + *sks->caseSensitivity = Z_SortKeySpec_caseSensitive; break; } } diff --git a/src/zget.c b/src/zget.c index 402094e..17a7f77 100644 --- a/src/zget.c +++ b/src/zget.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2004, Index Data. * See the file LICENSE for details. * - * $Id: zget.c,v 1.4 2004-02-15 07:19:42 adam Exp $ + * $Id: zget.c,v 1.5 2004-05-10 07:48:56 adam Exp $ */ #include @@ -146,7 +146,7 @@ Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o) 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; @@ -205,7 +205,7 @@ Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o) 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; @@ -245,7 +245,7 @@ Z_AccessControlRequest *zget_AccessControlRequest(ODR o) 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; @@ -257,7 +257,7 @@ Z_AccessControlResponse *zget_AccessControlResponse(ODR o) 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; @@ -307,7 +307,7 @@ Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o) 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; @@ -330,8 +330,8 @@ Z_SortResponse *zget_SortResponse(ODR o) 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; -- 1.7.10.4