X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=6d61a122ab82b838e2fe0a19ef2a532f5a650493;hp=45735b6428e7732b6ac54d8b5a532fd9e8d4bcc0;hb=d0ef7e3d61ea8c14a8649fd199e9060039f3b7b0;hpb=1db60f5a7396b9b37560f6b6962be0b68240486c diff --git a/asn/proto.c b/asn/proto.c index 45735b6..6d61a12 100644 --- a/asn/proto.c +++ b/asn/proto.c @@ -4,7 +4,61 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: proto.c,v $ - * Revision 1.29 1995-06-15 07:44:49 quinn + * Revision 1.47 1996-05-29 15:47:50 quinn + * Fixed in bug DiagRecs decoder. Thanks to Linda Harris. + * + * Revision 1.46 1996/04/10 11:39:42 quinn + * Fixed bug in UserInfo + * + * Revision 1.45 1996/02/23 10:00:25 quinn + * Fixes to SCAN + * + * Revision 1.44 1996/02/20 12:51:41 quinn + * Completed SCAN. Fixed problems with EXTERNAL. + * + * Revision 1.43 1996/02/10 12:22:49 quinn + * Work on SCAN + * + * Revision 1.42 1996/01/22 09:46:31 quinn + * Added Sort PDU. Moved StringList to main protocol file. + * + * Revision 1.41 1996/01/10 15:21:24 quinn + * Added links to access control PDUs + * + * Revision 1.40 1996/01/02 11:46:40 quinn + * Changed 'operator' to 'roperator' to avoid C++ conflict. + * + * Revision 1.39 1995/09/29 17:11:53 quinn + * Smallish + * + * Revision 1.38 1995/09/27 15:02:40 quinn + * Modified function heads & prototypes. + * + * Revision 1.37 1995/08/21 09:10:15 quinn + * Smallish fixes to suppport new formats. + * + * Revision 1.36 1995/08/15 11:59:39 quinn + * Updated External + * + * Revision 1.35 1995/08/10 08:53:59 quinn + * Added Explain + * + * Revision 1.34 1995/06/19 17:01:48 quinn + * This should bring us in sync with the version distributed as 1.0b + * + * Revision 1.33 1995/06/19 13:39:56 quinn + * *** empty log message *** + * + * Revision 1.32 1995/06/19 12:37:28 quinn + * Fixed a bug in the compspec. + * + * Revision 1.31 1995/06/16 13:15:56 quinn + * Fixed Defaultdiagformat. + * + * Revision 1.30 1995/06/15 15:42:01 quinn + * Fixed some v3 bugs + * + * Revision 1.29 1995/06/15 07:44:49 quinn * Moving to v3. * * Revision 1.28 1995/06/14 15:26:35 quinn @@ -99,6 +153,16 @@ /* ---------------------- GLOBAL DEFS ------------------- */ +/* + * We'll use a general octetstring here, since string operations are + * clumsy on long strings. + */ +int z_SUTRS(ODR o, Odr_oct **p, int opt) +{ + return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL, + ODR_GENERALSTRING, opt); +} + int z_ReferenceId(ODR o, Z_ReferenceId **p, int opt) { return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt); @@ -116,12 +180,22 @@ int z_ResultSetId(ODR o, char **p, int opt) opt); } -int z_UserInformationField(ODR o, Odr_external **p, int opt) +int z_ElementSetName(ODR o, char **p, int opt) +{ + return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt); +} + +int z_UserInformationField(ODR o, Z_External **p, int opt) { - return odr_explicit(o, odr_external, (Odr_external **)p, ODR_CONTEXT, + return odr_explicit(o, z_External, (Z_External **)p, ODR_CONTEXT, 11, opt); } +int z_InternationalString(ODR o, char **p, int opt) +{ + return odr_generalstring(o, p, opt); +} + int z_InfoCategory(ODR o, Z_InfoCategory **p, int opt) { if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -141,7 +215,7 @@ int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo, odr_octetstring}, {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo, - odr_external}, + z_External}, {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid}, {-1, -1, -1, -1, 0} }; @@ -150,7 +224,7 @@ int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt) return opt && odr_ok(o); return odr_implicit(o, z_InfoCategory, &(*p)->category, ODR_CONTEXT, 1, 1) && - odr_choice(o, arm, &(*p)->which, &(*p)->information) && + odr_choice(o, arm, &(*p)->information, &(*p)->which) && odr_sequence_end(o); } @@ -216,6 +290,19 @@ int z_IntUnit(ODR o, Z_IntUnit **p, int opt) odr_sequence_end(o); } +int z_StringList(ODR o, Z_StringList **p, int opt) +{ + if (o->direction == ODR_DECODE) + *p = odr_malloc(o, sizeof(**p)); + else if (!*p) + return opt; + if (odr_sequence_of(o, z_InternationalString, &(*p)->strings, + &(*p)->num_strings)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + /* ---------------------- INITIALIZE SERVICE ------------------- */ #if 0 @@ -255,7 +342,7 @@ int z_IdAuthentication(ODR o, Z_IdAuthentication **p, int opt) {-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication}, {-1, -1, -1, Z_IdAuthentication_idPass, z_IdPass}, {-1, -1, -1, Z_IdAuthentication_anonymous, odr_null}, - {-1, -1, -1, Z_IdAuthentication_other, odr_external}, + {-1, -1, -1, Z_IdAuthentication_other, z_External}, {-1, -1, -1, -1, 0} }; @@ -359,7 +446,7 @@ int z_ResourceControlRequest(ODR o, Z_ResourceControlRequest **p, int opt) return z_ReferenceId(o, &(*p)->referenceId, 1) && odr_implicit(o, odr_bool, &(*p)->suspendedFlag, ODR_CONTEXT, 39, 1)&& - odr_explicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT, + odr_explicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT, 40, 1) && odr_implicit(o, odr_integer, &(*p)->partialResultsAvailable, ODR_CONTEXT, 41, 1) && @@ -390,12 +477,6 @@ int z_ResourceControlResponse(ODR o, Z_ResourceControlResponse **p, int opt) /* ------------------------ SEARCH SERVICE ----------------------- */ -int z_ElementSetName(ODR o, char **p, int opt) -{ - return odr_implicit(o, odr_visiblestring, (char**) p, ODR_CONTEXT, 103, - opt); -} - int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt) { if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -432,14 +513,12 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt) {-1, -1, -1, -1, 0} }; - if (!odr_constructed_begin(o, p, ODR_CONTEXT, 19)) - return opt && odr_ok(o); - if (o->direction == ODR_DECODE) *p = odr_malloc(o, sizeof(**p)); + else if (!*p) + return opt && odr_ok(o); - if (odr_choice(o, arm, &(*p)->u, &(*p)->which) && - odr_constructed_end(o)) + if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) return 1; *p = 0; return 0; @@ -501,7 +580,7 @@ int z_Term(ODR o, Z_Term **p, int opt) odr_visiblestring}, {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, odr_oid}, {ODR_IMPLICIT, ODR_CONTEXT, 218, Z_Term_dateTime, odr_cstring}, - {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, odr_external}, + {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, z_External}, /* add intUnit here */ {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, odr_null}, {-1, -1, -1, -1, 0} @@ -619,7 +698,7 @@ int z_Complex(ODR o, Z_Complex **p, int opt) return z_RPNStructure(o, &(*p)->s1, 0) && z_RPNStructure(o, &(*p)->s2, 0) && - z_Operator(o, &(*p)->operator, 0) && + z_Operator(o, &(*p)->roperator, 0) && odr_sequence_end(o); } @@ -714,13 +793,21 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt) int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt) { - return odr_external(o, (Odr_external **) p, opt); + return z_External(o, (Z_External **) p, opt); } #ifdef Z_95 int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt) { + static Odr_arm arm[] = + { + {-1, -1, -1, Z_DiagForm_v2AddInfo, odr_visiblestring}, + {-1, -1, -1, Z_DiagForm_v3AddInfo, z_InternationalString}, + {ODR_IMPLICIT, ODR_CONTEXT, ODR_VISIBLESTRING, Z_DiagForm_v2AddInfo, + odr_visiblestring}, /* To cater to a bug in the CNIDR servers */ + {-1, -1, -1, -1, 0} + }; if (!odr_sequence_begin(o, p, sizeof(**p))) return opt && odr_ok(o); return @@ -732,9 +819,7 @@ int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt) * We need to turn it into a choice, or something, because of * that damn generalstring in v3. */ - (odr_visiblestring(o, &(*p)->addinfo, 0) || - odr_implicit(o, odr_cstring, &(*p)->addinfo, ODR_CONTEXT, - ODR_VISIBLESTRING, 1)) && + odr_choice(o, arm, &(*p)->addinfo, &(*p)->which) && odr_sequence_end(o); } @@ -743,7 +828,7 @@ int z_DiagRec(ODR o, Z_DiagRec **p, int opt) static Odr_arm arm[] = { {-1, -1, -1, Z_DiagRec_defaultFormat, z_DefaultDiagFormat}, - {-1, -1, -1, Z_DiagRec_externallyDefined, odr_external}, + {-1, -1, -1, Z_DiagRec_externallyDefined, z_External}, {-1, -1, -1, -1, 0} }; @@ -780,6 +865,20 @@ int z_DiagRec(ODR o, Z_DiagRec **p, int opt) #endif +int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt) +{ + if (o->direction == ODR_DECODE) + *p = odr_malloc(o, sizeof(**p)); + else if (!*p) + return opt; + + if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs, + &(*p)->num_diagRecs)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt) { static Odr_arm arm[] = @@ -817,10 +916,12 @@ int z_NamePlusRecordList(ODR o, Z_NamePlusRecordList **p, int opt) int z_Records(ODR o, Z_Records **p, int opt) { - Odr_arm arm[] = + static Odr_arm arm[] = { {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, z_NamePlusRecordList}, {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, z_DiagRec}, + {ODR_IMPLICIT, ODR_CONTEXT, 205, Z_Records_multipleNSD, + z_DiagRecs}, {-1, -1, -1, -1, 0} }; @@ -843,7 +944,7 @@ int z_AccessControlRequest(ODR o, Z_AccessControlRequest **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm, odr_octetstring}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined, - odr_external}, + z_External}, {-1, -1, -1, -1, 0} }; if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -864,7 +965,7 @@ int z_AccessControlResponse(ODR o, Z_AccessControlResponse **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm, odr_octetstring}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined, - odr_external}, + z_External}, {-1, -1, -1, -1, 0} }; if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -949,6 +1050,77 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt) return opt && !o->error; } +#if 1 + +int z_ByDatabase(ODR o, Z_ByDatabase **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_DatabaseName(o, &(*p)->db, 1) && + odr_implicit(o, odr_integer, &(*p)->num, ODR_CONTEXT, 1, 1) && + z_OtherInformation(o, &(*p)->otherDbInfo, 1) && + odr_sequence_end(o); +} + +int z_ByDatabaseList(ODR o, Z_ByDatabaseList **p, int opt) +{ + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_sequence_of(o, z_ByDatabase, &(*p)->elements, &(*p)->num_elements)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_ScanOccurrences(ODR o, Z_ScanOccurrences **p, int opt) +{ + Odr_arm arm[] = + { + {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ScanOccurrences_global, odr_integer}, + {ODR_EXPLICIT, ODR_CONTEXT, 3, Z_ScanOccurrences_byDatabase, + z_ByDatabaseList}, + {-1, -1, -1, -1, 0} + }; + + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_OccurrenceByAttributesElem(ODR o, Z_OccurrenceByAttributesElem **p, + int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT, + 1, 1) && + z_ScanOccurrences(o, &(*p)->occurrences, 1) && + z_OtherInformation(o, &(*p)->otherOccurInfo, 1) && + odr_sequence_end(o); +} + +int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt) +{ + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (!odr_sequence_of(o, z_OccurrenceByAttributesElem, &(*p)->elements, + &(*p)->num_elements)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +#else + +/* + * Incomplete definition of occurencebyattributes. + */ + int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt) { if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -959,6 +1131,8 @@ int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt) odr_sequence_end(o); } +#endif + int z_TermInfo(ODR o, Z_TermInfo **p, int opt) { if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -967,6 +1141,8 @@ int z_TermInfo(ODR o, Z_TermInfo **p, int opt) (willow_scan ? odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) : z_Term(o, &(*p)->term, 0)) && + odr_implicit(o, z_InternationalString, &(*p)->displayTerm, ODR_CONTEXT, + 0, 1) && z_AttributeList(o, &(*p)->suggestedAttributes, 1) && odr_implicit(o, z_AlternativeTerm, &(*p)->alternativeTerm, ODR_CONTEXT, 4, 1) && @@ -974,6 +1150,7 @@ int z_TermInfo(ODR o, Z_TermInfo **p, int opt) 2, 1) && odr_implicit(o, z_OccurrenceByAttributes, &(*p)->byAttributes, ODR_CONTEXT, 3, 1) && + z_OtherInformation(o, &(*p)->otherTermInfo, 1) && odr_sequence_end(o); } @@ -1012,20 +1189,6 @@ int z_Entries(ODR o, Z_Entries **p, int opt) return 0; } -int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt) -{ - if (o->direction == ODR_DECODE) - *p = odr_malloc(o, sizeof(**p)); - else if (!*p) - return opt; - - if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs, - &(*p)->num_diagRecs)) - return 1; - *p = 0; - return 0; -} - int z_ListEntries(ODR o, Z_ListEntries **p, int opt) { static Odr_arm arm[] = @@ -1082,6 +1245,7 @@ int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt) odr_implicit(o, odr_integer, &(*p)->positionOfTerm, ODR_CONTEXT, 6, 1)&& odr_explicit(o, z_ListEntries, &(*p)->entries, ODR_CONTEXT, 7, 1) && odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT, 8, 1) && + z_OtherInformation(o, &(*p)->otherInfo, 1) && odr_sequence_end(o); } @@ -1136,7 +1300,7 @@ int z_ElementSpec(ODR o, Z_ElementSpec **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName, odr_visiblestring}, {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementSpec_externalSpec, - odr_external}, + z_External}, {-1, -1, -1, -1, 0} }; @@ -1193,7 +1357,7 @@ int z_RecordComposition(ODR o, Z_RecordComposition **p, int opt) { static Odr_arm arm[] = { - {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_RecordComp_simple, + {ODR_EXPLICIT, ODR_CONTEXT, 19, Z_RecordComp_simple, z_ElementSetNames}, {ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex, z_CompSpec}, @@ -1243,7 +1407,8 @@ int z_PresentRequest(ODR o, Z_PresentRequest **p, int opt) &(*p)->num_ranges) || odr_ok(o)) && z_RecordComposition(o, &(*p)->recordComposition, 1) && #else - z_ElementSetNames(o, &pp->elementSetNames, 1) && + odr_explicit(o, z_ElementSetNames, &pp->elementSetNames, ODR_CONTEXT, + 19, 1) && #endif odr_implicit(o, odr_oid, &(*p)->preferredRecordSyntax, ODR_CONTEXT, 104, 1) && @@ -1365,7 +1530,7 @@ int z_Close(ODR o, Z_Close **p, int opt) ODR_CONTEXT, 3, 1) && odr_implicit(o, odr_oid, &(*p)->resourceReportFormat, ODR_CONTEXT, 4, 1) && - odr_implicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT, + odr_implicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT, 5, 1) && #ifdef Z_95 z_OtherInformation(o, &(*p)->otherInfo, 1) && @@ -1375,6 +1540,201 @@ int z_Close(ODR o, Z_Close **p, int opt) /* ------------------------ APDU ------------------------- */ +int z_Permissions(ODR o, Z_Permissions **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + odr_implicit(o, z_InternationalString, &(*p)->userId, ODR_CONTEXT, + 1, 0) && + odr_implicit_settag(o, ODR_CONTEXT, 2) && + odr_sequence_of(o, odr_integer, &(*p)->allowableFunctions, + &(*p)->num_allowableFunctions) && + odr_sequence_end(o); +} + +int z_ExtendedServicesRequest(ODR o, Z_ExtendedServicesRequest **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_ReferenceId(o, &(*p)->referenceId, 1) && + odr_implicit(o, odr_integer, &(*p)->function, ODR_CONTEXT, 3, 0) && + odr_implicit(o, odr_oid, &(*p)->packageType, ODR_CONTEXT, 4, 0) && + odr_implicit(o, z_InternationalString, &(*p)->packageName, ODR_CONTEXT, 5, 1) && + odr_implicit(o, z_InternationalString, &(*p)->userId, ODR_CONTEXT, 6, 1) && + odr_implicit(o, z_IntUnit, &(*p)->retentionTime, ODR_CONTEXT, 7, 1) && + odr_implicit(o, z_Permissions, &(*p)->permissions, ODR_CONTEXT, 8, 1) && + odr_implicit(o, z_InternationalString, &(*p)->description, ODR_CONTEXT, 9, 1) && + odr_implicit(o, z_External, &(*p)->taskSpecificParameters, ODR_CONTEXT, 10, 1) && + odr_implicit(o, odr_integer, &(*p)->waitAction, ODR_CONTEXT, 11, 0) && + z_ElementSetName(o, &(*p)->elements, 1) && + z_OtherInformation(o, &(*p)->otherInfo, 1) && + odr_sequence_end(o); +} + +int z_ExtendedServicesResponse(ODR o, Z_ExtendedServicesResponse **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_ReferenceId(o, &(*p)->referenceId, 1) && + odr_implicit(o, odr_integer, &(*p)->operationStatus, ODR_CONTEXT, 3, 0) && + odr_implicit_settag(o, ODR_CONTEXT, 4) && + (odr_sequence_of(o, z_DiagRec, &(*p)->diagnostics, + &(*p)->num_diagnostics) || odr_ok(o)) && + odr_implicit(o, z_External, &(*p)->taskPackage, ODR_CONTEXT, 5, 1) && + z_OtherInformation(o, &(*p)->otherInfo, 1) && + odr_sequence_end(o); +} + +/* ------------------------ SORT ------------------------- */ + +int z_SortAttributes(ODR o, Z_SortAttributes **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + odr_oid(o, &(*p)->id, 0) && + z_AttributeList(o, &(*p)->list, 0) && + odr_sequence_end(o); +} + +int z_SortKey(ODR o, Z_SortKey **p, int opt) +{ + static Odr_arm arm[] = + { + {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKey_sortField, + z_InternationalString}, + {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKey_elementSpec, z_Specification}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKey_sortAttributes, + z_SortAttributes}, + {-1, -1, -1, -1, 0} + }; + + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_SortDbSpecific(ODR o, Z_SortDbSpecific **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_DatabaseName(o, &(*p)->databaseName, 0) && + z_SortKey(o, &(*p)->dbSort, 0) && + odr_sequence_end(o); +} + +int z_SortDbSpecificList(ODR o, Z_SortDbSpecificList **p, int opt) +{ + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_sequence_of(o, z_SortDbSpecific, &(*p)->dbSpecific, + &(*p)->num_dbSpecific)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_SortElement(ODR o, Z_SortElement **p, int opt) +{ + static Odr_arm arm[] = + { + {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_SortElement_generic, z_SortKey}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortElement_databaseSpecific, + z_SortDbSpecificList}, + {-1, -1, -1, -1, 0} + }; + + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_SortMissingValueAction(ODR o, Z_SortMissingValueAction **p, int opt) +{ + static Odr_arm arm[] = + { + {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortMissingValAct_abort, odr_null}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortMissingValAct_null, odr_null}, + {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortMissingValAct_valData, + odr_octetstring}, + {-1, -1, -1, -1, 0} + }; + + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_SortKeySpec(ODR o, Z_SortKeySpec **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_SortElement(o, &(*p)->sortElement, 0) && + odr_implicit(o, odr_integer, &(*p)->sortRelation, ODR_CONTEXT, 1, 0) && + odr_implicit(o, odr_integer, &(*p)->caseSensitivity, ODR_CONTEXT, + 2, 0) && + odr_explicit(o, z_SortMissingValueAction, &(*p)->missingValueAction, + ODR_CONTEXT, 3, 1) && + odr_sequence_end(o); +} + +int z_SortResponse(ODR o, Z_SortResponse **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_ReferenceId(o, &(*p)->referenceId, 1) && + odr_implicit(o, odr_integer, &(*p)->sortStatus, ODR_CONTEXT, + 3, 0) && + odr_implicit(o, odr_integer, &(*p)->resultSetStatus, ODR_CONTEXT, + 4, 1) && + odr_implicit(o, z_DiagRecs, &(*p)->diagnostics, ODR_CONTEXT, 5, 1) && + z_OtherInformation(o, &(*p)->otherInfo, 1) && + odr_sequence_end(o); +} + +int z_SortKeySpecList(ODR o, Z_SortKeySpecList **p, int opt) +{ + if (!odr_initmember(o, p, sizeof(**p))) + return opt && odr_ok(o); + if (odr_sequence_of(o, z_SortKeySpec, &(*p)->specs, &(*p)->num_specs)) + return 1; + *p = 0; + return opt && odr_ok(o); +} + +int z_SortRequest(ODR o, Z_SortRequest **p, int opt) +{ + if (!odr_sequence_begin(o, p, sizeof(**p))) + return opt && odr_ok(o); + return + z_ReferenceId(o, &(*p)->referenceId, 1) && + odr_implicit(o, z_StringList, &(*p)->inputResultSetNames, + ODR_CONTEXT, 3, 0) && + odr_implicit(o, z_InternationalString, &(*p)->sortedResultSetName, + ODR_CONTEXT, 4, 0) && + odr_implicit(o, z_SortKeySpecList, &(*p)->sortSequence, ODR_CONTEXT, + 5, 0) && + z_OtherInformation(o, &(*p)->otherInfo, 1) && + odr_sequence_end(o); +} + +/* ------------------------ APDU ------------------------- */ + int z_APDU(ODR o, Z_APDU **p, int opt) { static Odr_arm arm[] = @@ -1392,6 +1752,10 @@ int z_APDU(ODR o, Z_APDU **p, int opt) z_DeleteResultSetRequest}, {ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse, z_DeleteResultSetResponse}, + {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_APDU_accessControlRequest, + z_AccessControlRequest}, + {ODR_IMPLICIT, ODR_CONTEXT, 29, Z_APDU_accessControlResponse, + z_AccessControlResponse}, {ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest, z_ResourceControlRequest}, {ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse, @@ -1400,7 +1764,13 @@ int z_APDU(ODR o, Z_APDU **p, int opt) z_TriggerResourceControlRequest}, {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest}, {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse}, + {ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest, z_SortRequest}, + {ODR_IMPLICIT, ODR_CONTEXT, 44, Z_APDU_sortResponse, z_SortResponse}, {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, z_Segment}, + {ODR_IMPLICIT, ODR_CONTEXT, 46, Z_APDU_extendedServicesRequest, + z_ExtendedServicesRequest}, + {ODR_IMPLICIT, ODR_CONTEXT, 47, Z_APDU_extendedServicesResponse, + z_ExtendedServicesResponse}, {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close}, {-1, -1, -1, -1, 0}