X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=c476c9a78f55baa6067d5dae3a4de6833463778c;hb=23cfa431fda52535722e4efdc3f462995937e863;hp=2a323faba74a1be4526e92866cd86d77ddba1407;hpb=5fe647af23484842955ab7a7e26d0ab34e3c2b1c;p=yaz-moved-to-github.git diff --git a/include/proto.h b/include/proto.h index 2a323fa..c476c9a 100644 --- a/include/proto.h +++ b/include/proto.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1998, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -24,7 +24,40 @@ * OF THIS SOFTWARE. * * $Log: proto.h,v $ - * Revision 1.35 1996-06-10 08:57:38 quinn + * Revision 1.45 1998-08-19 16:10:07 adam + * Changed som member names of DeleteResultSetRequest/Response. + * + * Revision 1.44 1998/05/18 10:14:08 adam + * Minor change - removed 'dead' definitions. + * + * Revision 1.43 1998/03/31 11:07:45 adam + * Furhter work on UNIverse resource report. + * Added Extended Services handling in frontend server. + * + * Revision 1.42 1998/03/20 14:46:06 adam + * Added UNIverse Resource Reports. + * + * Revision 1.41 1998/02/10 15:31:52 adam + * Implemented date and time structure. Changed the Update Extended + * Service. + * + * Revision 1.40 1997/09/01 08:49:50 adam + * New windows NT/95 port using MSV5.0. To export DLL functions the + * YAZ_EXPORT modifier was added. Defined in yconfig.h. + * + * Revision 1.39 1997/05/14 06:53:44 adam + * C++ support. + * + * Revision 1.38 1997/04/30 08:52:09 quinn + * Null + * + * Revision 1.37 1996/10/09 15:54:58 quinn + * Added SearchInfoReport + * + * Revision 1.36 1996/10/07 15:29:20 quinn + * Added SOIF support + * + * Revision 1.35 1996/06/10 08:57:38 quinn * Added OPAC, ResourceReport * * Revision 1.34 1996/06/10 08:55:36 quinn @@ -172,6 +205,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* * Because we didn't have time to put all of the extra v3 elements in here * before the first applications were written, we have to place them @@ -847,8 +884,6 @@ typedef struct Z_AlternativeTerm Z_AttributesPlusTerm **terms; } Z_AlternativeTerm; -#if 1 - typedef struct Z_ByDatabase { char *db; @@ -888,31 +923,6 @@ typedef struct Z_OccurrenceByAttributes Z_OccurrenceByAttributesElem **elements; } Z_OccurrenceByAttributes; -#else - -/* - * Old, incomplete definition of OccurrenceByAttributes. - */ - -typedef struct Z_OccurrenceByAttributes -{ - Z_AttributeList *attributes; -#if 0 - int which; -#define Z_OByAtt_global 0 -#define Z_ObyAtt_byDatabase 1 - union - { -#endif - int *global; -#if 0 - /* Z_ByDatabase *byDatabase; */ - } u; -#endif -} Z_OccurrenceByAttributes; - -#endif - typedef struct Z_TermInfo { Z_Term *term; @@ -1017,22 +1027,25 @@ typedef struct Z_DeleteResultSetRequest int *deleteFunction; #define Z_DeleteRequest_list 0 #define Z_DeleteRequest_all 1 - int num_ids; + int num_resultSetList; Z_ResultSetId **resultSetList; /* OPTIONAL */ #ifdef Z_95 Z_OtherInformation *otherInfo; #endif } Z_DeleteResultSetRequest; +typedef struct Z_ListStatuses { + int num; + Z_ListStatus **elements; +} Z_ListStatuses; + typedef struct Z_DeleteResultSetResponse { Z_ReferenceId *referenceId; /* OPTIONAL */ int *deleteOperationStatus; - int num_statuses; - Z_ListStatus *deleteListStatuses; /* OPTIONAL */ + Z_ListStatuses *deleteListStatuses;/* OPTIONAL */ int *numberNotDeleted; /* OPTIONAL */ - int num_bulkStatuses; - Z_ListStatus *bulkStatuses; /* OPTIONAL */ + Z_ListStatuses *bulkStatuses; /* OPTIONAL */ char *deleteMessage; /* OPTIONAL */ #ifdef Z_95 Z_OtherInformation *otherInfo; @@ -1311,39 +1324,45 @@ typedef struct Z_APDU } u; } Z_APDU; -int z_APDU(ODR o, Z_APDU **p, int opt); -int z_SUTRS(ODR o, Odr_oct **p, int opt); - -Z_InitRequest *zget_InitRequest(ODR o); -Z_InitResponse *zget_InitResponse(ODR o); -Z_SearchRequest *zget_SearchRequest(ODR o); -Z_SearchResponse *zget_SearchResponse(ODR o); -Z_PresentRequest *zget_PresentRequest(ODR o); -Z_PresentResponse *zget_PresentResponse(ODR o); -Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o); -Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o); -Z_ScanRequest *zget_ScanRequest(ODR o); -Z_ScanResponse *zget_ScanResponse(ODR o); -Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o); -Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o); -Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o); -Z_Close *zget_Close(ODR o); -int z_StringList(ODR o, Z_StringList **p, int opt); -int z_InternationalString(ODR o, char **p, int opt); -int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt); -int z_ElementSetName(ODR o, char **p, int opt); -int z_IntUnit(ODR o, Z_IntUnit **p, int opt); -int z_Unit(ODR o, Z_Unit **p, int opt); -int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt); -int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt); -int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt); -int z_Term(ODR o, Z_Term **p, int opt); -int z_Specification(ODR o, Z_Specification **p, int opt); -int z_Permissions(ODR o, Z_Permissions **p, int opt); -int z_DiagRec(ODR o, Z_DiagRec **p, int opt); -int z_AttributeList(ODR o, Z_AttributeList **p, int opt); -int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt); -Z_APDU *zget_APDU(ODR o, int which); +YAZ_EXPORT int z_APDU(ODR o, Z_APDU **p, int opt); +YAZ_EXPORT int z_SUTRS(ODR o, Odr_oct **p, int opt); + +YAZ_EXPORT Z_InitRequest *zget_InitRequest(ODR o); +YAZ_EXPORT Z_InitResponse *zget_InitResponse(ODR o); +YAZ_EXPORT Z_SearchRequest *zget_SearchRequest(ODR o); +YAZ_EXPORT Z_SearchResponse *zget_SearchResponse(ODR o); +YAZ_EXPORT Z_PresentRequest *zget_PresentRequest(ODR o); +YAZ_EXPORT Z_PresentResponse *zget_PresentResponse(ODR o); +YAZ_EXPORT Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o); +YAZ_EXPORT Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o); +YAZ_EXPORT Z_ScanRequest *zget_ScanRequest(ODR o); +YAZ_EXPORT Z_ScanResponse *zget_ScanResponse(ODR o); +YAZ_EXPORT Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o); +YAZ_EXPORT Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o); +YAZ_EXPORT Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o); +YAZ_EXPORT Z_Close *zget_Close(ODR o); +YAZ_EXPORT int z_StringList(ODR o, Z_StringList **p, int opt); +YAZ_EXPORT int z_InternationalString(ODR o, char **p, int opt); +YAZ_EXPORT int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt); +YAZ_EXPORT int z_ElementSetName(ODR o, char **p, int opt); +YAZ_EXPORT int z_IntUnit(ODR o, Z_IntUnit **p, int opt); +YAZ_EXPORT int z_Unit(ODR o, Z_Unit **p, int opt); +YAZ_EXPORT int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt); +YAZ_EXPORT int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt); +YAZ_EXPORT int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt); +YAZ_EXPORT int z_Term(ODR o, Z_Term **p, int opt); +YAZ_EXPORT int z_Specification(ODR o, Z_Specification **p, int opt); +YAZ_EXPORT int z_Permissions(ODR o, Z_Permissions **p, int opt); +YAZ_EXPORT int z_DiagRec(ODR o, Z_DiagRec **p, int opt); +YAZ_EXPORT int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt); +YAZ_EXPORT int z_AttributeList(ODR o, Z_AttributeList **p, int opt); +YAZ_EXPORT int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt); +YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which); +YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt); + +#ifdef __cplusplus +} +#endif #include #include @@ -1353,7 +1372,10 @@ Z_APDU *zget_APDU(ODR o, int which); #include #include #include +#include +#include +#include #include #endif