From 6636ca51def4b3e20a12505812397df355e2dfa2 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 10 Jul 2003 20:55:11 +0000 Subject: [PATCH] Revert z_IU0Update changes in z3950v3.asn. --- CHANGELOG | 4 ++++ z39.50/z3950v3.asn | 33 ++++++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b1ee42a..5bc7cda 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ Possible compatibility problems with earlier versions marked with '*'. +Reverted modifications for ES Update definition for z_IU0Update +(OID 1.2.840.10003.9.5.1 and 1.2.840.10003.9.5). The definition +is back to YAZ 2.0.2. + String value attributes for CCL parser. --- 2.0.3 2003/06/20 diff --git a/z39.50/z3950v3.asn b/z39.50/z3950v3.asn index d841961..98cf885 100644 --- a/z39.50/z3950v3.asn +++ b/z39.50/z3950v3.asn @@ -2401,12 +2401,11 @@ OriginPartToKeep ::= SEQUENCE{ recordInsert (1), recordReplace (2), recordDelete (3), - elementUpdate (4), - specialUpdate (5)}, + elementUpdate (4)}, databaseName [2] IMPLICIT InternationalString, schema [3] IMPLICIT OBJECT IDENTIFIER OPTIONAL, - elementSetName [4] IMPLICIT InternationalString OPTIONAL, - actionQualifier [5] IMPLICIT EXTERNAL OPTIONAL} + elementSetName [4] IMPLICIT InternationalString OPTIONAL} + OriginPartNotToKeep ::= SuppliedRecords @@ -2446,23 +2445,23 @@ CorrelationInfo ::= SEQUENCE{ id [2] IMPLICIT INTEGER OPTIONAL} TaskPackageRecordStructure ::= SEQUENCE{ - recordOrSurDiag [1] CHOICE { - record [1] IMPLICIT EXTERNAL, - -- ........ - surrogateDiagnostics [2] IMPLICIT - SEQUENCE OF DiagRec - -- Choose 'SurrogateDiagnostics', if - -- RecordStatus is failure. - } OPTIONAL, - correlationInfo [2] IMPLICIT CorrelationInfo OPTIONAL, + recordOrSurDiag [1] CHOICE { + record [1] IMPLICIT EXTERNAL, + -- Choose 'record' if recordStatus is 'success', and + -- elementSetName was supplied. + diagnostic [2] DiagRec + -- Choose 'diagnostic', if RecordStatus is failure. + } OPTIONAL, + -- The parameter recordOrSurDiag will thus be omitted only if + -- 'elementSetName' was omitted and recordStatus is + -- 'success'; or if record status is 'queued' or in 'process'. + correlationInfo [2] IMPLICIT CorrelationInfo OPTIONAL, -- This should be included if it was supplied by the origin. - recordStatus [3] IMPLICIT INTEGER{ + recordStatus [3] IMPLICIT INTEGER{ success (1), queued (2), inProcess (3), - failure (4)}, - supplementalDiagnostics [4] IMPLICIT - SEQUENCE OF DiagRec OPTIONAL} + failure (4)}} END -- 1.7.10.4