X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=ec99207df31109e9ef1b6168085437b9df3875fc;hb=c7faf05cbdcd2718c695c36b2d4b3793a61c70a7;hp=a34002bfaa294a58538f99f76e0dcb42dc5438c9;hpb=189fa86838b242b5f37e5ea2db92a84935050a81;p=yaz-moved-to-github.git diff --git a/include/proto.h b/include/proto.h index a34002b..ec99207 100644 --- a/include/proto.h +++ b/include/proto.h @@ -24,7 +24,19 @@ * OF THIS SOFTWARE. * * $Log: proto.h,v $ - * Revision 1.15 1995-06-14 15:26:43 quinn + * Revision 1.19 1995-06-19 12:38:28 quinn + * Reorganized include-files. Added small features. + * + * Revision 1.18 1995/06/16 13:16:05 quinn + * Fixed Defaultdiagformat. + * + * Revision 1.17 1995/06/15 15:42:05 quinn + * Fixed some v3 bugs + * + * Revision 1.16 1995/06/15 07:45:06 quinn + * Moving to v3. + * + * Revision 1.15 1995/06/14 15:26:43 quinn * *** empty log message *** * * Revision 1.14 1995/06/07 14:42:34 quinn @@ -119,7 +131,7 @@ * apps have been updated, we'll remove the #ifdefs. */ -#define Z_V3 +#define Z_95 /* ----------------- GLOBAL AUXILIARY DEFS ----------------*/ @@ -187,6 +199,8 @@ typedef struct Z_IntUnit Z_Unit *unitUsed; } Z_IntUnit; +typedef Odr_oct Z_SUTRS; + /* ----------------- INIT SERVICE ----------------*/ typedef struct @@ -331,14 +345,12 @@ typedef struct Z_AttributeElement { int *numeric; Z_ComplexAttribute *complex; - } u; + } value; #else int *attributeValue; #endif } Z_AttributeElement; -#ifdef Z_V3 - typedef struct Z_Term { enum @@ -365,17 +377,11 @@ typedef struct Z_Term } u; } Z_Term; -#endif - typedef struct Z_AttributesPlusTerm { int num_attributes; Z_AttributeElement **attributeList; -#ifdef Z_V3 Z_Term *term; -#else - Odr_oct *term; -#endif } Z_AttributesPlusTerm; typedef struct Z_ResultSetPlusAttributes @@ -526,6 +532,13 @@ typedef struct Z_DefaultDiagFormat { Odr_oid *diagnosticSetId; /* This is opt'l to interwork with bad targets */ int *condition; + /* until the whole character set issue becomes more definite, + * you can probably ignore this on input. */ + enum + { + Z_DiagForm_v2AddInfo, + Z_DiagForm_v3AddInfo + } which; char *addinfo; } Z_DefaultDiagFormat; @@ -554,11 +567,11 @@ typedef struct Z_DiagRec #endif -typedef struct Z_DiagRecList +typedef struct Z_DiagRecs { - int num; - Z_DiagRec **list; -} Z_DiagRecList; + int num_diagRecs; + Z_DiagRec **diagRecs; +} Z_DiagRecs; typedef struct Z_NamePlusRecord { @@ -566,15 +579,13 @@ typedef struct Z_NamePlusRecord enum { Z_NamePlusRecord_databaseRecord, - Z_NamePlusRecord_surrogateDiagnostic, - Z_NamePlusRecord_multipleNonSurDiagnostics + Z_NamePlusRecord_surrogateDiagnostic } which; union { Z_DatabaseRecord *databaseRecord; Z_DiagRec *surrogateDiagnostic; - Z_DiagRecList *multipleNonSurDiagnostics; } u; } Z_NamePlusRecord; @@ -596,7 +607,7 @@ typedef struct Z_Records { Z_NamePlusRecordList *databaseOrSurDiagnostics; Z_DiagRec *nonSurrogateDiagnostic; - Z_DiagRecList *multipleNonSurDiagnostics; + Z_DiagRecs *multipleNonSurDiagnostics; } u; } Z_Records; @@ -730,6 +741,9 @@ typedef struct Z_TriggerResourceControlRequest #define Z_TriggerResourceCtrl_cancel 3 Odr_oid *prefResourceReportFormat; /* OPTIONAL */ bool_t *resultSetWanted; /* OPTIONAL */ +#ifdef Z_95 + Z_OtherInformation *otherInfo; +#endif } Z_TriggerResourceControlRequest; typedef struct Z_ResourceControlRequest @@ -743,6 +757,9 @@ typedef struct Z_ResourceControlRequest #define Z_ResourceControlRequest_none 3 bool_t *responseRequired; bool_t *triggeredRequestFlag; /* OPTIONAL */ +#ifdef Z_95 + Z_OtherInformation *otherInfo; +#endif } Z_ResourceControlRequest; typedef struct Z_ResourceControlResponse @@ -750,6 +767,9 @@ typedef struct Z_ResourceControlResponse Z_ReferenceId *referenceId; /* OPTIONAL */ bool_t *continueFlag; bool_t *resultSetWanted; /* OPTIONAL */ +#ifdef Z_95 + Z_OtherInformation *otherInfo; +#endif } Z_ResourceControlResponse; @@ -768,7 +788,7 @@ typedef struct Z_AccessControlRequest Odr_oct *simpleForm; Odr_external *externallyDefined; } u; -#ifdef Z_OTHERINFO +#ifdef Z_95 Z_OtherInformation *otherInfo; /* OPTIONAL */ #endif } Z_AccessControlRequest; @@ -787,7 +807,7 @@ typedef struct Z_AccessControlResponse Odr_external *externallyDefined; } u; Z_DiagRec *diagnostic; /* OPTIONAL */ -#ifdef Z_OTHERINFO +#ifdef Z_95 Z_OtherInformation *otherInfo; /* OPTIONAL */ #endif } Z_AccessControlResponse; @@ -854,12 +874,6 @@ typedef struct Z_Entries Z_Entry **entries; } Z_Entries; -typedef struct Z_DiagRecs -{ - int num_diagRecs; - Z_DiagRec **diagRecs; -} Z_DiagRecs; - typedef struct Z_ListEntries { enum @@ -884,6 +898,9 @@ typedef struct Z_ScanRequest int *stepSize; /* OPTIONAL */ int *numberOfTermsRequested; int *preferredPositionInResponse; /* OPTIONAL */ +#ifdef Z_95 + Z_OtherInformation *otherInfo; +#endif } Z_ScanRequest; typedef struct Z_ScanResponse @@ -902,6 +919,9 @@ typedef struct Z_ScanResponse int *positionOfTerm; /* OPTIONAL */ Z_ListEntries *entries; /* OPTIONAL */ Odr_oid *attributeSet; /* OPTIONAL */ +#ifdef Z_95 + Z_OtherInformation *otherInfo; +#endif } Z_ScanResponse; @@ -933,7 +953,7 @@ typedef struct Z_DeleteResultSetRequest #define Z_DeleteRequest_all 1 int num_ids; Z_ResultSetId **resultSetList; /* OPTIONAL */ -#ifdef Z_OTHERINFO +#ifdef Z_95 Z_OtherInformation *otherInfo; #endif } Z_DeleteResultSetRequest; @@ -948,7 +968,7 @@ typedef struct Z_DeleteResultSetResponse int num_bulkStatuses; Z_ListStatus *bulkStatuses; /* OPTIONAL */ char *deleteMessage; /* OPTIONAL */ -#ifdef Z_OTHERINFO +#ifdef Z_95 Z_OtherInformation *otherInfo; #endif } Z_DeleteResultSetResponse; @@ -972,7 +992,7 @@ typedef struct Z_Close char *diagnosticInformation; /* OPTIONAL */ Odr_oid *resourceReportFormat; /* OPTIONAL */ Odr_external *resourceReport; /* OPTIONAL */ -#ifdef Z_OTHERINFO +#ifdef Z_95 Z_OtherInformation *otherInfo; /* OPTIONAL */ #endif } Z_Close; @@ -981,9 +1001,10 @@ typedef struct Z_Close typedef struct Z_Segment { - Z_ReferenceId *referenceid; /* OPTIONAL */ + Z_ReferenceId *referenceId; /* OPTIONAL */ int *numberOfRecordsReturned; - Z_NamePlusRecord *segmentRecords; + int num_segmentRecords; + Z_NamePlusRecord **segmentRecords; Z_OtherInformation *otherInfo; /* OPTIONAL */ } Z_Segment; @@ -1031,6 +1052,7 @@ typedef struct Z_APDU } 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);