X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=z39.50%2Fz.tcl;h=c0855a6f446e333b6ffebf2c2799fc1d7b5f513b;hp=065d00022eea061dd1546c3cfeef3e67cc9ef976;hb=f98330f4a395ec9f830c39b4a4eb4e523bc0c796;hpb=161ec45b40a3ab08e08946c9654ab6fea4604760

diff --git a/z39.50/z.tcl b/z39.50/z.tcl
index 065d000..c0855a6 100644
--- a/z39.50/z.tcl
+++ b/z39.50/z.tcl
@@ -1,5 +1,5 @@
 # YC Sample Config File for Z39.50
-# $Id: z.tcl,v 1.1 1999-06-08 10:10:16 adam Exp $
+# $Id: z.tcl,v 1.11 2003-05-20 19:55:30 adam Exp $
 # ----------------------------------------------------------
 # Prefix Specifications
 #  
@@ -57,6 +57,9 @@ int z_ANY_type_0 (ODR o, void **p, int opt)
 
 # Type Name overrides
 set map($m,PDU) APDU
+set membermap($m,Operator,and) {Operator_and op_and}
+set membermap($m,Operator,or) {Operator_or op_or}
+#set membermap($m,Operator,and-not) {Operator_and_not op_and_not}
 set map($m,AttributeElement_complex) ComplexAttribute
 set map($m,DeleteSetStatus) DeleteStatus
 set membermap($m,ProximityOperator,private) {ProximityOperator_private zprivate}
@@ -131,6 +134,7 @@ set unionmap($m,OtherInformationUnit,information) {which information OtherInfo}
 set unionmap($m,OtherInformation) {num_elements list}
 set unionmap($m,Specification,elementSpec) {}
 set map($m,Specification_0) ElementSpec
+set unionmap($m,Specification,schema) {which schema Schema}
 
 # ----
 set m DiagnosticFormatDiag1
@@ -202,16 +206,16 @@ set m RecordSyntax-SUTRS
 set filename($m) z-sutrs
 #set map($m,SutrsRecord) SUTRS
 set body($m,c) {
-int z_SUTRS (ODR o, Odr_oct **p, int opt)
+int z_SUTRS (ODR o, Odr_oct **p, int opt, const char *name)
 {
-    return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL,
-        ODR_GENERALSTRING, opt);
+    return odr_implicit_tag(o, odr_octetstring, p, ODR_UNIVERSAL,
+        ODR_GENERALSTRING, opt, name);
 }
 }
 
 set init($m,h) {
 typedef Odr_oct Z_SUTRS;
-YAZ_EXPORT int z_SUTRS (ODR o, Odr_oct **p, int opt);
+YAZ_EXPORT int z_SUTRS (ODR o, Odr_oct **p, int opt, const char *name);
 }
 # ----
 set m RecordSyntax-opac
@@ -318,24 +322,27 @@ set map($m,Z3950DateSeason) DateSeason
 set map($m,Date_0) DateFlags
 set unionmap($m,DateFlags,era) {}
 # ----
+set m UserInfoFormat-multipleSearchTerms-2
+set filename($m) z-mterm2
+# ----
 set m ResourceReport-Format-Universe-1 
 set filename($m) z-univ
-
+# ----
+set m ESFormat-Admin
+set filename($m) zes-admin
+set map($m,EsRequest) ESAdminRequest
+set map($m,TaskPackage) ESAdminTaskPackage
+set map($m,OriginPartToKeep) ESAdminOriginPartToKeep
+set map($m,OriginPartNotToKeep) ESAdminOriginPartNotToKeep
+set map($m,TargetPart) ESAdminTargetPart
+# ----
+set m NegotiationRecordDefinition-charSetandLanguageNegotiation-3
+set filename($m) z-charneg
+set membermap($m,OriginProposal_0,private) {OriginProposal_0_private zprivate}
+set membermap($m,TargetResponse,private) {TargetResponse_private zprivate}
 # ----------------------------------------------------------
 # "Constructed" types defined by means of C-types are declared here.
 # Each function returns the C-handler and the C-type.
-proc asnBasicGeneralString {} {
-    return {odr_generalstring char}
-}
-
-proc asnBasicVisibleString {} {
-    return {odr_visiblestring char}
-}
-
-proc asnBasicGeneralizedTime {} {
-    return {odr_generalizedtime char}
-}
-
 proc asnBasicEXTERNAL {} {
     return {z_External Z_External}
 }