X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fproto.h;h=6a012c66b0ff3848953ecf636e8ab5be550725c6;hb=2da4a703da966708bb2e2bd4115ee9c348397667;hp=92b3da10a94480f4677c5f5b16781e0aa8874507;hpb=699e7501d441803e6abd38bb8771cef20846a0d6;p=yaz-moved-to-github.git diff --git a/include/yaz/proto.h b/include/yaz/proto.h index 92b3da1..6a012c6 100644 --- a/include/yaz/proto.h +++ b/include/yaz/proto.h @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995-2006, Index Data +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data. * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -24,7 +24,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: proto.h,v 1.25 2006-11-14 08:37:38 adam Exp $ */ /** * \file proto.h @@ -65,88 +64,23 @@ #include #include #include -#include #include +#include #include #include #include YAZ_BEGIN_CDECL -#if 1 -#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 -#define Z_PRES_PARTIAL_3 Z_PresentStatus_partial_3 -#define Z_PRES_PARTIAL_4 Z_PresentStatus_partial_4 -#define Z_PRES_FAILURE Z_PresentStatus_failure - -#define Z_RES_SUBSET Z_SearchResponse_subset -#define Z_RES_INTERIM Z_SearchResponse_interim -#define Z_RES_NONE Z_SearchResponse_none - -#define Z_SortStatus_success Z_SortResponse_success -#define Z_SortStatus_partial_1 Z_SortResponse_partial_1 -#define Z_SortStatus_failure Z_SortResponse_failure - -#define Z_SortRelation_ascending Z_SortKeySpec_ascending -#define Z_SortRelation_descending Z_SortKeySpec_descending -#define Z_SortRelation_ascendingByFreq Z_SortKeySpec_ascendingByFrequency -#define Z_SortRelation_descendingByFreq Z_SortKeySpec_descendingByfrequency - -#define Z_SortCase_caseSensitive Z_SortKeySpec_caseSensitive -#define Z_SortCase_caseInsensitive Z_SortKeySpec_caseInsensitive - -#define Z_TriggerResourceCtrl_resourceReport Z_TriggerResourceControlRequest_resourceReport -#define Z_TriggerResourceCtrl_resourceControl Z_TriggerResourceControlRequest_resourceControl -#define Z_TriggerResourceCtrl_cancel Z_TriggerResourceControlRequest_cancel - -#define Z_DeleteRequest_list Z_DeleteResultSetRequest_list -#define Z_DeleteRequest_all Z_DeleteResultSetRequest_all - -#define Z_AccessRequest_simpleForm Z_AccessControlRequest_simpleForm -#define Z_AccessRequest_externallyDefined Z_AccessControlRequest_externallyDefined - -#define Z_AccessResponse_simpleForm Z_AccessControlResponse_simpleForm -#define Z_AccessResponse_externallyDefined Z_AccessControlResponse_externallyDefined - -#define Z_ResourceReportStatus_success Z_ResourceReportResponse_success -#define Z_ResourceReportStatus_partial Z_ResourceReportResponse_partial -#define Z_ResourceReportStatus_failure_1 Z_ResourceReportResponse_failure_1 -#define Z_ResourceReportStatus_failure_2 Z_ResourceReportResponse_failure_2 -#define Z_ResourceReportStatus_failure_3 Z_ResourceReportResponse_failure_3 -#define Z_ResourceReportStatus_failure_4 Z_ResourceReportResponse_failure_4 -#define Z_ResourceReportStatus_failure_5 Z_ResourceReportResponse_failure_5 -#define Z_ResourceReportStatus_failure_6 Z_ResourceReportResponse_failure_6 - -#define Z_SortResultSetStatus_empty Z_SortResponse_empty -#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; YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which); YAZ_EXPORT Z_Close *zget_Close (ODR o); -YAZ_EXPORT Odr_oid *yaz_oidval_to_z3950oid (ODR o, int oid_class, - int oid_value); -YAZ_EXPORT Odr_oid *yaz_str_to_z3950oid (ODR o, int oid_class, - const char *str); -YAZ_EXPORT const char *yaz_z3950oid_to_str (Odr_oid *oid, int *oid_class); - -YAZ_EXPORT const char* yaz_z3950_oid_value_to_str(oid_value ov, oid_class oc); /** \brief Performs "pretty" display of GRS-1 record to WRBUF */ YAZ_EXPORT void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags); -/** \brief Performs "pretty" display of OPAC record to WRBUF */ -YAZ_EXPORT void yaz_display_OPAC(WRBUF wrbuf, Z_OPACRecord *r, int flags); - -/** \brief Performs "pretty" display of OPAC record to WRBUF using marc_t */ -YAZ_EXPORT void yaz_opac_decode_wrbuf(yaz_marc_t mt, Z_OPACRecord *r, WRBUF wrbuf); - /** \brief Encodes Z39.50 Init OPtions based on string mnemonics */ YAZ_EXPORT int yaz_init_opt_encode(Z_Options *opt, const char *opt_str, int *error_pos); @@ -206,6 +140,7 @@ YAZ_END_CDECL /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab