X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=z39.50%2Fz3950v3.asn;h=98cf885c66662c6bcbe048302c5667f0eca0ea69;hb=4ab240934731700f437e2bf8cb695e4b5fc9c0dc;hp=875e548cd8cc146caab827b8ddc49bc76fdfbc11;hpb=c34d71d35aceed27cf7e30e6b329a235b48b9ccd;p=yaz-moved-to-github.git

diff --git a/z39.50/z3950v3.asn b/z39.50/z3950v3.asn
index 875e548..98cf885 100644
--- a/z39.50/z3950v3.asn
+++ b/z39.50/z3950v3.asn
@@ -4,7 +4,7 @@ BEGIN   -- Z39.50 Maintenance Agency Official Text for ANSI/NISO Z39.50-1995 - J
 --
 EXPORTS OtherInformation, Term, AttributeSetId, AttributeList, AttributeElement, ElementSetName, SortElement, DatabaseName,
 CompSpec, Specification, Permissions, InternationalString, IntUnit, Unit, StringOrNumeric, Query, Records, ResultSetId,
-DefaultDiagFormat, DiagRec;
+DefaultDiagFormat, DiagRec, Segment;
 --
 
 PDU ::= CHOICE{
@@ -101,7 +101,7 @@ IdAuthentication ::=
       accessCtrl       (6),
       scan         (7),
       sort        (8), 
-      --        (9) (reserved)
+      -- (not used) (9),
       extendedServices    (10),
       level-1Segmentation    (11),
       level-2Segmentation    (12),
@@ -109,9 +109,12 @@ IdAuthentication ::=
       namedResultSets    (14),
       encapsulation    (15),
       resultCount    (16),
-      negotiationModel    (17),
-      duplicateDetection    (18),
-      queryType104    (19)}
+      negotiationModel (17),
+      duplicateDetection (18),
+      queryType104 (19),
+      pQESCorrection (20),
+      stringSchema (21)
+}
 -- end auxiliary definitions for Init PDUs
 
 
@@ -140,7 +143,9 @@ IdAuthentication ::=
         type-2      [2]  OCTET STRING,
         type-100  [100]  OCTET STRING,
         type-101  [101]  IMPLICIT RPNQuery,
-       type-102  [102]  OCTET STRING}
+       type-102  [102]  OCTET STRING,
+       type-104  [104]  IMPLICIT EXTERNAL
+}
 --
 -- Definitions for RPN query
      RPNQuery ::= SEQUENCE{
@@ -353,7 +358,10 @@ SearchResponse ::= SEQUENCE{
                -- selectAlternativeSyntax is 'true'.
         }
   Specification ::= SEQUENCE{
-  schema    [1] IMPLICIT OBJECT IDENTIFIER OPTIONAL,
+  schema CHOICE {
+              oid [1]   IMPLICIT OBJECT IDENTIFIER,
+              uri [300] IMPLICIT InternationalString
+  } OPTIONAL,
   elementSpec    [2] CHOICE{
               elementSetName   [1] IMPLICIT InternationalString,
           externalEspec  [2] IMPLICIT EXTERNAL} OPTIONAL}
@@ -557,6 +565,7 @@ SortResponse  ::= SEQUENCE{
                   unchanged  (3),
               none    (4)} OPTIONAL,
   diagnostics        [5]             IMPLICIT SEQUENCE OF DiagRec OPTIONAL,
+  resultCount        [6]             IMPLICIT INTEGER OPTIONAL,
   otherInfo        OtherInformation OPTIONAL}
 
 -- begin auxiliary definitions for Sort
@@ -1007,6 +1016,7 @@ RecordSyntax-explain
 BEGIN 
 IMPORTS AttributeSetId, Term, OtherInformation, DatabaseName, ElementSetName, IntUnit, Unit,
  StringOrNumeric, Specification, InternationalString, AttributeList, AttributeElement FROM Z39-50-APDU-1995;
+EXPORTS LanguageCode;
 
 Explain-Record ::= CHOICE{
   -- Each of these may be used as search term  when Use attribute is 'explain-category'.