X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=z39.50%2Fz3950v3.asn;fp=z39.50%2Fz3950v3.asn;h=98cf885c66662c6bcbe048302c5667f0eca0ea69;hp=d84196111dbc9cb062f98e1ea297031bf0aea130;hb=6636ca51def4b3e20a12505812397df355e2dfa2;hpb=3d47aeca3756dc7d1c2ea91f74fef2b0886f76e8

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