Removed several auto-generated files from CVS.
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 3 Oct 2000 12:55:50 +0000 (12:55 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 3 Oct 2000 12:55:50 +0000 (12:55 +0000)
87 files changed:
asn/Makefile.am
asn/Makefile.in
asn/prt-acc.h [new file with mode: 0644]
asn/prt-add.h [new file with mode: 0644]
asn/prt-arc.h [new file with mode: 0644]
asn/prt-dat.h [new file with mode: 0644]
asn/prt-dia.h [new file with mode: 0644]
asn/prt-esp.h [new file with mode: 0644]
asn/prt-exd.h [new file with mode: 0644]
asn/prt-exp.h [new file with mode: 0644]
asn/prt-ext.h [new file with mode: 0644]
asn/prt-grs.h [new file with mode: 0644]
asn/prt-proto.h [new file with mode: 0644]
asn/prt-rsc.h [new file with mode: 0644]
asn/prt-univ.h [new file with mode: 0644]
configure
configure.in
ill/ill-core.c [deleted file]
ill/item-req.c [deleted file]
include/yaz/Makefile.am
include/yaz/Makefile.in
include/yaz/ill-core.h [deleted file]
include/yaz/item-req.h [deleted file]
include/yaz/prt-acc.h [deleted file]
include/yaz/prt-add.h [deleted file]
include/yaz/prt-arc.h [deleted file]
include/yaz/prt-dat.h [deleted file]
include/yaz/prt-dia.h [deleted file]
include/yaz/prt-esp.h [deleted file]
include/yaz/prt-exd.h [deleted file]
include/yaz/prt-exp.h [deleted file]
include/yaz/prt-grs.h [deleted file]
include/yaz/prt-proto.h [deleted file]
include/yaz/prt-rsc.h [deleted file]
include/yaz/prt-univ.h [deleted file]
include/yaz/z-accdes1.h [deleted file]
include/yaz/z-accform1.h [deleted file]
include/yaz/z-acckrb1.h [deleted file]
include/yaz/z-core.h [deleted file]
include/yaz/z-date.h [deleted file]
include/yaz/z-diag1.h [deleted file]
include/yaz/z-espec1.h [deleted file]
include/yaz/z-estask.h [deleted file]
include/yaz/z-exp.h [deleted file]
include/yaz/z-grs.h [deleted file]
include/yaz/z-opac.h [deleted file]
include/yaz/z-rrf1.h [deleted file]
include/yaz/z-rrf2.h [deleted file]
include/yaz/z-sum.h [deleted file]
include/yaz/z-sutrs.h [deleted file]
include/yaz/z-uifr1.h [deleted file]
include/yaz/z-univ.h [deleted file]
include/yaz/zes-admin.h [deleted file]
include/yaz/zes-expi.h [deleted file]
include/yaz/zes-exps.h [deleted file]
include/yaz/zes-order.h [deleted file]
include/yaz/zes-pquery.h [deleted file]
include/yaz/zes-psched.h [deleted file]
include/yaz/zes-pset.h [deleted file]
include/yaz/zes-update.h [deleted file]
include/yaz/zes-update0.h [deleted file]
z39.50/z-accdes1.c [deleted file]
z39.50/z-accform1.c [deleted file]
z39.50/z-acckrb1.c [deleted file]
z39.50/z-core.c [deleted file]
z39.50/z-date.c [deleted file]
z39.50/z-diag1.c [deleted file]
z39.50/z-espec1.c [deleted file]
z39.50/z-estask.c [deleted file]
z39.50/z-exp.c [deleted file]
z39.50/z-grs.c [deleted file]
z39.50/z-opac.c [deleted file]
z39.50/z-rrf1.c [deleted file]
z39.50/z-rrf2.c [deleted file]
z39.50/z-sum.c [deleted file]
z39.50/z-sutrs.c [deleted file]
z39.50/z-uifr1.c [deleted file]
z39.50/z-univ.c [deleted file]
z39.50/zes-admin.c [deleted file]
z39.50/zes-expi.c [deleted file]
z39.50/zes-exps.c [deleted file]
z39.50/zes-order.c [deleted file]
z39.50/zes-pquery.c [deleted file]
z39.50/zes-psched.c [deleted file]
z39.50/zes-pset.c [deleted file]
z39.50/zes-update.c [deleted file]
z39.50/zes-update0.c [deleted file]

index 570d05b..2b56b4b 100644 (file)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.3 2000-04-05 07:39:54 adam Exp $
+## $Id: Makefile.am,v 1.4 2000-10-03 12:55:50 adam Exp $
 
 noinst_LTLIBRARIES=libasn.la
 
@@ -7,4 +7,8 @@ LIBS =
 libasn_la_SOURCES = proto.c prt-rsc.c prt-acc.c prt-exp.c prt-grs.c prt-exd.c \
        prt-dia.c prt-esp.c prt-arc.c prt-add.c prt-dat.c prt-univ.c
 
+pkginclude_HEADERS = \
+       prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h \
+       prt-exp.h prt-ext.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h
+
 INCLUDES=-I$(srcdir)/../include
index f7de461..6b3a2df 100644 (file)
@@ -86,6 +86,9 @@ LIBS =
 libasn_la_SOURCES = proto.c prt-rsc.c prt-acc.c prt-exp.c prt-grs.c prt-exd.c  prt-dia.c prt-esp.c prt-arc.c prt-add.c prt-dat.c prt-univ.c
 
 
+pkginclude_HEADERS =   prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h   prt-exp.h prt-ext.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h
+
+
 INCLUDES = -I$(srcdir)/../include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
@@ -105,6 +108,8 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(pkginclude_HEADERS)
+
 DIST_COMMON =  Makefile.am Makefile.in
 
 
@@ -174,6 +179,21 @@ maintainer-clean-libtool:
 libasn.la: $(libasn_la_OBJECTS) $(libasn_la_DEPENDENCIES)
        $(LINK)  $(libasn_la_LDFLAGS) $(libasn_la_OBJECTS) $(libasn_la_LIBADD) $(LIBS)
 
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
+       @list='$(pkginclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
+       done
+
+uninstall-pkgincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       list='$(pkginclude_HEADERS)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
+       done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -266,19 +286,20 @@ installcheck: installcheck-am
 install-exec-am:
 install-exec: install-exec-am
 
-install-data-am:
+install-data-am: install-pkgincludeHEADERS
 install-data: install-data-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am:
+uninstall-am: uninstall-pkgincludeHEADERS
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
+       $(mkinstalldirs)  $(DESTDIR)$(pkgincludedir)
 
 
 mostlyclean-generic:
@@ -321,15 +342,15 @@ maintainer-clean: maintainer-clean-am
 clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-libtool maintainer-clean-libtool uninstall-pkgincludeHEADERS \
+install-pkgincludeHEADERS tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/asn/prt-acc.h b/asn/prt-acc.h
new file mode 100644 (file)
index 0000000..214b4c7
--- /dev/null
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Log: prt-acc.h,v $
+ * Revision 1.1  2000-10-03 12:55:50  adam
+ * Removed several auto-generated files from CVS.
+ *
+ * Revision 1.1  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.9  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.8  1997/09/01 08:49:51  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.7  1997/05/14 06:53:46  adam
+ * C++ support.
+ *
+ * Revision 1.6  1996/01/02 08:57:35  quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.5  1995/09/29  17:12:09  quinn
+ * Smallish
+ *
+ * Revision 1.4  1995/09/27  15:02:49  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/17  12:45:16  quinn
+ * Fixed minor problems with GRS-1. Added support in c&s.
+ *
+ * Revision 1.2  1995/08/15  12:00:13  quinn
+ * Updated External
+ *
+ * Revision 1.1  1995/06/02  09:49:49  quinn
+ * Add access control
+ *
+ *
+ */
+
+#ifndef PRT_ACC_H
+#define PRT_ACC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_Encryption1
+{
+    Odr_oct *cryptType;       /* OPTIONAL */
+    Odr_oct *credential;      /* OPTIONAL */
+    Odr_oct *data;
+} Z_Encryption1;
+
+typedef struct Z_EnumeratedPrompt1
+{
+    int *type;
+#define Z_Prompt1_groupId        0
+#define Z_Prompt1_userId         1
+#define Z_Prompt1_password       2
+#define Z_Prompt1_newPassword    3
+#define Z_Prompt1_copyright      4
+    char *suggestedString;       /* OPTIONAL */
+} Z_EnumeratedPrompt1;
+
+typedef struct Z_PromptId1
+{
+    int which;
+#define Z_PromptId1_enumeratedPrompt 0
+#define Z_PromptId1_nonEnumeratedPrompt 1
+    union
+    {
+       Z_EnumeratedPrompt1 *enumeratedPrompt;
+       char *nonEnumeratedPrompt;
+    } u;
+} Z_PromptId1;
+
+typedef struct Z_PromptInfo1
+{
+    int which;
+#define Z_Challenge1_character 0
+#define Z_Challenge1_encrypted 1
+    union
+    {
+       char *character;
+       Z_Encryption1 *encrypted;
+    } u;
+} Z_PromptInfo1;
+
+typedef struct Z_ChallengeUnit1
+{
+    Z_PromptId1 *promptId;
+    char *defaultResponse;           /* OPTIONAL */
+    Z_PromptInfo1 *promptInfo;       /* OPTIONAL */
+    char *regExpr;                   /* OPTIONAL */
+    Odr_null *responseRequired;      /* OPTIONAL */
+    int num_values;
+    char **allowedValues;            /* OPTIONAL */
+    Odr_null *shouldSave;            /* OPTIONAL */
+    int *dataType;                   /* OPTIONAL */
+#define Z_ChalDataType_integer       1
+#define Z_ChalDataType_date          2
+#define Z_ChalDataType_float         3
+#define Z_ChalDataType_alphaNumeric  4
+#define Z_ChalDataType_urlUrn        5
+#define Z_ChalDataType_boolean       6
+    Z_External *diagnostic;        /* OPTIONAL */
+} Z_ChallengeUnit1;
+
+typedef struct Z_Challenge1
+{
+    int num_challenges;
+    Z_ChallengeUnit1 **list;
+} Z_Challenge1;
+
+typedef struct Z_ResponseUnit1
+{
+    Z_PromptId1 *promptId;
+    int which;
+#define Z_Response1_string 0
+#define Z_Response1_accept 1
+#define Z_Response1_acknowledge 2
+#define Z_Response1_diagnostic 3
+#define Z_Response1_encrypted 4
+    union
+    {
+       char *string;
+       bool_t *accept;
+       Odr_null *acknowledge;
+       Z_DiagRec *diagnostic;
+       Z_Encryption1 *encrypted;
+    } u;
+} Z_ResponseUnit1;
+
+typedef struct Z_Response1
+{
+    int num_responses;
+    Z_ResponseUnit1 **list;
+} Z_Response1;
+
+typedef struct Z_PromptObject1
+{
+    int which;
+#define Z_PromptObject1_challenge 0
+#define Z_PromptObject1_response 1
+    union
+    {
+       Z_Challenge1 *challenge;
+       Z_Response1 *response;
+    } u;
+} Z_PromptObject1;
+
+YAZ_EXPORT int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt,
+                              const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-add.h b/asn/prt-add.h
new file mode 100644 (file)
index 0000000..e942d7b
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Log: prt-add.h,v $
+ * Revision 1.1  2000-10-03 12:55:50  adam
+ * Removed several auto-generated files from CVS.
+ *
+ * Revision 1.1  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.4  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.3  1997/05/14 06:53:46  adam
+ * C++ support.
+ *
+ * Revision 1.2  1997/04/30 08:52:09  quinn
+ * Null
+ *
+ * Revision 1.1  1996/10/10  11:51:58  quinn
+ * Added SerchResult additional info
+ *
+ *
+ */
+
+#ifndef PRT_ADD_H
+#define PRT_ADD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_QueryExpressionTerm
+{
+    Z_Term *queryTerm;
+    char *termComment;              /* OPTIONAL */
+} Z_QueryExpressionTerm;
+
+typedef struct Z_QueryExpression
+{
+    int which;
+#define Z_QueryExpression_term 1
+#define Z_QueryExpression_query 2
+    union {
+       Z_QueryExpressionTerm *term;
+       Z_Query *query;
+    } u;
+} Z_QueryExpression;
+
+typedef struct Z_ResultsByDBList
+{
+    int num;
+    Z_DatabaseName **elements;
+} Z_ResultsByDBList;
+
+typedef struct Z_ResultsByDB_elem
+{
+    int which;
+#define Z_ResultsByDB_all 1
+#define Z_ResultsByDB_list 2
+    union {
+        Odr_null *all;
+        Z_ResultsByDBList *list;
+    } u;
+    int *count;                           /* OPTIONAL */
+    char *resultSetName; /* OPTIONAL */
+} Z_ResultsByDB_elem;
+
+typedef struct Z_ResultsByDB
+{
+    int num;
+    Z_ResultsByDB_elem **elements;
+} Z_ResultsByDB;
+
+typedef struct Z_SearchInfoReport_elem
+{
+    char *subqueryId;                          /* OPTIONAL */
+    bool_t *fullQuery;
+    Z_QueryExpression *subqueryExpression;     /* OPTIONAL */
+    Z_QueryExpression *subqueryInterpretation; /* OPTIONAL */
+    Z_QueryExpression *subqueryRecommendation; /* OPTIONAL */
+    int *subqueryCount;                        /* OPTIONAL */
+    Z_IntUnit *subqueryWeight;                 /* OPTIONAL */
+    Z_ResultsByDB *resultsByDB;                /* OPTIONAL */
+} Z_SearchInfoReport_elem;
+
+typedef struct Z_SearchInfoReport
+{
+    int num;
+    Z_SearchInfoReport_elem **elements;
+} Z_SearchInfoReport;
+
+int z_SearchInfoReport (ODR o, Z_SearchInfoReport **p, int opt,
+                       const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-arc.h b/asn/prt-arc.h
new file mode 100644 (file)
index 0000000..df159c7
--- /dev/null
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 1995,1996 Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_ARC_H
+#define PRT_ARC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------------- Summary Record --------------------- */
+
+typedef struct Z_FormatSpec
+{
+    char *type;
+    int *size;                    /* OPTIONAL */
+    int *bestPosn;                /* OPTIONAL */
+} Z_FormatSpec;
+
+typedef struct Z_BriefBib
+{
+    char *title;
+    char *author;                  /* OPTIONAL */
+    char *callNumber;              /* OPTIONAL */
+    char *recordType;              /* OPTIONAL */
+    char *bibliographicLevel;      /* OPTIONAL */
+    int num_format;
+    Z_FormatSpec **format;         /* OPTIONAL */
+    char *publicationPlace;        /* OPTIONAL */
+    char *publicationDate;         /* OPTIONAL */
+    char *targetSystemKey;         /* OPTIONAL */
+    char *satisfyingElement;       /* OPTIONAL */
+    int *rank;                     /* OPTIONAL */
+    char *documentId;              /* OPTIONAL */
+    char *abstract;                /* OPTIONAL */
+    Z_OtherInformation *otherInfo; /* OPTIONAL */
+} Z_BriefBib;
+
+/* ------------------- OPAC Record --------------------- */
+
+typedef struct Z_CircRecord
+{
+    bool_t *availableNow;
+    char *availabilityDate;        /* OPTIONAL */
+    char *availableThru;           /* OPTIONAL */
+    char *restrictions;            /* OPTIONAL */
+    char *itemId;                  /* OPTIONAL */
+    bool_t *renewable;
+    bool_t *onHold;
+    char *enumAndChron;            /* OPTIONAL */
+    char *midspine;                /* OPTIONAL */
+    char *temporaryLocation;       /* OPTIONAL */
+} Z_CircRecord;
+
+typedef struct Z_Volume
+{
+    char *enumeration;             /* OPTIONAL */
+    char *chronology;              /* OPTIONAL */
+    char *enumAndChron;            /* OPTIONAL */
+} Z_Volume;
+
+typedef struct Z_HoldingsAndCircData
+{
+    char *typeOfRecord;            /* OPTIONAL */
+    char *encodingLevel;           /* OPTIONAL */
+    char *format;                  /* OPTIONAL */
+    char *receiptAcqStatus;        /* OPTIONAL */
+    char *generalRetention;        /* OPTIONAL */
+    char *completeness;            /* OPTIONAL */
+    char *dateOfReport;            /* OPTIONAL */
+    char *nucCode;                 /* OPTIONAL */
+    char *localLocation;           /* OPTIONAL */
+    char *shelvingLocation;        /* OPTIONAL */
+    char *callNumber;              /* OPTIONAL */
+    char *shelvingData;            /* OPTIONAL */
+    char *copyNumber;              /* OPTIONAL */
+    char *publicNote;              /* OPTIONAL */
+    char *reproductionNote;        /* OPTIONAL */
+    char *termsUseRepro;           /* OPTIONAL */
+    char *enumAndChron;            /* OPTIONAL */
+    int num_volumes;
+    Z_Volume **volumes;            /* OPTIONAL */
+    int num_circulationData;
+    Z_CircRecord **circulationData;/* OPTIONAL */
+} Z_HoldingsAndCircData;
+
+typedef struct Z_HoldingsRecord
+{
+    int which;
+#define Z_HoldingsRecord_marcHoldingsRecord    0
+#define Z_HoldingsRecord_holdingsAndCirc       1
+    union
+    {
+       Z_External *marcHoldingsRecord;
+       Z_HoldingsAndCircData *holdingsAndCirc;
+    } u;
+} Z_HoldingsRecord;
+
+typedef struct Z_OPACRecord
+{
+    Z_External *bibliographicRecord;   /* OPTIONAL */
+    int num_holdingsData;
+    Z_HoldingsRecord **holdingsData;   /* OPTIONAL */
+} Z_OPACRecord;
+
+YAZ_EXPORT int z_BriefBib(ODR o, Z_BriefBib **p, int opt, const char *name);
+YAZ_EXPORT int z_OPACRecord(ODR o, Z_OPACRecord **p, int opt,
+                           const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-dat.h b/asn/prt-dat.h
new file mode 100644 (file)
index 0000000..9e3d9b1
--- /dev/null
@@ -0,0 +1,154 @@
+/*
+ * This file is part of the YAZ toolkit:
+ * Copyright (c) 1998, Index Data.
+ * See the file LICENSE for details.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * Contribution by Ronald van Der Meer (RVDM):
+ *  Databasix Information Systems B.V., Utrecht, The Netherlands.
+ *
+ * $Log: prt-dat.h,v $
+ * Revision 1.1  2000-10-03 12:55:50  adam
+ * Removed several auto-generated files from CVS.
+ *
+ * Revision 1.1  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.2  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.1  1998/02/10 15:31:52  adam
+ * Implemented date and time structure. Changed the Update Extended
+ * Service.
+ *
+ */
+
+#ifndef __PRT_DAT_H
+#define __PRT_DAT_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_MonthAndDay
+{
+    int *month;
+    int *day;                               /* OPTIONAL */
+} Z_MonthAndDay;
+
+typedef struct Z_Quarter
+{
+    int which;
+#define Z_Quarter_first                0
+#define Z_Quarter_second       1
+#define Z_Quarter_third                2
+#define Z_Quarter_fourth       3
+    union
+    {
+       Odr_null *first;
+       Odr_null *second;
+       Odr_null *third;
+       Odr_null *fourth;
+    } u;
+} Z_Quarter;
+
+typedef struct Z_Season
+{
+    int which;
+#define Z_Season_winter                0
+#define Z_Season_spring                1
+#define Z_Season_summer                2
+#define Z_Season_autumn                3
+    union
+    {
+       Odr_null *winter;
+       Odr_null *spring;
+       Odr_null *summer;
+       Odr_null *autumn;
+    } u;
+} Z_Season;
+
+typedef struct Z_PartOfYear
+{
+    int which;
+#define Z_PartOfYear_monthAndDay       0
+#define Z_PartOfYear_julianDay         1
+#define Z_PartOfYear_weekNumber                2
+#define Z_PartOfYear_quarter           3
+#define Z_PartOfYear_season            4
+    union
+    {
+       Z_MonthAndDay *monthAndDay;
+       int *julianDay; 
+       int *weekNumber; 
+       Z_Quarter *quarter;
+       Z_Season *season;
+    } u;
+} Z_PartOfYear;
+
+typedef struct Z_Era
+{
+    int which;
+#define Z_Era_decade           0
+#define Z_Era_century          1
+#define Z_Era_millennium       2
+    union
+    {
+       Odr_null *decade;
+       Odr_null *century;
+       Odr_null *millennium;
+    } u;
+} Z_Era;
+
+typedef struct Z_DateFlags
+{
+    Odr_null *circa;                        /* OPTIONAL */
+    Z_Era *era;                             /* OPTIONAL */
+} Z_DateFlags;
+
+typedef struct Z_Date
+{
+    int *year;
+    Z_PartOfYear *partOfYear;               /* OPTIONAL */
+    Z_DateFlags *flags;                     /* OPTIONAL */
+} Z_Date;
+
+typedef struct Z_Zone
+{
+    int which;
+#define Z_Zone_local           0
+#define Z_Zone_utc             1
+#define Z_Zone_utcOffset       2
+    union
+    {
+       Odr_null *local;
+       Odr_null *utc;
+       int *utcOffset;
+    } u;
+} Z_Zone;
+
+typedef struct Z_Time
+{
+    int *hour;
+    int *minute;                            /* OPTIONAL */
+    int *second;                            /* OPTIONAL */
+    Z_IntUnit *partOfSecond;                /* OPTIONAL */
+    Z_Zone *zone;                           /* OPTIONAL */
+} Z_Time;
+
+typedef struct Z_DateTime
+{
+    Z_Date *z3950Date;                      /* OPTIONAL */
+    Z_Time *z3950Time;                      /* OPTIONAL */
+} Z_DateTime;
+
+YAZ_EXPORT int z_DateTime(ODR o, Z_DateTime **p, int opt, const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-dia.h b/asn/prt-dia.h
new file mode 100644 (file)
index 0000000..88dc8a0
--- /dev/null
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 1995-1998, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_DIA_H
+#define PRT_DIA_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_TooMany
+{
+    int *tooManyWhat;
+#define Z_TooMany_argumentWords        1
+#define Z_TooMany_truncatedWords       2
+#define Z_TooMany_booleanOperators     3
+#define Z_TooMany_incompleteSubfields  4
+#define Z_TooMany_characters           5
+#define Z_TooMany_recordsRetrieved     6
+#define Z_TooMany_databasesSpecified   7
+#define Z_TooMany_resultSetsCreated    8
+#define Z_TooMany_indexTermsProcessed  9
+    int *max;                    /* OPTIONAL */
+} Z_TooMany;
+
+typedef struct Z_BadSpec
+{
+    Z_Specification *spec;
+    char *db;                    /* OPTIONAL */
+    int num_goodOnes;
+    Z_Specification **goodOnes;  /* OPTIONAL */
+} Z_BadSpec;
+
+typedef struct Z_DbUnavailWhy
+{
+    int *reasonCode;             /* OPTIONAL */
+#define Z_DbUnavail_doesNotExist         0
+#define Z_DbUnavail_existsButUnavail     1
+#define Z_DbUnavail_locked               2
+#define Z_DbUnavail_accessDenied         3
+    char *message;               /* OPTIONAL */
+} Z_DbUnavailWhy;
+
+typedef struct Z_DbUnavail
+{
+    char *db;
+    Z_DbUnavailWhy *why;         /* OPTIONAL */
+} Z_DbUnavail;
+
+typedef struct Z_Attribute
+{
+    Odr_oid *id;
+    int *type;                   /* OPTIONAL */
+    int *value;                  /* OPTIONAL */
+    Z_Term *term;                /* OPTIONAL */
+} Z_Attribute;
+
+typedef struct Z_AttCombo
+{
+    Z_AttributeList *unsupportedCombination;
+    int num_alternatives;
+    Z_AttributeList **alternatives;    /* OPTIONAL */
+} Z_AttCombo;
+
+typedef struct Z_DiagTerm 
+{
+    int *problem;                /* OPTIONAL */
+#define Z_DiagtermProb_codedValue     1
+#define Z_DiagtermProb_unparsable     2
+#define Z_DiagtermProb_tooShort       3
+#define Z_DiagtermProb_type           4
+    Z_Term *term;
+} Z_DiagTerm;
+
+typedef struct Z_Proximity
+{
+    int which;
+#define Z_Proximity_resultSets 0
+#define Z_Proximity_badSet 1
+#define Z_Proximity_relation 2
+#define Z_Proximity_unit 3
+#define Z_Proximity_distance 4
+#define Z_Proximity_attributes 5
+#define Z_Proximity_ordered 6
+#define Z_Proximity_exclusion 7
+    union
+    {
+       Odr_null *resultSets;
+       char *badSet;
+       int *relation;
+       int *unit;
+       int *distance;
+       Z_AttributeList *attributes;
+       Odr_null *ordered;
+       Odr_null *exclusion;
+    } u;
+} Z_Proximity;
+
+typedef struct Z_AttrListList
+{
+    int num_lists;
+    Z_AttributeList *lists;
+} Z_AttrListList;
+
+typedef struct Z_Scan
+{
+    int which;
+#define Z_ScanD_nonZeroStepSize 0
+#define Z_ScanD_specifiedStepSize 1
+#define Z_ScanD_termList1 2
+#define Z_ScanD_termList2 3
+#define Z_ScanD_posInResponse 4
+#define Z_ScanD_resources 5
+#define Z_ScanD_endOfList 6
+    union
+    {
+       Odr_null *nonZeroStepSize;
+       Odr_null *specifiedStepSize;
+       Odr_null *termList1;
+       Z_AttrListList *termList2;
+       int *posInResponse;
+#define Z_ScanPosInRsp_mustBeOne         1
+#define Z_ScanPosInRsp_mustBePositive    2
+#define Z_ScanPosInRsp_mustBeNonNegative 3
+#define Z_ScanPosInRsp_other             4
+       Odr_null *resources;
+       Odr_null *endOfList;
+    } u;
+} Z_Scan;
+
+typedef struct Z_Sort
+{
+    int which;
+#define Z_SortD_sequence 0
+#define Z_SortD_noRsName 1
+#define Z_SortD_tooMany 2
+#define Z_SortD_incompatible 3
+#define Z_SortD_generic 4
+#define Z_SortD_dbSpecific 5
+#define Z_SortD_sortElement 6
+#define Z_SortD_key 7
+#define Z_SortD_action 8
+#define Z_SortD_illegal 9
+#define Z_SortD_inputTooLarge 10
+#define Z_SortD_aggregateTooLarge 11
+    union
+    {
+       Odr_null *sequence;
+       Odr_null *noRsName;
+       int *tooMany;
+       Odr_null *incompatible;
+       Odr_null *generic;
+       Odr_null *dbSpecific;
+       int *key;
+#define Z_SortKey_tooMany       1
+#define Z_SortKey_duplicate     2
+       Odr_null *action;
+       int *illegal;
+#define Z_SortIllegal_relation  1
+#define Z_SortIllegal_case      2
+#define Z_SortIllegal_action    3
+#define Z_SortIllegal_sort      4
+       Z_StringList *inputTooLarge;
+       Odr_null *aggregateTooLarge;
+    } u;
+} Z_Sort;
+
+typedef struct Z_Segmentation
+{
+    int which;
+#define Z_SegmentationD_segments 0
+    union
+    {
+       Odr_null *segments;
+    } u;
+} Z_Segmentation;
+
+typedef struct Z_ExtServices
+{
+    int which;
+#define Z_ExtServicesD_req 0
+#define Z_ExtServicesD_permission 1
+#define Z_ExtServicesD_immediate 2
+    union
+    {
+       int *req;
+#define Z_ExtSrvReq_nameInUse           1
+#define Z_ExtSrvReq_noSuchname          2
+#define Z_ExtSrvReq_quota               3
+#define Z_ExtSrvReq_type                4
+       int *permission;
+#define Z_ExtSrvPerm_id                 1
+#define Z_ExtSrvPerm_modifyDelete       2
+       int *immediate;
+#define Z_ExtSrvImm_failed              1
+#define Z_ExtSrvImm_service             2
+#define Z_ExtSrvImm_parameters          3
+    } u;
+} Z_ExtServices;
+
+typedef struct Z_OidList
+{
+    int num_oids;
+    Odr_oid **oids;
+} Z_OidList;
+
+typedef struct Z_AccessCtrl
+{
+    int which;
+#define Z_AccessCtrlD_noUser 0
+#define Z_AccessCtrlD_refused 1
+#define Z_AccessCtrlD_simple 2
+#define Z_AccessCtrlD_oid 3
+#define Z_AccessCtrlD_alternative 4
+#define Z_AccessCtrlD_pwdInv 5
+#define Z_AccessCtrlD_pwdExp 6
+    union
+    {
+       Odr_null *noUser;
+       Odr_null *refused;
+       Odr_null *simple;
+       Z_OidList *oid;
+       Z_OidList *alternative;
+       Odr_null *pwdInv;
+       Odr_null *pwdExp;
+    } u;
+} Z_AccessCtrl;
+
+typedef struct Z_RecordSyntax
+{
+    Odr_oid *unsupportedSyntax;
+    int num_suggestedAlternatives;           /* OPTIONAL */
+    Odr_oid **suggestedAlternatives;           /* OPTIONAL */
+} Z_RecordSyntax;
+
+typedef struct Z_DiagFormat
+{
+    int which;
+#define Z_DiagFormat_tooMany 0
+#define Z_DiagFormat_badSpec 1
+#define Z_DiagFormat_dbUnavail 2
+#define Z_DiagFormat_unSupOp 3
+#define Z_DiagFormat_attribute 4
+#define Z_DiagFormat_attCombo 5
+#define Z_DiagFormat_term 6
+#define Z_DiagFormat_proximity 7
+#define Z_DiagFormat_scan 8
+#define Z_DiagFormat_sort 9
+#define Z_DiagFormat_segmentation 10
+#define Z_DiagFormat_extServices 11
+#define Z_DiagFormat_accessCtrl 12
+#define Z_DiagFormat_recordSyntax 13
+    union
+    {
+       Z_TooMany *tooMany;
+       Z_BadSpec *badSpec;
+       Z_DbUnavail *dbUnavail;
+       int *unSupOp;
+#define Z_UnSupOp_and             0
+#define Z_UnSupOp_or              1
+#define Z_UnSupOp_and_not         2
+#define Z_UnSupOp_prox            3
+       Z_Attribute *attribute;
+       Z_AttributeList *attCombo;
+       Z_DiagTerm *term;
+       Z_Proximity *proximity;
+       Z_Scan *scan;
+       Z_Sort *sort;
+       Z_Segmentation *segmentation;
+       Z_ExtServices *extServices;
+       Z_AccessCtrl *accessCtrl;
+       Z_RecordSyntax *recordSyntax;
+    } u;
+} Z_DiagFormat;
+
+typedef struct Z_Diagnostic
+{
+    int which;
+#define Z_Diagnostic_defaultDiagRec 0
+#define Z_Diagnostic_explicitDiagnostic 1
+    union 
+    {
+       Z_DefaultDiagFormat *defaultDiagRec;
+       Z_DiagFormat *explicitDiagnostic;
+    } u;
+} Z_Diagnostic;
+
+typedef struct Z_DiagnosticUnit
+{
+    Z_Diagnostic *diagnostic;                    /* OPTIONAL */
+    char *message;                               /* OPTIONAL */
+} Z_DiagnosticUnit;
+
+typedef struct Z_DiagnosticFormat
+{
+    int num_diagnostics;
+    Z_DiagnosticUnit **diagnostics;
+} Z_DiagnosticFormat;
+
+YAZ_EXPORT int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt,
+                                 const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-esp.h b/asn/prt-esp.h
new file mode 100644 (file)
index 0000000..86bf403
--- /dev/null
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_ESP_H
+#define PRT_ESP_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_OccurValues
+{
+    int *start;
+    int *howMany;                     /* OPTIONAL */
+} Z_OccurValues;
+
+typedef struct Z_Occurrences
+{
+    int which;
+#define Z_Occurrences_all 0
+#define Z_Occurrences_last 1
+#define Z_Occurrences_values 2
+    union
+    {
+       Odr_null *all;
+       Odr_null *last;
+       Z_OccurValues *values;
+    } u;
+} Z_Occurrences;
+
+typedef struct Z_SpecificTag
+{
+    Odr_oid *schemaId;                      /* OPTIONAL */
+    int *tagType;                           /* OPTIONAL */
+    Z_StringOrNumeric *tagValue;
+    Z_Occurrences *occurrences;             /* OPTIONAL */
+} Z_SpecificTag;
+
+typedef struct Z_ETagUnit
+{
+    int which;
+#define Z_ETagUnit_specificTag 0
+#define Z_ETagUnit_wildThing 1
+#define Z_ETagUnit_wildPath 2
+    union
+    {
+       Z_SpecificTag *specificTag;
+       Z_Occurrences *wildThing;
+       Odr_null *wildPath;
+    } u;
+} Z_ETagUnit;
+
+typedef struct Z_ETagPath
+{
+    int num_tags;
+    Z_ETagUnit **tags;
+} Z_ETagPath;
+
+typedef struct Z_SimpleElement
+{
+    Z_ETagPath *path;
+    Z_Variant *variantRequest;           /* OPTIONAL */
+} Z_SimpleElement;
+
+typedef struct Z_CompoPrimitives
+{
+    int num_primitives;
+    char **primitives;
+} Z_CompoPrimitives;
+
+typedef struct Z_CompoSpecs
+{
+    int num_specs;
+    Z_SimpleElement **specs;
+} Z_CompoSpecs;
+
+typedef struct Z_CompositeElement
+{
+    int which;
+#define Z_CompoElement_primitives 0
+#define Z_CompoElement_specs 1
+    union
+    {
+       Z_CompoPrimitives *primitives;
+       Z_CompoSpecs *specs;
+    } elementList;
+    Z_ETagPath *deliveryTag;
+    Z_Variant *variantRequest;
+} Z_CompositeElement;
+
+typedef struct Z_ElementRequest
+{
+    int which;
+#define Z_ERequest_simpleElement 0
+#define Z_ERequest_compositeElement 1
+    union
+    {
+       Z_SimpleElement *simpleElement;
+       Z_CompositeElement *compositeElement;
+    } u;
+} Z_ElementRequest;
+
+typedef struct Z_Espec1
+{
+    int num_elementSetNames;
+    char **elementSetNames;               /* OPTIONAL */
+    Odr_oid *defaultVariantSetId;         /* OPTIONAL */
+    Z_Variant *defaultVariantRequest;     /* OPTIONAL */
+    int *defaultTagType;                  /* OPTIONAL */
+    int num_elements;
+    Z_ElementRequest **elements;           /* OPTIONAL */
+} Z_Espec1;
+
+YAZ_EXPORT int z_Espec1(ODR o, Z_Espec1 **p, int opt, const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-exd.h b/asn/prt-exd.h
new file mode 100644 (file)
index 0000000..d5b1a2a
--- /dev/null
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 1995-1998, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_EXD_H
+#define PRT_EXD_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_TaskPackage
+{
+    Odr_oid *packageType;                 
+    char *packageName;                      /* OPTIONAL */
+    char *userId;                           /* OPTIONAL */
+    Z_IntUnit *retentionTime;               /* OPTIONAL */
+    Z_Permissions *permissions;             /* OPTIONAL */
+    char *description;                      /* OPTIONAL */
+    Odr_oct *targetReference;             
+    char *creationDateTime;    /* OPTIONAL */
+    int *taskStatus;                      
+#define Z_TaskPackage_pending             0
+#define Z_TaskPackage_active              1
+#define Z_TaskPackage_complete            2
+#define Z_TaskPackage_aborted             3
+    int num_packageDiagnostics;
+    Z_DiagRec **packageDiagnostics;         /* OPTIONAL */
+    Z_External *taskSpecificParameters;   
+} Z_TaskPackage;
+
+int z_TaskPackage(ODR o, Z_TaskPackage **p, int opt, const char *name);
+
+/* ----------------------- ITEM ORDER ------------------------- */
+
+typedef struct Z_IOTargetPart
+{
+    Z_External *itemRequest;                   /* OPTIONAL */
+    Z_External *statusOrErrorReport;
+    int *auxiliaryStatus;                      /* OPTIONAL */
+#define Z_IOTargetPart_notReceived        1
+#define Z_IOTargetPart_loanQueue          2
+#define Z_IOTargetPart_forwarded          3
+#define Z_IOTargetPart_unfilledCopyright  4
+#define Z_IOTargetPart_filledCopyright    1
+} Z_IOTargetPart;
+
+typedef struct Z_IOResultSetItem
+{
+    char *resultSetId;
+    int *item;
+} Z_IOResultSetItem;
+
+typedef struct Z_IOOriginPartNotToKeep
+{
+    Z_IOResultSetItem *resultSetItem;          /* OPTIONAL */
+    Z_External *itemRequest;                   /* OPTIONAL */
+} Z_IOOriginPartNotToKeep;
+
+typedef struct Z_IOContact
+{
+    char *name;                                /* OPTIONAL */
+    char *phone;                               /* OPTIONAL */
+    char *email;                               /* OPTIONAL */
+} Z_IOContact;
+
+typedef struct Z_IOCreditCardInfo
+{
+    char *nameOnCard;
+    char *expirationDate;
+    char *cardNumber;
+} Z_IOCreditCardInfo;
+
+typedef struct Z_IOBilling
+{
+    int which;
+#define Z_IOBilling_billInvoice 0
+#define Z_IOBilling_prepay 1
+#define Z_IOBilling_depositAccount 2
+#define Z_IOBilling_creditCard 3
+#define Z_IOBilling_cardInfoPreviouslySupplied 4
+#define Z_IOBilling_privateKnown 5
+#define Z_IOBilling_privateNotKnown 6
+    union
+    {
+       Odr_null *noinfo;
+       Z_IOCreditCardInfo *creditCard;
+       Z_External *privateNotKnown;
+    } paymentMethod;
+    char *customerReference;                        /* OPTIONAL */
+    char *customerPONumber;                         /* OPTIONAL */
+} Z_IOBilling;
+
+typedef struct Z_IOOriginPartToKeep
+{
+    Z_External *supplDescription;              /* OPTIONAL */
+    Z_IOContact *contact;                      /* OPTIONAL */
+    Z_IOBilling *addlBilling;                  /* OPTIONAL */
+} Z_IOOriginPartToKeep;
+
+typedef struct Z_IORequest
+{
+    Z_IOOriginPartToKeep *toKeep;              /* OPTIONAL */
+    Z_IOOriginPartNotToKeep *notToKeep;
+} Z_IORequest;
+
+typedef struct Z_IOTaskPackage
+{
+    Z_IOOriginPartToKeep *originPart;          /* OPTIONAL */
+    Z_IOTargetPart *targetPart;
+} Z_IOTaskPackage;
+
+typedef struct Z_ItemOrder
+{
+    int which;
+#define Z_ItemOrder_esRequest 0
+#define Z_ItemOrder_taskPackage 1
+    union
+    {
+       Z_IORequest *esRequest;
+       Z_IOTaskPackage *taskPackage;
+    } u;
+} Z_ItemOrder;
+
+int z_ItemOrder(ODR o, Z_ItemOrder **p, int opt, const char *name);
+
+/* ----------------------- ITEM UPDATE ------------------------ */
+
+typedef struct Z_IUSuppliedRecordsId
+{
+    int which;
+#define Z_IUSuppliedRecordsId_timeStamp 1
+#define Z_IUSuppliedRecordsId_versionNumber 2
+#define Z_IUSuppliedRecordsId_previousVersion 3
+    union {
+        char *timeStamp;
+        char *versionNumber;
+        Odr_external *previousVersion;
+    } u;
+} Z_IUSuppliedRecordsId;
+
+typedef struct Z_IUCorrelationInfo
+{
+    char *note; /* OPTIONAL */
+    int *id; /* OPTIONAL */
+} Z_IUCorrelationInfo;
+
+typedef struct Z_IUSuppliedRecords_elem
+{
+    int which;
+#define Z_IUSuppliedRecords_number 1
+#define Z_IUSuppliedRecords_string 2
+#define Z_IUSuppliedRecords_opaque 3
+    union {
+        int *number;
+        char *string;
+        Odr_oct *opaque;
+    } u; /* OPTIONAL */
+    Z_IUSuppliedRecordsId *supplementalId; /* OPTIONAL */
+    Z_IUCorrelationInfo *correlationInfo;    /* OPTIONAL */
+    Z_External *record;
+} Z_IUSuppliedRecords_elem;
+
+typedef struct Z_IUSuppliedRecords
+{
+    int num;
+    Z_IUSuppliedRecords_elem **elements;
+} Z_IUSuppliedRecords;
+
+typedef struct Z_IUOriginPartToKeep
+{
+    int *action;
+#define Z_IUOriginPartToKeep_recordInsert 1
+#define Z_IUOriginPartToKeep_recordReplace 2
+#define Z_IUOriginPartToKeep_recordDelete 3
+#define Z_IUOriginPartToKeep_elementUpdate 4
+#define Z_IUOriginPartToKeep_specialUpdate 5
+    char *databaseName;
+    Odr_oid *schema;               /* OPTIONAL */
+    char *elementSetName;          /* OPTIONAL */
+    Odr_external *actionQualifier; /* OPTIONAL */
+} Z_IUOriginPartToKeep;
+
+typedef struct Z_IUTaskPackageRecordStructure
+{
+    int which;
+#define Z_IUTaskPackageRecordStructure_record 1
+#define Z_IUTaskPackageRecordStructure_surrogateDiagnostics 2
+    union {
+        Odr_external *record;
+        Z_DiagRecs *surrogateDiagnostics;
+    } u; /* OPTIONAL */
+    Z_IUCorrelationInfo *correlationInfo; /* OPTIONAL */
+    int *recordStatus;
+#define Z_IUTaskPackageRecordStructureS_success 1
+#define Z_IUTaskPackageRecordStructureS_queued 2
+#define Z_IUTaskPackageRecordStructureS_inProcess 3
+#define Z_IUTaskPackageRecordStructureS_failure 4
+    Z_DiagRecs *supplementalDiagnostics;  /* OPTIONAL */
+} Z_IUTaskPackageRecordStructure;
+
+typedef struct Z_IUTargetPart
+{
+    int *updateStatus;
+#define Z_IUTargetPart_success 1
+#define Z_IUTargetPart_partial 2
+#define Z_IUTargetPart_failure 3
+    int num_globalDiagnostics;
+    Z_DiagRec **globalDiagnostics; /* OPTIONAL */
+    int num_taskPackageRecords;
+    Z_IUTaskPackageRecordStructure **taskPackageRecords;
+} Z_IUTargetPart;
+
+typedef struct Z_IUUpdateEsRequest
+{
+    Z_IUOriginPartToKeep *toKeep;
+    Z_IUSuppliedRecords *notToKeep;
+} Z_IUUpdateEsRequest;
+
+typedef struct Z_IUUpdateTaskPackage
+{
+    Z_IUOriginPartToKeep *originPart;
+    Z_IUTargetPart *targetPart;
+} Z_IUUpdateTaskPackage;
+
+typedef struct Z_IUUpdate
+{
+    int which;
+#define Z_IUUpdate_esRequest 1
+#define Z_IUUpdate_taskPackage 2
+    union {
+        Z_IUUpdateEsRequest *esRequest;
+        Z_IUUpdateTaskPackage *taskPackage;
+    } u;
+} Z_IUUpdate;
+
+YAZ_EXPORT int z_IUUpdate(ODR o, Z_IUUpdate **p, int opt, const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-exp.h b/asn/prt-exp.h
new file mode 100644 (file)
index 0000000..14240a0
--- /dev/null
@@ -0,0 +1,1017 @@
+/*
+ * Copyright (c) 1995-1998, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_EXP_H
+#define PRT_EXP_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Z_CommonInfo
+{
+    char *dateAdded;           /* OPTIONAL */
+    char *dateChanged;         /* OPTIONAL */
+    char *expiry;              /* OPTIONAL */
+    char *humanStringLanguage;    /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_CommonInfo;
+
+typedef struct Z_HumanStringUnit
+{
+    char *language;               /* OPTIONAL */
+    char *text;
+} Z_HumanStringUnit;
+
+typedef struct Z_HumanString
+{
+    int num_strings;
+    Z_HumanStringUnit **strings;
+} Z_HumanString;
+
+typedef struct Z_IconObjectUnit
+{
+    int which;
+#define Z_IconObjectUnit_ianaType 0
+#define Z_IconObjectUnit_z3950type 1
+#define Z_IconObjectUnit_otherType 2
+    char *bodyType;
+    Odr_oct *content;
+} Z_IconObjectUnit;
+
+typedef struct Z_IconObject
+{
+    int num;
+    Z_IconObjectUnit **elements;
+} Z_IconObject;
+
+typedef struct Z_ContactInfo
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_HumanString *address;                 /* OPTIONAL */
+    char *email;                            /* OPTIONAL */
+    char *phone;                            /* OPTIONAL */
+} Z_ContactInfo;
+
+typedef struct Z_NetworkAddressIA
+{
+    char *hostAddress;
+    int *port;
+} Z_NetworkAddressIA;
+
+typedef struct Z_NetworkAddressOPA
+{
+    char *pSel;
+    char *sSel;                  /* OPTIONAL */
+    char *tSel;                  /* OPTIONAL */
+    char *nSap;
+} Z_NetworkAddressOPA;
+
+typedef struct Z_NetworkAddressOther
+{
+    char *type;
+    char *address;
+} Z_NetworkAddressOther;
+
+typedef struct Z_NetworkAddress
+{
+    int which;
+#define Z_NetworkAddress_iA 0
+#define Z_NetworkAddress_oPA 1
+#define Z_NetworkAddress_other 2
+    union
+    {
+       Z_NetworkAddressIA *internetAddress;
+       Z_NetworkAddressOPA *osiPresentationAddress;
+       Z_NetworkAddressOther *other;
+    } u;
+} Z_NetworkAddress;
+
+typedef struct Z_PrivateCapOperator
+{
+    char *roperator;
+    Z_HumanString *description;             /* OPTIONAL */
+} Z_PrivateCapOperator;
+    
+typedef struct Z_SearchKey
+{
+    char *searchKey;
+    Z_HumanString *description;             /* OPTIONAL */
+} Z_SearchKey;
+
+typedef struct Z_PrivateCapabilities
+{
+    int num_operators;
+    Z_PrivateCapOperator **operators;      /* OPTIONAL */
+    int num_searchKeys;
+    Z_SearchKey **searchKeys;               /* OPTIONAL */
+    int num_description;
+    Z_HumanString **description;            /* OPTIONAL */
+} Z_PrivateCapabilities;
+
+typedef struct Z_ProxSupportPrivate
+{
+    int *unit;
+    Z_HumanString *description;             /* OPTIONAL */
+} Z_ProxSupportPrivate;
+
+typedef struct Z_ProxSupportUnit
+{
+    int which;
+#define Z_ProxSupportUnit_known 0
+#define Z_ProxSupportUnit_private 1
+    union
+    {
+       int *known;
+       Z_ProxSupportPrivate *zprivate;
+    } u;
+} Z_ProxSupportUnit;
+
+typedef struct Z_ProximitySupport
+{
+    bool_t *anySupport;
+    int num_unitsSupported;
+    Z_ProxSupportUnit **unitsSupported;     /* OPTIONAL */
+} Z_ProximitySupport;
+
+typedef struct Z_RpnCapabilities
+{
+    int num_operators;
+    int **operators;                        /* OPTIONAL */
+    bool_t *resultSetAsOperandSupported;
+    bool_t *restrictionOperandSupported;
+    Z_ProximitySupport *proximity;          /* OPTIONAL */
+} Z_RpnCapabilities;
+
+typedef struct Z_Iso8777Capabilities
+{
+    int num_searchKeys;
+    Z_SearchKey **searchKeys;
+    Z_HumanString *restrictions;            /* OPTIONAL */
+} Z_Iso8777Capabilities;
+
+typedef struct Z_QueryTypeDetails
+{
+    int which;
+#define Z_QueryTypeDetails_private 0
+#define Z_QueryTypeDetails_rpn 1
+#define Z_QueryTypeDetails_iso8777 2
+#define Z_QueryTypeDetails_z39_58 3
+#define Z_QueryTypeDetails_erpn 4
+#define Z_QueryTypeDetails_rankedList 5
+    union
+    {
+       Z_PrivateCapabilities *zprivate;
+       Z_RpnCapabilities *rpn;
+       Z_Iso8777Capabilities *iso8777;
+       Z_HumanString *z3958;
+       Z_RpnCapabilities *erpn;
+       Z_HumanString *rankedList;
+    } u;
+} Z_QueryTypeDetails;
+
+typedef struct Z_AccessRestrictionsUnit
+{
+    int *accessType;
+#define Z_AccessRestrictionsUnit_any                 0
+#define Z_AccessRestrictionsUnit_search              1
+#define Z_AccessRestrictionsUnit_present             2
+#define Z_AccessRestrictionsUnit_specific_elements   3
+#define Z_AccessRestrictionsUnit_extended_services   4
+#define Z_AccessRestrictionsUnit_by_database         5
+    Z_HumanString *accessText;              /* OPTIONAL */
+    int num_accessChallenges;
+    Odr_oid **accessChallenges;             /* OPTIONAL */
+} Z_AccessRestrictionsUnit;
+
+typedef struct Z_AccessRestrictions
+{
+    int num;
+    Z_AccessRestrictionsUnit **elements;
+} Z_AccessRestrictions;
+
+typedef struct Z_Charge
+{
+    Z_IntUnit *cost;
+    Z_Unit *perWhat;                        /* OPTIONAL */
+    Z_HumanString *text;                    /* OPTIONAL */
+} Z_Charge;
+
+typedef struct Z_CostsOtherCharge
+{
+    Z_HumanString *forWhat;
+    Z_Charge *charge;
+} Z_CostsOtherCharge;
+
+typedef struct Z_Costs
+{
+    Z_Charge *connectCharge;                /* OPTIONAL */
+    Z_Charge *connectTime;                  /* OPTIONAL */
+    Z_Charge *displayCharge;                /* OPTIONAL */
+    Z_Charge *searchCharge;                 /* OPTIONAL */
+    Z_Charge *subscriptCharge;              /* OPTIONAL */
+    int num_otherCharges;
+    Z_CostsOtherCharge **otherCharges;      /* OPTIONAL */
+} Z_Costs;
+
+typedef struct Z_AccessInfo
+{
+    int num_queryTypesSupported;
+    Z_QueryTypeDetails **queryTypesSupported;  /* OPTIONAL */
+    int num_diagnosticsSets;
+    Odr_oid **diagnosticsSets;              /* OPTIONAL */
+    int num_attributeSetIds;
+    Odr_oid **attributeSetIds;     /* OPTIONAL */
+    int num_schemas;
+    Odr_oid **schemas;                      /* OPTIONAL */
+    int num_recordSyntaxes;
+    Odr_oid **recordSyntaxes;               /* OPTIONAL */
+    int num_resourceChallenges;
+    Odr_oid **resourceChallenges;           /* OPTIONAL */
+    Z_AccessRestrictions *restrictedAccess;  /* OPTIONAL */
+    Z_Costs *costInfo;                      /* OPTIONAL */
+    int num_variantSets;
+    Odr_oid **variantSets;                  /* OPTIONAL */
+    int num_elementSetNames;
+    char **elementSetNames;     /* OPTIONAL */
+    int num_unitSystems;
+    char **unitSystems;                     /* OPTIONAL */
+} Z_AccessInfo;
+
+typedef struct Z_DatabaseList
+{
+    int num_databases;
+    Z_DatabaseName **databases;
+} Z_DatabaseList;
+
+typedef struct Z_AttributeValueList
+{
+    int num_attributes;
+    Z_StringOrNumeric **attributes;
+} Z_AttributeValueList;
+
+typedef struct Z_AttributeOccurrence
+{
+    Odr_oid *attributeSet;         /* OPTIONAL */
+    int *attributeType;
+    Odr_null *mustBeSupplied;               /* OPTIONAL */
+    int which;
+#define Z_AttributeOcc_any_or_none 0
+#define Z_AttributeOcc_specific 1
+    union
+    {
+       Odr_null *any_or_none;
+       Z_AttributeValueList *specific;
+    } attributeValues;
+} Z_AttributeOccurrence;
+
+typedef struct Z_AttributeCombination
+{
+    int num_occurrences;
+    Z_AttributeOccurrence **occurrences;
+} Z_AttributeCombination;
+
+typedef struct Z_AttributeCombinations
+{
+    Odr_oid *defaultAttributeSet;
+    int num_legalCombinations;
+    Z_AttributeCombination **legalCombinations;
+} Z_AttributeCombinations;
+
+typedef struct Z_AttributeValue
+{
+    Z_StringOrNumeric *value;
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_subAttributes;
+    Z_StringOrNumeric **subAttributes;      /* OPTIONAL */
+    int num_superAttributes;
+    Z_StringOrNumeric **superAttributes;    /* OPTIONAL */
+    Odr_null *partialSupport;               /* OPTIONAL */
+} Z_AttributeValue;
+
+typedef struct Z_TargetInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * key elements
+     */
+    char *name;
+    /*
+     * non-key brief elements
+     */
+    Z_HumanString *recentNews;             /* OPTIONAL */
+    Z_IconObject *icon;                     /* OPTIONAL */
+    bool_t *namedResultSets;
+    bool_t *multipleDBsearch;
+    int *maxResultSets;                     /* OPTIONAL */
+    int *maxResultSize;                     /* OPTIONAL */
+    int *maxTerms;                          /* OPTIONAL */
+    Z_IntUnit *timeoutInterval;             /* OPTIONAL */
+    Z_HumanString *welcomeMessage;          /* OPTIONAL */
+    /*
+     * non-brief elements
+     */
+    Z_ContactInfo *contactInfo;             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_nicknames;
+    char **nicknames;
+    Z_HumanString *usageRest;              /* OPTIONAL */
+    Z_HumanString *paymentAddr;             /* OPTIONAL */
+    Z_HumanString *hours;                   /* OPTIONAL */
+    int num_dbCombinations;
+    Z_DatabaseList **dbCombinations;        /* OPTIONAL */
+    int num_addresses;
+    Z_NetworkAddress **addresses;           /* OPTIONAL */
+    int num_languages;
+    char **languages;                       /* OPTIONAL */
+
+    Z_AccessInfo *commonAccessInfo;         /* OPTIONAL */
+} Z_TargetInfo;
+
+typedef struct Z_DatabaseInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Z_DatabaseName *name;
+    /* 
+     * Non-key elements.
+     */
+    Odr_null *explainDatabase;              /* OPTIONAL */
+    int num_nicknames;
+    Z_DatabaseName **nicknames;             /* OPTIONAL */
+    Z_IconObject *icon;                     /* OPTIONAL */
+    bool_t *userFee;
+    bool_t *available;
+    Z_HumanString *titleString;             /* OPTIONAL */
+    /*
+     * Non-brief elements.
+     */
+    int num_keywords;
+    Z_HumanString **keywords;               /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_DatabaseList *associatedDbs;          /* OPTIONAL */
+    Z_DatabaseList *subDbs;                 /* OPTIONAL */
+    Z_HumanString *disclaimers;             /* OPTIONAL */
+    Z_HumanString *news;                    /* OPTIONAL */
+
+#if 1
+    int which;
+    union {
+       int *actualNumber;
+       int *approxNumber;
+#define Z_DatabaseInfo_actualNumber 1
+#define Z_DatabaseInfo_approxNumber 2
+    } u; /* OPT */
+
+#else
+    int recordCount_which;
+#define Z_DatabaseInfo_actualNumber 0
+#define Z_DatabaseInfo_approxNumber 1
+    int *recordCount;                       /* OPTIONAL */
+#endif
+    Z_HumanString *defaultOrder;            /* OPTIONAL */
+    int *avRecordSize;                      /* OPTIONAL */
+    int *maxRecordSize;                     /* OPTIONAL */
+    Z_HumanString *hours;                   /* OPTIONAL */
+    Z_HumanString *bestTime;                /* OPTIONAL */
+    char *lastUpdate;          /* OPTIONAL */
+    Z_IntUnit *updateInterval;              /* OPTIONAL */
+    Z_HumanString *coverage;                /* OPTIONAL */
+    bool_t *proprietary;                    /* OPTIONAL */
+    Z_HumanString *copyrightText;           /* OPTIONAL */
+    Z_HumanString *copyrightNotice;         /* OPTIONAL */
+    Z_ContactInfo *producerContactInfo;     /* OPTIONAL */
+    Z_ContactInfo *supplierContactInfo;     /* OPTIONAL */
+    Z_ContactInfo *submissionContactInfo;   /* OPTIONAL */
+    Z_AccessInfo *accessInfo;               /* OPTIONAL */
+} Z_DatabaseInfo;
+
+typedef struct Z_TagTypeMapping
+{
+    int *tagType;
+    Odr_oid *tagSet;                        /* OPTIONAL */
+    Odr_null *defaultTagType;               /* OPTIONAL */
+} Z_TagTypeMapping;
+
+typedef struct Z_PathUnit
+{
+    int *tagType;
+    Z_StringOrNumeric *tagValue;
+} Z_PathUnit;
+
+typedef struct Z_Path
+{
+    int num;
+    Z_PathUnit **list;
+} Z_Path;
+
+struct Z_ElementDataType;
+typedef struct Z_ElementDataType Z_ElementDataType;
+
+typedef struct Z_ElementInfo
+{
+    char *elementName;
+    Z_Path *elementTagPath;
+    Z_ElementDataType *dataType;            /* OPTIONAL */
+    bool_t *required;
+    bool_t *repeatable;
+    Z_HumanString *description;             /* OPTIONAL */
+} Z_ElementInfo;
+
+typedef struct Z_ElementInfoList
+{
+    int num;
+    Z_ElementInfo **list;
+} Z_ElementInfoList;
+
+struct Z_ElementDataType
+{
+    int which;
+#define Z_ElementDataType_primitive 0
+#define Z_ElementDataType_structured 1
+    union
+    {
+       int *primitive;
+#define Z_PrimitiveDataType_octetString         0
+#define Z_PrimitiveDataType_numeric             1
+#define Z_PrimitiveDataType_date                2
+#define Z_PrimitiveDataType_external            3
+#define Z_PrimitiveDataType_string              4
+#define Z_PrimitiveDataType_trueOrFalse         5
+#define Z_PrimitiveDataType_oid                 6
+#define Z_PrimitiveDataType_intUnit             7
+#define Z_PrimitiveDataType_empty               8
+#define Z_PrimitiveDataType_noneOfTheAbove      100
+       Z_ElementInfoList *structured;
+    } u;
+};
+
+typedef struct Z_TagSetInfoElements
+{
+    char *elementname;
+    int num_nicknames;
+    char **nicknames;                       /* OPTIONAL */
+    Z_StringOrNumeric *elementTag;
+    Z_HumanString *description;             /* OPTIONAL */
+    int *dataType;                          /* OPTIONAL */
+    /* (value as in Z_PrimitiveElement) */
+    Z_OtherInformation *otherTagInfo;       /* OPTIONAL */
+} Z_TagSetInfoElements;
+
+typedef struct Z_SchemaInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Odr_oid *schema;
+    /*
+     * Non-key elements
+     */
+    char *name;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_tagTypeMapping;
+    Z_TagTypeMapping **tagTypeMapping;      /* OPTIONAL */
+    int num_recordStructure;
+    Z_ElementInfo **recordStructure;        /* OPTIONAL */
+} Z_SchemaInfo;
+
+
+typedef struct Z_TagSetInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Odr_oid *tagSet;
+    /*
+     * Non-key elements
+     */
+    char *name;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_elements;
+    Z_TagSetInfoElements **elements;        /* OPTIONAL */
+} Z_TagSetInfo;
+
+typedef struct Z_RecordSyntaxInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Odr_oid *recordSyntax;
+    /*
+     * Non-key elements
+     */
+    char *name;
+    /*
+     * Non-brief elements
+     */
+    int num_transferSyntaxes;
+    Odr_oid **transferSyntaxes;             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    char *asn1Module;                       /* OPTIONAL */
+    int num_abstractStructure;
+    Z_ElementInfo **abstractStructure;      /* OPTIONAL */
+} Z_RecordSyntaxInfo;
+
+typedef struct Z_AttributeDescription
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_StringOrNumeric *attributeValue;
+    int num_equivalentAttributes;
+    Z_StringOrNumeric **equivalentAttributes; /* OPTIONAL */
+} Z_AttributeDescription;
+
+typedef struct Z_AttributeType
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    int *attributeType;
+    int num_attributeValues;
+    Z_AttributeDescription **attributeValues;
+} Z_AttributeType;
+
+typedef struct Z_AttributeSetInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Odr_oid *attributeSet;
+    /*
+     * Non-key elements
+     */
+    char *name;
+    /*
+     * Non-brief elements
+     */
+    int num_attributes;
+    Z_AttributeType **attributes;           /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+} Z_AttributeSetInfo;
+
+typedef struct Z_TermListElement
+{
+    char *name;
+    Z_HumanString *title;                   /* OPTIONAL */
+    int *searchCost;                        /* OPTIONAL */
+#define Z_TermListElement_optimized           0
+#define Z_TermListElement_normal              1
+#define Z_TermListElement_expensive           2
+#define Z_TermListElement_filter              3
+    bool_t *scanable;
+    int num_broader;
+    char **broader;                         /* OPTIONAL */
+    int num_narrower;
+    char **narrower;                        /* OPTIONAL */
+} Z_TermListElement;
+
+typedef struct Z_TermListInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Z_DatabaseName *databaseName;
+    /*
+     * Non-key elements
+     */
+    int num_termLists;
+    Z_TermListElement **termLists;
+} Z_TermListInfo;
+
+typedef struct Z_ExtendedServicesInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Odr_oid *type;
+    /*
+     * Non-key elements
+     */
+    char *name;                             /* OPTIONAL */
+    bool_t *privateType;
+    bool_t *restrictionsApply;
+    bool_t *feeApply;
+    bool_t *available;
+    bool_t *retentionSupported;
+    int *waitAction;
+#define Z_ExtendedServicesInfo_waitSupported       1
+#define Z_ExtendedServicesInfo_waitAlways          2
+#define Z_ExtendedServicesInfo_waitNotSupported    3
+#define Z_ExtendedServicesInfo_depends             4
+#define Z_ExtendedServicesInfo_notSaying           5
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_External *specificExplain;          /* OPTIONAL */
+    char *esASN;                            /* OPTIONAL */
+} Z_ExtendedServicesInfo;
+
+typedef struct Z_OmittedAttributeInterpretation
+{
+    Z_StringOrNumeric *defaultValue;        /* OPTIONAL */
+    Z_HumanString *defaultDescription;      /* OPTIONAL */
+} Z_OmittedAttributeInterpretation;
+
+typedef struct Z_AttributeTypeDetails
+{
+    int *attributeType;
+    Z_OmittedAttributeInterpretation *defaultIfOmitted;  /* OPTIONAL */
+    int num_attributeValues;
+    Z_AttributeValue **attributeValues;     /* OPTIONAL */
+} Z_AttributeTypeDetails;
+
+typedef struct Z_AttributeSetDetails
+{
+    Odr_oid *attributeSet;
+    int num_attributesByType;
+    Z_AttributeTypeDetails **attributesByType;
+} Z_AttributeSetDetails;
+
+typedef struct Z_AttributeDetails
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key details
+     */
+    Z_DatabaseName *databaseName;
+    /*
+     * Non-brief elements
+     */
+    int num_attributesBySet;
+    Z_AttributeSetDetails **attributesBySet;  /* OPTIONAL */
+    Z_AttributeCombinations *attributeCombinations;  /* OPTIONAL */
+} Z_AttributeDetails;
+
+typedef struct Z_EScanInfo
+{
+    int *maxStepSize;                       /* OPTIONAL */
+    Z_HumanString *collatingSequence;       /* OPTIONAL */
+    bool_t *increasing;                     /* OPTIONAL */
+} Z_EScanInfo;
+
+typedef struct Z_TermListDetails
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    char *termListName;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_AttributeCombinations *attributes;    /* OPTIONAL */
+    Z_EScanInfo *scanInfo;                  /* OPTIONAL */
+    int *estNumberTerms;                    /* OPTIONAL */
+    int num_sampleTerms;
+    Z_Term **sampleTerms;                   /* OPTIONAL */
+} Z_TermListDetails;
+
+typedef struct Z_RecordTag
+{
+    Z_StringOrNumeric *qualifier;           /* OPTIONAL */
+    Z_StringOrNumeric *tagValue;
+} Z_RecordTag;
+
+typedef struct Z_PerElementDetails
+{
+    char *name;                             /* OPTIONAL */
+    Z_RecordTag *recordTag;                 /* OPTIONAL */
+    int num_schemaTags;
+    Z_Path **schemaTags;                    /* OPTIONAL */
+    int *maxSize;                           /* OPTIONAL */
+    int *minSize;                           /* OPTIONAL */
+    int *avgSize;                           /* OPTIONAL */
+    int *fixedSize;                         /* OPTIONAL */
+    bool_t *repeatable;
+    bool_t *required;
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_HumanString *contents;                /* OPTIONAL */
+    Z_HumanString *billingInfo;             /* OPTIONAL */
+    Z_HumanString *restrictions;            /* OPTIONAL */
+    int num_alternateNames;
+    char **alternateNames;                  /* OPTIONAL */
+    int num_genericNames;
+    char **genericNames;                    /* OPTIONAL */
+    Z_AttributeCombinations *searchAccess;  /* OPTIONAL */
+} Z_PerElementDetails;
+
+typedef struct Z_ElementSetDetails
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Z_DatabaseName *databaseName;
+    char *elementSetName;
+    Odr_oid *recordSyntax;
+    /*
+     * Brief elements
+     */
+    Odr_oid *schema;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_detailsPerElement;
+    Z_PerElementDetails **detailsPerElement;  /* OPTIONAL */
+} Z_ElementSetDetails;
+
+typedef struct Z_RetrievalRecordDetails
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Z_DatabaseName *databaseName;
+    Odr_oid *schema;
+    Odr_oid *recordSyntax;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_detailsPerElement;
+    Z_PerElementDetails **detailsPerElement;  /* OPTIONAL */
+} Z_RetrievalRecordDetails;
+
+typedef struct Z_SortKeyDetails
+{
+    Z_HumanString *description;                        /* OPTIONAL */
+    int num_elementSpecifications;
+    Z_Specification **elementSpecifications;           /* OPTIONAL */
+    Z_AttributeCombinations *attributeSpecifications;  /* OPTIONAL */
+    int which;
+#define Z_SortKeyDetails_character 0
+#define Z_SortKeyDetails_numeric 1
+#define Z_SortKeyDetails_structured 2
+    union
+    {
+       Odr_null *character;
+       Odr_null *numeric;
+       Z_HumanString *structured;
+    } u;
+    int *caseSensitivity;                              /* OPTIONAL */
+#define Z_SortKeyDetails_always              0
+#define Z_SortKeyDetails_never               1
+#define Z_SortKeyDetails_default_yes         2
+#define Z_SortKeyDetails_default_no          3
+} Z_SortKeyDetails;
+
+typedef struct Z_SortDetails
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Z_DatabaseName *databaseName;
+    /* 
+     * Non-brief elements
+     */
+    int num_sortKeys;
+    Z_SortKeyDetails **sortKeys;            /* OPTIONAL */
+} Z_SortDetails;
+
+typedef struct Z_ProcessingInformation
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Z_DatabaseName *databaseName;
+    int *processingContext;
+#define Z_ProcessingInformation_access               0
+#define Z_ProcessingInformation_search               1
+#define Z_ProcessingInformation_retrieval            2
+#define Z_ProcessingInformation_record_presentation  3
+#define Z_ProcessingInformation_record_handling      4
+    char *name;
+    Odr_oid *oid;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_External *instructions;             /* OPTIONAL */
+} Z_ProcessingInformation;
+
+typedef struct Z_ValueDescription
+{
+    int which;
+#define Z_ValueDescription_integer 0
+#define Z_ValueDescription_string 1
+#define Z_ValueDescription_octets 2
+#define Z_ValueDescription_oid 3
+#define Z_ValueDescription_unit 4
+#define Z_ValueDescription_valueAndUnit 5
+    union
+    {
+       int *integer;
+       char *string;
+       Odr_oct *octets;
+       Odr_oid *oid;
+       Z_Unit *unit;
+       Z_IntUnit *valueAndUnit;
+    } u;
+} Z_ValueDescription;
+
+typedef struct Z_ValueRange
+{
+    Z_ValueDescription *lower;              /* OPTIONAL */
+    Z_ValueDescription *upper;              /* OPTIONAL */
+} Z_ValueRange;
+
+typedef struct Z_ValueSetEnumerated
+{
+    int num;
+    Z_ValueDescription **elements;
+} Z_ValueSetEnumerated;
+
+typedef struct Z_ValueSet
+{
+    int which;
+#define Z_ValueSet_range 0
+#define Z_ValueSet_enumerated 1
+    union
+    {
+       Z_ValueRange *range;
+       Z_ValueSetEnumerated *enumerated;
+    } u;
+} Z_ValueSet;
+
+typedef struct Z_VariantValue
+{
+    int *dataType;
+    Z_ValueSet *values;                     /* OPTIONAL */
+} Z_VariantValue;
+
+typedef struct Z_VariantType
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    int *variantType;
+    Z_VariantValue *variantValue;           /* OPTIONAL */
+} Z_VariantType;
+
+typedef struct Z_VariantClass
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    int *variantClass;
+    int num_variantTypes;
+    Z_VariantType **variantTypes;
+} Z_VariantClass;
+
+typedef struct Z_VariantSetInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    Odr_oid *variantSet;
+    /*
+     * Brief elements
+     */
+    char *name;
+    /*
+     * Non-brief elements
+     */
+    int num_variants;
+    Z_VariantClass **variants;              /* OPTIONAL */
+} Z_VariantSetInfo;
+
+typedef struct Z_Units
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_StringOrNumeric *unit;
+} Z_Units;
+
+typedef struct Z_UnitType
+{
+    char *name;                             /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    Z_StringOrNumeric *unitType;
+    int num_units;
+    Z_Units **units;
+} Z_UnitType;
+
+typedef struct Z_UnitInfo
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    /*
+     * Key elements
+     */
+    char *unitSystem;
+    /*
+     * Non-brief elements
+     */
+    Z_HumanString *description;             /* OPTIONAL */
+    int num_units;
+    Z_UnitType **units;                     /* OPTIONAL */
+} Z_UnitInfo;
+
+typedef struct Z_CategoryInfo
+{
+    char *category;
+    char *originalCategory;                 /* OPTIONAL */
+    Z_HumanString *description;             /* OPTIONAL */
+    char *asn1Module;                       /* OPTIONAL */
+} Z_CategoryInfo;
+
+typedef struct Z_CategoryList
+{
+    Z_CommonInfo *commonInfo;               /* OPTIONAL */
+    int num_categories;
+    Z_CategoryInfo **categories;
+} Z_CategoryList;
+
+typedef struct Z_ExplainRecord
+{
+    int which;
+#define Z_Explain_targetInfo 0
+#define Z_Explain_databaseInfo 1
+#define Z_Explain_schemaInfo 2
+#define Z_Explain_tagSetInfo 3
+#define Z_Explain_recordSyntaxInfo 4
+#define Z_Explain_attributeSetInfo 5
+#define Z_Explain_termListInfo 6
+#define Z_Explain_extendedServicesInfo 7
+#define Z_Explain_attributeDetails 8
+#define Z_Explain_termListDetails 9
+#define Z_Explain_elementSetDetails 10
+#define Z_Explain_retrievalRecordDetails 11
+#define Z_Explain_sortDetails 12
+#define Z_Explain_processing 13
+#define Z_Explain_variants 14
+#define Z_Explain_units 15
+#define Z_Explain_categoryList 16
+    union
+    {
+       Z_TargetInfo *targetInfo;
+       Z_DatabaseInfo *databaseInfo;
+       Z_SchemaInfo *schemaInfo;
+       Z_TagSetInfo *tagSetInfo;
+       Z_RecordSyntaxInfo *recordSyntaxInfo;
+       Z_AttributeSetInfo *attributeSetInfo;
+       Z_TermListInfo *termListInfo;
+       Z_ExtendedServicesInfo *extendedServicesInfo;
+       Z_AttributeDetails *attributeDetails;
+       Z_TermListDetails *termListDetails;
+       Z_ElementSetDetails *elementSetDetails;
+       Z_RetrievalRecordDetails *retrievalRecordDetails;
+       Z_SortDetails *sortDetails;
+       Z_ProcessingInformation *processing;
+       Z_VariantSetInfo *variants;
+       Z_UnitInfo *units;
+       Z_CategoryList *categoryList;
+    } u;
+} Z_ExplainRecord;
+
+YAZ_EXPORT int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt,
+                              const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-ext.h b/asn/prt-ext.h
new file mode 100644 (file)
index 0000000..d3e5bf8
--- /dev/null
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 1995-1999, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+/*
+ * Biased-choice External for Z39.50.
+ */
+
+#ifndef PRT_EXT_H
+#define PRT_EXT_H
+
+#include <yaz/yconfig.h>
+#include <yaz/oid.h>
+
+
+YAZ_BEGIN_CDECL
+
+/*
+ * Used to keep track of known External definitions (a loose approach
+ * to DEFINED_BY).
+ */
+
+typedef struct Z_ext_typeent
+{
+    oid_value dref;    /* the direct-reference OID value. */
+    int what;          /* discriminator value for the external CHOICE */
+    Odr_fun fun;       /* decoder function */
+} Z_ext_typeent;
+
+struct Z_External
+{
+    Odr_oid *direct_reference;
+    int *indirect_reference;
+    char *descriptor;
+    int which;
+/* Generic types */
+#define Z_External_single 0
+#define Z_External_octet 1
+#define Z_External_arbitrary 2
+/* Specific types */
+#define Z_External_sutrs 3
+#define Z_External_explainRecord 4
+#define Z_External_resourceReport1 5
+#define Z_External_resourceReport2 6
+#define Z_External_promptObject1 7
+#define Z_External_grs1 8
+#define Z_External_extendedService 9
+#define Z_External_itemOrder 10
+#define Z_External_diag1 11
+#define Z_External_espec1 12
+#define Z_External_summary 13
+#define Z_External_OPAC 14
+#define Z_External_searchResult1 15
+#define Z_External_update 16
+#define Z_External_dateTime 17
+#define Z_External_universeReport 18
+#define Z_External_ESAdmin 19
+    union
+    {
+       /* Generic types */
+       Odr_any *single_ASN1_type;
+       Odr_oct *octet_aligned;
+       Odr_bitmask *arbitrary;
+
+       /* Specific types */
+       Z_SUTRS *sutrs;
+       Z_ExplainRecord *explainRecord;
+       Z_ResourceReport1 *resourceReport1;
+       Z_ResourceReport2 *resourceReport2;
+       Z_PromptObject1 *promptObject1;
+       Z_GenericRecord *grs1;
+       Z_TaskPackage *extendedService;
+       Z_ItemOrder *itemOrder;
+       Z_DiagnosticFormat *diag1;
+       Z_Espec1 *espec1;
+       Z_BriefBib *summary;
+       Z_SearchInfoReport *searchResult1;
+       Z_IUUpdate *update;
+       Z_DateTime *dateTime;
+        Z_UniverseReport *universeReport;
+#ifdef ASN_COMPILED
+        Z_Admin *adminService;
+#endif
+    } u;
+};
+
+
+YAZ_EXPORT int z_External(ODR o, Z_External **p, int opt, const char *name);
+YAZ_EXPORT Z_ext_typeent *z_ext_getentbyref(oid_value val);
+YAZ_EXPORT Z_External *z_ext_record(ODR o, int format, const char *buf,
+                                   int len);
+
+YAZ_END_CDECL
+
+#endif
diff --git a/asn/prt-grs.h b/asn/prt-grs.h
new file mode 100644 (file)
index 0000000..c7f5f07
--- /dev/null
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 1995-1998, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_GRS_H
+#define PRT_GRS_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Z_GenericRecord;
+typedef struct Z_GenericRecord Z_GenericRecord;
+
+typedef struct Z_ElementData
+{
+    int which;
+#define Z_ElementData_octets 0
+#define Z_ElementData_numeric 1
+#define Z_ElementData_date 2
+#define Z_ElementData_ext 3
+#define Z_ElementData_string 4
+#define Z_ElementData_trueOrFalse 5
+#define Z_ElementData_oid 6
+#define Z_ElementData_intUnit 7
+#define Z_ElementData_elementNotThere 8
+#define Z_ElementData_elementEmpty 9
+#define Z_ElementData_noDataRequested 10
+#define Z_ElementData_diagnostic 11
+#define Z_ElementData_subtree 12
+    union
+    {
+       Odr_oct *octets;                      
+       int *numeric;                         
+       char *date;             
+       Z_External *ext;                     
+       char *string;                         
+       bool_t *trueOrFalse;                  
+       Odr_oid *oid;                         
+       Z_IntUnit *intUnit;                  
+       Odr_null *elementNotThere;            
+       Odr_null *elementEmpty;               
+       Odr_null *noDataRequested;            
+       Z_External *diagnostic;              
+       Z_GenericRecord *subtree;            
+    } u;
+} Z_ElementData;
+
+typedef struct Z_Order
+{
+    bool_t *ascending;                    
+    int *order;                           
+} Z_Order;
+
+typedef struct Z_Usage
+{
+    int *type;                            
+#define Z_Usage_redistributable     1
+#define Z_Usage_restricted          2
+#define Z_Usage_licensePointer      3
+    char *restriction;                      /* OPTIONAL */
+} Z_Usage;
+
+typedef struct Z_HitVector
+{
+    Z_Term *satisfier;                      /* OPTIONAL */
+    Z_IntUnit *offsetIntoElement;           /* OPTIONAL */
+    Z_IntUnit *length;                      /* OPTIONAL */
+    int *hitRank;                           /* OPTIONAL */
+    Odr_oct *targetToken;                   /* OPTIONAL */
+} Z_HitVector;
+
+typedef struct Z_Triple
+{
+    Odr_oid *variantSetId;                  /* OPTIONAL */
+    int *zclass;
+    int *type;
+    int which;
+#define Z_Triple_integer 0
+#define Z_Triple_internationalString 1
+#define Z_Triple_octetString 2
+#define Z_Triple_oid 3
+#define Z_Triple_boolean 4
+#define Z_Triple_null 5
+#define Z_Triple_unit 6
+#define Z_Triple_valueAndUnit 7
+    union
+    {
+       int *integer;
+       char *internationalString;
+       Odr_oct *octetString;
+       Odr_oid *oid;
+       bool_t *zboolean;
+       Odr_null *null;
+       Z_Unit *unit;
+       Z_IntUnit *valueAndUnit;
+    } value;
+} Z_Triple;
+
+typedef struct Z_Variant
+{
+    Odr_oid *globalVariantSetId;            /* OPTIONAL */
+    int num_triples;
+    Z_Triple **triples;
+} Z_Variant;
+
+typedef struct Z_TagUnit
+{
+    int *tagType;                           /* OPTIONAL */
+    Z_StringOrNumeric *tagValue;         
+    int *tagOccurrence;                     /* OPTIONAL */
+} Z_TagUnit;
+
+typedef struct Z_TagPath
+{
+    int num_tags;
+    Z_TagUnit **tags;
+} Z_TagPath;
+
+typedef struct Z_ElementMetaData
+{
+    Z_Order *seriesOrder;                   /* OPTIONAL */
+    Z_Usage *usageRight;                    /* OPTIONAL */
+    int num_hits;
+    Z_HitVector **hits;                     /* OPTIONAL */
+    char *displayName;                      /* OPTIONAL */
+    int num_supportedVariants;
+    Z_Variant **supportedVariants;          /* OPTIONAL */
+    char *message;                          /* OPTIONAL */
+    Odr_oct *elementDescriptor;             /* OPTIONAL */
+    Z_TagPath *surrogateFor;                /* OPTIONAL */
+    Z_TagPath *surrogateElement;            /* OPTIONAL */
+    Z_External *other;                      /* OPTIONAL */
+} Z_ElementMetaData;
+
+typedef struct Z_TaggedElement
+{
+    int *tagType;                           /* OPTIONAL */
+    Z_StringOrNumeric *tagValue;         
+    int *tagOccurrence;                     /* OPTIONAL */
+    Z_ElementData *content;              
+    Z_ElementMetaData *metaData;            /* OPTIONAL */
+    Z_Variant *appliedVariant;              /* OPTIONAL */
+} Z_TaggedElement;
+
+struct Z_GenericRecord
+{
+    int num_elements;
+    Z_TaggedElement **elements;
+};
+
+YAZ_EXPORT int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt,
+                              const char *name);
+YAZ_EXPORT int z_Variant(ODR o, Z_Variant **p, int opt,
+                        const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-proto.h b/asn/prt-proto.h
new file mode 100644 (file)
index 0000000..f83d1f3
--- /dev/null
@@ -0,0 +1,1164 @@
+/*
+ * Copyright (c) 1995-2000, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Id: prt-proto.h,v 1.1 2000-10-03 12:55:50 adam Exp $
+ */
+
+#ifndef PRT_PROTO_H
+#define PRT_PROTO_H
+
+#include <yaz/yconfig.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
+#include <yaz/yaz-version.h>
+
+YAZ_BEGIN_CDECL
+
+/* ----------------- GLOBAL AUXILIARY DEFS ----------------*/
+
+struct Z_External;
+typedef struct Z_External Z_External;
+
+typedef Odr_oct Z_ReferenceId;
+typedef char Z_DatabaseName;
+typedef char Z_ResultSetId;
+typedef Odr_oct Z_ResultsetId;
+
+typedef struct Z_InfoCategory
+{
+    Odr_oid *categoryTypeId;         /* OPTIONAL */
+    int *categoryValue;
+} Z_InfoCategory;
+
+typedef struct Z_OtherInformationUnit
+{
+    Z_InfoCategory *category;        /* OPTIONAL */
+    int which;
+#define Z_OtherInfo_characterInfo 0
+#define Z_OtherInfo_binaryInfo 1
+#define Z_OtherInfo_externallyDefinedInfo 2
+#define Z_OtherInfo_oid 3
+    union
+    {
+       char *characterInfo; 
+       Odr_oct *binaryInfo;
+       Z_External *externallyDefinedInfo;
+       Odr_oid *oid;
+    } information;
+} Z_OtherInformationUnit;
+
+typedef struct Z_OtherInformation
+{
+    int num_elements;
+    Z_OtherInformationUnit **list;
+} Z_OtherInformation;
+
+typedef struct Z_StringOrNumeric
+{
+    int which;
+#define Z_StringOrNumeric_string 0
+#define Z_StringOrNumeric_numeric 1
+    union
+    {
+       char *string;
+       int *numeric;
+    } u;
+} Z_StringOrNumeric;
+
+typedef struct Z_Unit
+{
+    char *unitSystem;               /* OPTIONAL */
+    Z_StringOrNumeric *unitType;    /* OPTIONAL */
+    Z_StringOrNumeric *unit;        /* OPTIONAL */
+    int *scaleFactor;               /* OPTIONAL */
+} Z_Unit;
+
+typedef struct Z_IntUnit
+{
+    int *value;
+    Z_Unit *unitUsed;
+} Z_IntUnit;
+
+typedef Odr_oct Z_SUTRS;
+
+typedef struct Z_StringList
+{
+    int num_strings;
+    char **strings;
+} Z_StringList;
+
+/* ----------------- INIT SERVICE  ----------------*/
+
+typedef struct
+{
+    char *groupId;       /* OPTIONAL */
+    char *userId;         /* OPTIONAL */
+    char *password;      /* OPTIONAL */
+} Z_IdPass;
+
+typedef struct Z_IdAuthentication
+{
+    int which;
+#define Z_IdAuthentication_open 0
+#define Z_IdAuthentication_idPass 1
+#define Z_IdAuthentication_anonymous 2
+#define Z_IdAuthentication_other 3
+    union
+    {
+       char *open;
+       Z_IdPass *idPass;
+       Odr_null *anonymous;
+       Z_External *other;
+    } u;
+} Z_IdAuthentication;
+
+#define Z_ProtocolVersion_1               0
+#define Z_ProtocolVersion_2               1
+#define Z_ProtocolVersion_3               2
+
+#define Z_Options_search                  0
+#define Z_Options_present                 1
+#define Z_Options_delSet                  2
+#define Z_Options_resourceReport          3
+#define Z_Options_triggerResourceCtrl     4
+#define Z_Options_resourceCtrl            5
+#define Z_Options_accessCtrl              6
+#define Z_Options_scan                    7
+#define Z_Options_sort                    8
+#define Z_Options_reserved                9
+#define Z_Options_extendedServices       10
+#define Z_Options_level_1Segmentation    11
+#define Z_Options_level_2Segmentation    12
+#define Z_Options_concurrentOperations   13
+#define Z_Options_namedResultSets        14
+
+typedef struct Z_InitRequest
+{
+    Z_ReferenceId *referenceId;                   /* OPTIONAL */
+    Odr_bitmask *protocolVersion;
+    Odr_bitmask *options;
+    int *preferredMessageSize;
+    int *maximumRecordSize;
+    Z_IdAuthentication* idAuthentication;        /* OPTIONAL */
+    char *implementationId;                      /* OPTIONAL */
+    char *implementationName;                    /* OPTIONAL */
+    char *implementationVersion;                 /* OPTIONAL */
+    Z_External *userInformationField;            /* OPTIONAL */
+    Z_OtherInformation *otherInfo;               /* OPTIONAL */
+} Z_InitRequest;
+
+typedef struct Z_InitResponse
+{
+    Z_ReferenceId *referenceId;    /* OPTIONAL */
+    Odr_bitmask *protocolVersion;
+    Odr_bitmask *options;
+    int *preferredMessageSize;
+    int *maximumRecordSize;
+    bool_t *result;
+    char *implementationId;      /* OPTIONAL */
+    char *implementationName;    /* OPTIONAL */
+    char *implementationVersion; /* OPTIONAL */
+    Z_External *userInformationField; /* OPTIONAL */
+    Z_OtherInformation *otherInfo;    /* OPTIONAL */
+} Z_InitResponse;
+
+typedef struct Z_NSRAuthentication
+{
+    char *user;
+    char *password;
+    char *account;
+} Z_NSRAuthentication;
+
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt,
+                       const char *name);
+
+int z_StrAuthentication(ODR o, char **p, int opt, const char *name);
+
+/* ------------------ SEARCH SERVICE ----------------*/
+
+typedef struct Z_DatabaseSpecificUnit
+{
+    char *databaseName;
+    char *elementSetName;
+} Z_DatabaseSpecificUnit;
+
+typedef struct Z_DatabaseSpecific
+{
+    int num_elements;
+    Z_DatabaseSpecificUnit **elements;
+} Z_DatabaseSpecific;
+
+typedef struct Z_ElementSetNames
+{
+    int which;
+#define Z_ElementSetNames_generic 0
+#define Z_ElementSetNames_databaseSpecific 1
+    union
+    {
+        char *generic;
+        Z_DatabaseSpecific *databaseSpecific;
+    } u;
+} Z_ElementSetNames;
+
+/* ---------------------- RPN QUERY --------------------------- */
+
+typedef struct Z_ComplexAttribute
+{
+    int num_list;
+    Z_StringOrNumeric **list;
+    int num_semanticAction;
+    int **semanticAction;           /* OPTIONAL */
+} Z_ComplexAttribute;
+
+typedef struct Z_AttributeElement
+{
+    Odr_oid *attributeSet;           /* OPTIONAL - v3 only */
+    int *attributeType;
+    int which;
+#define Z_AttributeValue_numeric 0
+#define Z_AttributeValue_complex 1
+    union
+    {
+       int *numeric;
+       Z_ComplexAttribute *complex;
+    } value;
+} Z_AttributeElement;
+
+typedef struct Z_Term 
+{
+    int which;
+#define Z_Term_general 0
+#define Z_Term_numeric 1
+#define Z_Term_characterString 2
+#define Z_Term_oid 3
+#define Z_Term_dateTime 4
+#define Z_Term_external 5
+#define Z_Term_integerAndUnit 6
+#define Z_Term_null 7
+    union
+    {
+       Odr_oct *general; /* this is required for v2 */
+       int *numeric;
+       char *characterString;
+       Odr_oid *oid;
+       char *dateTime;
+       Z_External *external;
+       /* Z_IntUnit *integerAndUnit; */
+       Odr_null *null;
+    } u;
+} Z_Term;
+
+typedef struct Z_AttributesPlusTerm
+{
+    int num_attributes;
+    Z_AttributeElement **attributeList;
+    Z_Term *term;
+} Z_AttributesPlusTerm;
+
+typedef struct Z_ResultSetPlusAttributes
+{
+    char *resultSet;
+    int num_attributes;
+    Z_AttributeElement **attributeList;
+} Z_ResultSetPlusAttributes;
+
+typedef struct Z_ProximityOperator
+{
+    bool_t *exclusion;          /* OPTIONAL */
+    int *distance;
+    bool_t *ordered;
+    int *relationType;
+#define Z_Prox_lessThan           1
+#define Z_Prox_lessThanOrEqual    2
+#define Z_Prox_equal              3
+#define Z_Prox_greaterThanOrEqual 4
+#define Z_Prox_greaterThan        5
+#define Z_Prox_notEqual           6
+    int which;
+#define Z_ProxCode_known 0
+#define Z_ProxCode_private 1
+    int *proximityUnitCode;
+#define Z_ProxUnit_character       1
+#define Z_ProxUnit_word            2
+#define Z_ProxUnit_sentence        3
+#define Z_ProxUnit_paragraph       4
+#define Z_ProxUnit_section         5
+#define Z_ProxUnit_chapter         6
+#define Z_ProxUnit_document        7
+#define Z_ProxUnit_element         8
+#define Z_ProxUnit_subelement      9
+#define Z_ProxUnit_elementType    10
+#define Z_ProxUnit_byte           11   /* v3 only */
+} Z_ProximityOperator;
+
+typedef struct Z_Operator
+{
+    int which;
+#define Z_Operator_and 0
+#define Z_Operator_or 1
+#define Z_Operator_and_not 2
+#define Z_Operator_prox 3
+    union
+    {
+       Odr_null *and;          /* these guys are nulls. */
+       Odr_null *or;
+       Odr_null *and_not;
+       Z_ProximityOperator *prox;
+    } u;
+} Z_Operator;
+
+typedef struct Z_Operand
+{
+    int which;
+#define Z_Operand_APT 0
+#define Z_Operand_resultSetId 1
+#define Z_Operand_resultAttr             /* v3 only */ 2
+    union
+    {
+       Z_AttributesPlusTerm *attributesPlusTerm;
+       Z_ResultSetId *resultSetId;
+       Z_ResultSetPlusAttributes *resultAttr;
+    } u;
+} Z_Operand;
+
+typedef struct Z_Complex
+{
+    struct Z_RPNStructure *s1;
+    struct Z_RPNStructure *s2;
+    Z_Operator *roperator;
+} Z_Complex;
+
+typedef struct Z_RPNStructure
+{
+    int which;
+#define Z_RPNStructure_simple 0
+#define Z_RPNStructure_complex 1
+    union
+    {
+       Z_Operand *simple;
+       Z_Complex *complex;
+    } u;
+} Z_RPNStructure;
+
+typedef struct Z_RPNQuery
+{
+    Odr_oid *attributeSetId;
+    Z_RPNStructure *RPNStructure;
+} Z_RPNQuery;
+
+/* -------------------------- SEARCHREQUEST -------------------------- */
+
+typedef struct Z_Query
+{
+    int which;
+#define Z_Query_type_1 1
+#define Z_Query_type_2 2
+#define Z_Query_type_101 3
+    union
+    {
+       Z_RPNQuery *type_1;
+       Odr_oct *type_2;
+       Z_RPNQuery *type_101;
+    } u;
+} Z_Query;
+
+typedef struct Z_SearchRequest
+{
+    Z_ReferenceId *referenceId;   /* OPTIONAL */
+    int *smallSetUpperBound;
+    int *largeSetLowerBound;
+    int *mediumSetPresentNumber;
+    bool_t *replaceIndicator;
+    char *resultSetName;
+    int num_databaseNames;
+    char **databaseNames;
+    Z_ElementSetNames *smallSetElementSetNames;    /* OPTIONAL */
+    Z_ElementSetNames *mediumSetElementSetNames;    /* OPTIONAL */
+    Odr_oid *preferredRecordSyntax;  /* OPTIONAL */
+    Z_Query *query;
+    Z_OtherInformation *additionalSearchInfo;       /* OPTIONAL */
+    Z_OtherInformation *otherInfo;                  /* OPTIONAL */
+} Z_SearchRequest;
+
+/* ------------------------ RECORD -------------------------- */
+
+typedef Z_External Z_DatabaseRecord;
+
+typedef struct Z_DefaultDiagFormat
+{
+    Odr_oid *diagnosticSetId; /* This is opt'l to interwork with bad targets */
+    int *condition;
+    /* until the whole character set issue becomes more definite,
+     * you can probably ignore this on input. */
+    int which;
+#define Z_DiagForm_v2AddInfo 0
+#define Z_DiagForm_v3AddInfo 1
+    char *addinfo;
+} Z_DefaultDiagFormat;
+
+typedef struct Z_DiagRec
+{
+    int which;
+#define Z_DiagRec_defaultFormat 0
+#define Z_DiagRec_externallyDefined 1
+    union
+    {
+       Z_DefaultDiagFormat *defaultFormat;
+       Z_External *externallyDefined;
+    } u;
+} Z_DiagRec;
+
+typedef struct Z_DiagRecs
+{
+    int num_diagRecs;
+    Z_DiagRec **diagRecs;
+} Z_DiagRecs;
+
+typedef struct Z_NamePlusRecord
+{
+    char *databaseName;      /* OPTIONAL */
+    int which;
+#define Z_NamePlusRecord_databaseRecord 0
+#define Z_NamePlusRecord_surrogateDiagnostic 1
+    union
+    {
+       Z_DatabaseRecord *databaseRecord;
+       Z_DiagRec *surrogateDiagnostic;
+    } u;
+} Z_NamePlusRecord;
+
+typedef struct Z_NamePlusRecordList
+{
+    int num_records;
+    Z_NamePlusRecord **records;
+} Z_NamePlusRecordList;
+
+typedef struct Z_Records
+{
+    int which;
+#define Z_Records_DBOSD 0
+#define Z_Records_NSD 1
+#define Z_Records_multipleNSD 2
+    union
+    {
+       Z_NamePlusRecordList *databaseOrSurDiagnostics;
+       Z_DiagRec *nonSurrogateDiagnostic;
+       Z_DiagRecs *multipleNonSurDiagnostics;
+    } u;
+} Z_Records;
+
+/* ------------------------ SEARCHRESPONSE ------------------ */
+
+typedef struct Z_SearchResponse
+{
+    Z_ReferenceId *referenceId;       /* OPTIONAL */
+    int *resultCount;
+    int *numberOfRecordsReturned;
+    int *nextResultSetPosition;
+    bool_t *searchStatus;
+    int *resultSetStatus;              /* OPTIONAL */
+#define Z_RES_SUBSET        1
+#define Z_RES_INTERIM       2
+#define Z_RES_NONE          3
+    int *presentStatus;                /* OPTIONAL */
+#define Z_PRES_SUCCESS      0
+#define Z_PRES_PARTIAL_1    1
+#define Z_PRES_PARTIAL_2    2
+#define Z_PRES_PARTIAL_3    3
+#define Z_PRES_PARTIAL_4    4
+#define Z_PRES_FAILURE      5
+    Z_Records *records;                  /* OPTIONAL */
+    Z_OtherInformation *additionalSearchInfo;
+    Z_OtherInformation *otherInfo;
+} Z_SearchResponse;
+
+/* ------------------------- PRESENT SERVICE -----------------*/
+
+typedef struct Z_ElementSpec
+{
+    int which;
+#define Z_ElementSpec_elementSetName 0
+#define Z_ElementSpec_externalSpec 1
+    union
+    {
+       char *elementSetName;
+       Z_External *externalSpec;
+    } u;
+} Z_ElementSpec;
+
+typedef struct Z_Specification
+{
+    Odr_oid *schema;                  /* OPTIONAL */
+    Z_ElementSpec *elementSpec;       /* OPTIONAL */
+} Z_Specification;
+
+typedef struct Z_DbSpecific
+{
+    char *databaseName;
+    Z_Specification *spec;
+} Z_DbSpecific;
+
+typedef struct Z_CompSpec
+{
+    bool_t *selectAlternativeSyntax;
+    Z_Specification *generic;            /* OPTIONAL */
+    int num_dbSpecific;
+    Z_DbSpecific **dbSpecific;           /* OPTIONAL */
+    int num_recordSyntax;
+    Odr_oid **recordSyntax;              /* OPTIONAL */
+} Z_CompSpec;
+
+typedef struct Z_RecordComposition
+{
+    int which;
+#define Z_RecordComp_simple 0
+#define Z_RecordComp_complex 1
+    union
+    {
+       Z_ElementSetNames *simple;
+       Z_CompSpec *complex;
+    } u;
+} Z_RecordComposition;
+
+typedef struct Z_Range
+{
+    int *startingPosition;
+    int *numberOfRecords;
+} Z_Range;
+
+typedef struct Z_PresentRequest
+{
+    Z_ReferenceId *referenceId;              /* OPTIONAL */
+    Z_ResultSetId *resultSetId;
+    int *resultSetStartPoint;
+    int *numberOfRecordsRequested;
+    int num_ranges;
+    Z_Range **additionalRanges;              /* OPTIONAL */
+    Z_RecordComposition *recordComposition;  /* OPTIONAL */
+    Odr_oid *preferredRecordSyntax;  /* OPTIONAL */
+    int *maxSegmentCount;                 /* OPTIONAL */
+    int *maxRecordSize;                   /* OPTIONAL */
+    int *maxSegmentSize;                  /* OPTIONAL */
+    Z_OtherInformation *otherInfo;        /* OPTIONAL */
+} Z_PresentRequest;
+
+typedef struct Z_PresentResponse
+{
+    Z_ReferenceId *referenceId;        /* OPTIONAL */
+    int *numberOfRecordsReturned;
+    int *nextResultSetPosition;
+    int *presentStatus;
+    Z_Records *records;
+    Z_OtherInformation *otherInfo;     /* OPTIONAL */
+} Z_PresentResponse;
+
+/* ------------------ RESOURCE CONTROL ----------------*/
+
+typedef struct Z_TriggerResourceControlRequest
+{
+    Z_ReferenceId *referenceId;    /* OPTIONAL */
+    int *requestedAction;
+#define Z_TriggerResourceCtrl_resourceReport  1
+#define Z_TriggerResourceCtrl_resourceControl 2
+#define Z_TriggerResourceCtrl_cancel          3
+    Odr_oid *prefResourceReportFormat;  /* OPTIONAL */
+    bool_t *resultSetWanted;            /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_TriggerResourceControlRequest;
+
+typedef struct Z_ResourceControlRequest
+{
+    Z_ReferenceId *referenceId;    /* OPTIONAL */
+    bool_t *suspendedFlag;         /* OPTIONAL */
+    Z_External *resourceReport; /* OPTIONAL */
+    int *partialResultsAvailable;  /* OPTIONAL */
+#define Z_ResourceControlRequest_subset    1
+#define Z_ResourceControlRequest_interim   2
+#define Z_ResourceControlRequest_none      3
+    bool_t *responseRequired;
+    bool_t *triggeredRequestFlag;  /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_ResourceControlRequest;
+
+typedef struct Z_ResourceControlResponse
+{
+    Z_ReferenceId *referenceId;    /* OPTIONAL */
+    bool_t *continueFlag;
+    bool_t *resultSetWanted;       /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_ResourceControlResponse;
+
+
+/* ------------------ ACCESS CTRL SERVICE ----------------*/
+
+typedef struct Z_AccessControlRequest
+{
+    Z_ReferenceId *referenceId;           /* OPTIONAL */
+    int which;
+#define Z_AccessRequest_simpleForm 0
+#define Z_AccessRequest_externallyDefined 1
+    union
+    {
+       Odr_oct *simpleForm;
+       Z_External *externallyDefined;
+    } u;
+    Z_OtherInformation *otherInfo;           /* OPTIONAL */
+} Z_AccessControlRequest;
+
+typedef struct Z_AccessControlResponse
+{
+    Z_ReferenceId *referenceId;              /* OPTIONAL */
+    int which;
+#define Z_AccessResponse_simpleForm 0
+#define Z_AccessResponse_externallyDefined 1
+    union
+    {
+       Odr_oct *simpleForm;
+       Z_External *externallyDefined;
+    } u;
+    Z_DiagRec *diagnostic;                   /* OPTIONAL */
+    Z_OtherInformation *otherInfo;           /* OPTIONAL */
+} Z_AccessControlResponse;
+
+/* ------------------------ SCAN SERVICE -------------------- */
+
+typedef struct Z_AttributeList
+{
+    int num_attributes;
+    Z_AttributeElement **attributes;
+} Z_AttributeList;
+
+typedef struct Z_AlternativeTerm
+{
+    int num_terms;
+    Z_AttributesPlusTerm **terms;
+} Z_AlternativeTerm;
+
+typedef struct Z_ByDatabase
+{
+    char *db;
+    int *num;                           /* OPTIONAL */
+    Z_OtherInformation *otherDbInfo;    /* OPTIONAL */
+} Z_ByDatabase;
+
+typedef struct Z_ByDatabaseList
+{
+    int num_elements;
+    Z_ByDatabase **elements;
+} Z_ByDatabaseList;
+
+typedef struct Z_ScanOccurrences
+{
+    int which;
+#define Z_ScanOccurrences_global         0
+#define Z_ScanOccurrences_byDatabase     1
+    union
+    {
+       int *global;
+       Z_ByDatabaseList *byDatabase;
+    } u;
+
+} Z_ScanOccurrences;
+
+typedef struct Z_OccurrenceByAttributesElem
+{
+    Z_AttributeList *attributes;
+    Z_ScanOccurrences *occurrences;         /* OPTIONAL */
+    Z_OtherInformation *otherOccurInfo;      /* OPTIONAL */
+} Z_OccurrenceByAttributesElem;
+
+typedef struct Z_OccurrenceByAttributes
+{
+    int num_elements;
+    Z_OccurrenceByAttributesElem **elements;
+} Z_OccurrenceByAttributes;
+
+typedef struct Z_TermInfo
+{
+    Z_Term *term;
+    char *displayTerm;                     /* OPTIONAL */
+    Z_AttributeList *suggestedAttributes;  /* OPTIONAL */
+    Z_AlternativeTerm *alternativeTerm;    /* OPTIONAL */
+    int *globalOccurrences;                /* OPTIONAL */
+    Z_OccurrenceByAttributes *byAttributes; /* OPTIONAL */
+    Z_OtherInformation *otherTermInfo;      /* OPTIONAL */
+} Z_TermInfo;
+
+typedef struct Z_Entry
+{
+    int which;
+#define Z_Entry_termInfo 0
+#define Z_Entry_surrogateDiagnostic 1
+    union
+    {
+       Z_TermInfo *termInfo;
+       Z_DiagRec *surrogateDiagnostic;
+    } u;
+} Z_Entry;
+
+#ifdef BUGGY_LISTENTRIES
+
+typedef struct Z_Entries
+{
+    int num_entries;
+    Z_Entry **entries;
+} Z_Entries;
+
+typedef struct Z_ListEntries
+{
+    int which;
+#define Z_ListEntries_entries 0
+#define Z_ListEntries_nonSurrogateDiagnostics 1
+    union
+    {
+       Z_Entries *entries;
+       Z_DiagRecs *nonSurrogateDiagnostics;
+    } u;
+} Z_ListEntries;
+
+#endif
+
+typedef struct Z_ListEntries {
+       int num_entries;
+       Z_Entry **entries; /* OPT */
+       int num_nonsurrogateDiagnostics;
+       Z_DiagRec **nonsurrogateDiagnostics; /* OPT */
+} Z_ListEntries;
+
+typedef struct Z_ScanRequest
+{
+    Z_ReferenceId *referenceId;       /* OPTIONAL */
+    int num_databaseNames;
+    char **databaseNames;
+    Odr_oid *attributeSet;          /* OPTIONAL */
+    Z_AttributesPlusTerm *termListAndStartPoint;
+    int *stepSize;                    /* OPTIONAL */
+    int *numberOfTermsRequested;
+    int *preferredPositionInResponse;   /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_ScanRequest;
+
+typedef struct Z_ScanResponse
+{
+    Z_ReferenceId *referenceId;       /* OPTIONAL */
+    int *stepSize;                    /* OPTIONAL */
+    int *scanStatus;
+#define Z_Scan_success      0
+#define Z_Scan_partial_1    1
+#define Z_Scan_partial_2    2
+#define Z_Scan_partial_3    3
+#define Z_Scan_partial_4    4
+#define Z_Scan_partial_5    5
+#define Z_Scan_failure      6
+    int *numberOfEntriesReturned;
+    int *positionOfTerm;              /* OPTIONAL */
+    Z_ListEntries *entries;           /* OPTIONAL */
+    Odr_oid *attributeSet;            /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_ScanResponse; 
+
+
+/* ------------------------ DELETE -------------------------- */
+
+#define Z_DeleteStatus_success                          0
+#define Z_DeleteStatus_resultSetDidNotExist             1
+#define Z_DeleteStatus_previouslyDeletedByTarget        2
+#define Z_DeleteStatus_systemProblemAtTarget            3
+#define Z_DeleteStatus_accessNotAllowed                 4
+#define Z_DeleteStatus_resourceControlAtOrigin          5
+#define Z_DeleteStatus_resourceControlAtTarget          6
+#define Z_DeleteStatus_bulkDeleteNotSupported           7
+#define Z_DeleteStatus_notAllRsltSetsDeletedOnBulkDlte  8
+#define Z_DeleteStatus_notAllRequestedResultSetsDeleted 9
+#define Z_DeleteStatus_resultSetInUse                  10
+
+typedef struct Z_ListStatus
+{
+    Z_ResultSetId *id;
+    int *status;
+} Z_ListStatus;
+
+typedef struct Z_DeleteResultSetRequest
+{
+    Z_ReferenceId *referenceId;        /* OPTIONAL */
+    int *deleteFunction;
+#define Z_DeleteRequest_list    0
+#define Z_DeleteRequest_all     1
+    int num_resultSetList;
+    Z_ResultSetId **resultSetList;      /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_DeleteResultSetRequest;
+
+typedef struct Z_ListStatuses {
+    int num;
+    Z_ListStatus **elements;
+} Z_ListStatuses;
+
+typedef struct Z_DeleteResultSetResponse
+{
+    Z_ReferenceId *referenceId;        /* OPTIONAL */
+    int *deleteOperationStatus;
+    Z_ListStatuses *deleteListStatuses;/* OPTIONAL */
+    int *numberNotDeleted;             /* OPTIONAL */
+    Z_ListStatuses *bulkStatuses;      /* OPTIONAL */
+    char *deleteMessage;               /* OPTIONAL */
+    Z_OtherInformation *otherInfo;
+} Z_DeleteResultSetResponse;
+
+/* ------------------------ CLOSE SERVICE ------------------- */
+
+typedef struct Z_Close
+{
+    Z_ReferenceId *referenceId;         /* OPTIONAL */
+    int *closeReason;
+#define Z_Close_finished           0
+#define Z_Close_shutdown           1
+#define Z_Close_systemProblem      2
+#define Z_Close_costLimit          3
+#define Z_Close_resources          4
+#define Z_Close_securityViolation  5
+#define Z_Close_protocolError      6
+#define Z_Close_lackOfActivity     7
+#define Z_Close_peerAbort          8
+#define Z_Close_unspecified        9
+    char *diagnosticInformation;          /* OPTIONAL */
+    Odr_oid *resourceReportFormat;        /* OPTIONAL */
+    Z_External *resourceReport;         /* OPTIONAL */
+    Z_OtherInformation *otherInfo;        /* OPTIONAL */
+} Z_Close;
+
+/* ------------------------ SEGMENTATION -------------------- */
+
+typedef struct Z_Segment
+{
+    Z_ReferenceId *referenceId;   /* OPTIONAL */
+    int *numberOfRecordsReturned;
+    int num_segmentRecords;
+    Z_NamePlusRecord **segmentRecords;
+    Z_OtherInformation *otherInfo;  /* OPTIONAL */
+} Z_Segment;
+
+/* ----------------------- Extended Services ---------------- */
+
+typedef struct Z_Permissions
+{
+    char *userId;                         
+    int num_allowableFunctions;
+    int **allowableFunctions;             
+#define Z_Permissions_delete              1
+#define Z_Permissions_modifyContents      2
+#define Z_Permissions_modifyPermissions   3
+#define Z_Permissions_present             4
+#define Z_Permissions_invoke              5
+} Z_Permissions;
+
+typedef struct Z_ExtendedServicesRequest
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    int *function;                        
+#define Z_ExtendedServicesRequest_create              1
+#define Z_ExtendedServicesRequest_delete              2
+#define Z_ExtendedServicesRequest_modify              3
+    Odr_oid *packageType;                 
+    char *packageName;                      /* OPTIONAL */
+    char *userId;                           /* OPTIONAL */
+    Z_IntUnit *retentionTime;               /* OPTIONAL */
+    Z_Permissions *permissions;             /* OPTIONAL */
+    char *description;                      /* OPTIONAL */
+    Z_External *taskSpecificParameters;     /* OPTIONAL */
+    int *waitAction;                      
+#define Z_ExtendedServicesRequest_wait                1
+#define Z_ExtendedServicesRequest_waitIfPossible      2
+#define Z_ExtendedServicesRequest_dontWait            3
+#define Z_ExtendedServicesRequest_dontReturnPackage   4
+    char *elements;             /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_ExtendedServicesRequest;
+
+typedef struct Z_ExtendedServicesResponse
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    int *operationStatus;                 
+#define Z_ExtendedServicesResponse_done                1
+#define Z_ExtendedServicesResponse_accepted            2
+#define Z_ExtendedServicesResponse_failure             3
+    int num_diagnostics;
+    Z_DiagRec **diagnostics;                /* OPTIONAL */
+    Z_External *taskPackage;                /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_ExtendedServicesResponse;
+
+/* ------------------------ Sort --------------------------- */
+
+typedef struct Z_SortAttributes
+{
+    Odr_oid *id;
+    Z_AttributeList *list;
+} Z_SortAttributes;
+
+typedef struct Z_SortKey
+{
+    int which;
+#define Z_SortKey_sortField             0
+#define Z_SortKey_elementSpec           1
+#define Z_SortKey_sortAttributes        2
+    union
+    {
+       char *sortField;
+       Z_Specification *elementSpec;
+       Z_SortAttributes *sortAttributes;
+    } u;
+} Z_SortKey;
+
+typedef struct Z_SortDbSpecific
+{
+    char *databaseName;
+    Z_SortKey *dbSort;
+} Z_SortDbSpecific;
+
+typedef struct Z_SortDbSpecificList
+{
+    int num_dbSpecific;
+    Z_SortDbSpecific **dbSpecific;
+} Z_SortDbSpecificList;
+
+typedef struct Z_SortElement
+{
+    int which;
+#define Z_SortElement_generic               0
+#define Z_SortElement_databaseSpecific      1
+    union
+    {
+       Z_SortKey *generic;
+       Z_SortDbSpecificList *databaseSpecific;
+    } u;
+} Z_SortElement;
+
+typedef struct Z_SortMissingValueAction
+{
+    int which;
+#define Z_SortMissingValAct_abort           0
+#define Z_SortMissingValAct_null            1
+#define Z_SortMissingValAct_valData         2
+    union
+    {
+       Odr_null *abort;
+       Odr_null *null;
+       Odr_oct *valData;
+    } u;
+} Z_SortMissingValueAction;
+
+typedef struct Z_SortKeySpec
+{
+    Z_SortElement *sortElement;
+    int *sortRelation;
+#define Z_SortRelation_ascending            0
+#define Z_SortRelation_descending           1
+#define Z_SortRelation_ascendingByFreq      3
+#define Z_SortRelation_descendingByFreq     4
+    int *caseSensitivity;
+#define Z_SortCase_caseSensitive            0
+#define Z_SortCase_caseInsensitive          1
+    Z_SortMissingValueAction *missingValueAction;  /* OPTIONAL */
+} Z_SortKeySpec;
+
+typedef struct Z_SortResponse
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    int *sortStatus;
+#define Z_SortStatus_success              0
+#define Z_SortStatus_partial_1            1
+#define Z_SortStatus_failure              2
+    int *resultSetStatus;                   /* OPTIONAL */
+#define Z_SortResultSetStatus_empty       1
+#define Z_SortResultSetStatus_interim     2
+#define Z_SortResultSetStatus_unchanged   3
+#define Z_SortResultSetStatus_none        4
+    Z_DiagRecs *diagnostics;                /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_SortResponse;
+
+typedef struct Z_SortKeySpecList
+{
+    int num_specs;
+    Z_SortKeySpec **specs;
+} Z_SortKeySpecList;
+
+typedef struct Z_SortRequest
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    Z_StringList *inputResultSetNames;
+    char *sortedResultSetName;
+    Z_SortKeySpecList *sortSequence;
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_SortRequest;
+
+/* ----------------------- Resource Report ------------------ */
+
+typedef struct Z_ResourceReportRequest
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    Z_ReferenceId *opId;                    /* OPTIONAL */
+    Odr_oid *prefResourceReportFormat;      /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_ResourceReportRequest;
+
+typedef struct Z_ResourceReportResponse
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    int *resourceReportStatus;
+#define Z_ResourceReportStatus_success   0
+#define Z_ResourceReportStatus_partial   1
+#define Z_ResourceReportStatus_failure_1 2
+#define Z_ResourceReportStatus_failure_2 3
+#define Z_ResourceReportStatus_failure_3 4
+#define Z_ResourceReportStatus_failure_4 5
+#define Z_ResourceReportStatus_failure_5 6
+#define Z_ResourceReportStatus_failure_6 7
+    Z_External *resourceReport;             /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_ResourceReportResponse;
+
+/* ------------------------ APDU ---------------------------- */
+
+typedef struct Z_APDU
+{    
+    int which;
+#define Z_APDU_initRequest 0
+#define Z_APDU_initResponse 1
+#define Z_APDU_searchRequest 2
+#define Z_APDU_searchResponse 3
+#define Z_APDU_presentRequest 4
+#define Z_APDU_presentResponse 5
+#define Z_APDU_deleteResultSetRequest 6
+#define Z_APDU_deleteResultSetResponse 7
+#define Z_APDU_resourceControlRequest 8
+#define Z_APDU_resourceControlResponse 9
+#define Z_APDU_triggerResourceControlRequest 10
+#define Z_APDU_scanRequest 11
+#define Z_APDU_scanResponse 12
+#define Z_APDU_segmentRequest 13
+#define Z_APDU_extendedServicesRequest 14
+#define Z_APDU_extendedServicesResponse 15
+#define Z_APDU_close 16
+#define Z_APDU_accessControlRequest 17
+#define Z_APDU_accessControlResponse 18
+#define Z_APDU_sortRequest 20
+#define Z_APDU_sortResponse 21
+#define Z_APDU_resourceReportRequest 22
+#define Z_APDU_resourceReportResponse 23
+    union
+    {
+       Z_InitRequest  *initRequest;
+       Z_InitResponse *initResponse;
+       Z_SearchRequest *searchRequest;
+       Z_SearchResponse *searchResponse;
+       Z_PresentRequest *presentRequest;
+       Z_PresentResponse *presentResponse;
+       Z_DeleteResultSetRequest *deleteResultSetRequest;
+       Z_DeleteResultSetResponse *deleteResultSetResponse;
+       Z_AccessControlRequest *accessControlRequest;
+       Z_AccessControlResponse *accessControlResponse;
+       Z_ResourceControlRequest *resourceControlRequest;
+       Z_ResourceControlResponse *resourceControlResponse;
+       Z_TriggerResourceControlRequest *triggerResourceControlRequest;
+       Z_ResourceReportRequest *resourceReportRequest;
+       Z_ResourceReportResponse *resourceReportResponse;
+       Z_ScanRequest *scanRequest;
+       Z_ScanResponse *scanResponse;
+       Z_SortRequest *sortRequest;
+       Z_SortResponse *sortResponse;
+       Z_Segment *segmentRequest;
+       Z_ExtendedServicesRequest *extendedServicesRequest;
+       Z_ExtendedServicesResponse *extendedServicesResponse;
+       Z_Close *close;
+    } u;
+} Z_APDU;
+
+#define z_APDU z_APDU_old
+
+YAZ_EXPORT int z_APDU(ODR o, Z_APDU **p, int opt, const char *name);
+YAZ_EXPORT int z_SUTRS(ODR o, Odr_oct **p, int opt, const char *name);
+
+YAZ_EXPORT Z_InitRequest *zget_InitRequest(ODR o);
+YAZ_EXPORT Z_InitResponse *zget_InitResponse(ODR o);
+YAZ_EXPORT Z_SearchRequest *zget_SearchRequest(ODR o);
+YAZ_EXPORT Z_SearchResponse *zget_SearchResponse(ODR o);
+YAZ_EXPORT Z_PresentRequest *zget_PresentRequest(ODR o);
+YAZ_EXPORT Z_PresentResponse *zget_PresentResponse(ODR o);
+YAZ_EXPORT Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o);
+YAZ_EXPORT Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o);
+YAZ_EXPORT Z_ScanRequest *zget_ScanRequest(ODR o);
+YAZ_EXPORT Z_ScanResponse *zget_ScanResponse(ODR o);
+YAZ_EXPORT Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o);
+YAZ_EXPORT Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
+YAZ_EXPORT Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
+YAZ_EXPORT Z_Close *zget_Close(ODR o);
+YAZ_EXPORT int z_StringList(ODR o, Z_StringList **p, int opt,
+                           const char *name);
+YAZ_EXPORT int z_InternationalString(ODR o, char **p, int opt,
+                                    const char *name);
+YAZ_EXPORT int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt,
+                                 const char *naem);
+YAZ_EXPORT int z_ElementSetName(ODR o, char **p, int opt, const char *name);
+YAZ_EXPORT int z_IntUnit(ODR o, Z_IntUnit **p, int opt, const char *name);
+YAZ_EXPORT int z_Unit(ODR o, Z_Unit **p, int opt, const char *name);
+YAZ_EXPORT int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt,
+                             const char *name);
+YAZ_EXPORT int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt,
+                                const char *name);
+YAZ_EXPORT int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p,
+                                     int opt, const char *name);
+YAZ_EXPORT int z_Term(ODR o, Z_Term **p, int opt, const char *name);
+YAZ_EXPORT int z_Specification(ODR o, Z_Specification **p, int opt,
+                              const char *name);
+YAZ_EXPORT int z_Permissions(ODR o, Z_Permissions **p, int opt,
+                            const char *name);
+YAZ_EXPORT int z_DiagRec(ODR o, Z_DiagRec **p, int opt, const char *name);
+YAZ_EXPORT int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt, const char *name);
+YAZ_EXPORT int z_AttributeList(ODR o, Z_AttributeList **p, int opt,
+                              const char *name);
+YAZ_EXPORT int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt,
+                                  const char *name);
+YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which);
+YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt, const char *name);
+
+YAZ_END_CDECL
+
+#include <yaz/prt-rsc.h>
+#include <yaz/prt-acc.h>
+#include <yaz/prt-exp.h>
+#include <yaz/prt-grs.h>
+#include <yaz/prt-arc.h>
+#include <yaz/prt-exd.h>
+#include <yaz/prt-dia.h>
+#include <yaz/prt-esp.h>
+#include <yaz/prt-add.h>
+
+#include <yaz/prt-dat.h>
+#include <yaz/prt-univ.h>
+#include <yaz/prt-ext.h>
+
+#endif
diff --git a/asn/prt-rsc.h b/asn/prt-rsc.h
new file mode 100644 (file)
index 0000000..a409843
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Log: prt-rsc.h,v $
+ * Revision 1.1  2000-10-03 12:55:50  adam
+ * Removed several auto-generated files from CVS.
+ *
+ * Revision 1.1  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.7  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.6  1997/05/14 06:53:50  adam
+ * C++ support.
+ *
+ * Revision 1.5  1995/09/29 17:12:11  quinn
+ * Smallish
+ *
+ * Revision 1.4  1995/09/27  15:02:52  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/17  12:45:17  quinn
+ * Fixed minor problems with GRS-1. Added support in c&s.
+ *
+ * Revision 1.2  1995/06/02  09:49:50  quinn
+ * Add access control
+ *
+ * Revision 1.1  1995/06/01  11:24:52  quinn
+ * Resource Control
+ *
+ *
+ */
+
+#ifndef PRT_RSC_H
+#define PRT_RSC_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -------------------- Resource-1 -------------------- */
+
+#define Z_EstimateType_currentSearchRecords           1
+#define Z_EstimateType_finalSearchRecords             2
+#define Z_EstimateType_currentPresentRecords          3
+#define Z_EstimateType_finalPresentRecords            4
+#define Z_EstimateType_currentOpTimeProcessing        5
+#define Z_EstimateType_finalOpTimeProcessing          6
+#define Z_EstimateType_currentAssocTime               7
+#define Z_EstimateType_currentOperationCost           8
+#define Z_EstimateType_finalOperationCost             9
+#define Z_EstimateType_currentAssocCost              10
+#define Z_EstimateType_finalOpTimeElapsed            11
+#define Z_EstimateType_percentComplete               12
+#define Z_EstimateType_currentSearchAssCost          13
+#define Z_EstimateType_currentPresentAssCost         14
+#define Z_EstimateType_currentConnectAssCost         15
+#define Z_EstimateType_currentOtherAssCost           16
+
+typedef struct Z_Estimate1
+{
+    int *type;
+    int *value;
+    int *currencyCode;             /* OPTIONAL */
+} Z_Estimate1;
+
+typedef struct Z_ResourceReport1
+{
+    int num_estimates;
+    Z_Estimate1 **estimates;
+    char *message;
+} Z_ResourceReport1;
+
+int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt, const char *name);
+
+/* -------------------- Resource-2 -------------------- */
+
+typedef struct Z_Estimate2
+{
+    Z_StringOrNumeric *type;      /* same as in estimate1, if numeric */
+    Z_IntUnit *value;
+} Z_Estimate2;
+
+typedef struct Z_ResourceReport2
+{
+    int num_estimates;
+    Z_Estimate2 **estimates;             /* OPTIONAL */
+    char *message;                       /* OPTIONAL */
+} Z_ResourceReport2;
+
+int z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt, const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/asn/prt-univ.h b/asn/prt-univ.h
new file mode 100644 (file)
index 0000000..d431f50
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 1998
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef PRT_UNIV_H
+#define PRT_UNIV_H
+
+#include <yaz/yconfig.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* YC 0.1: Fri Mar 20 14:28:54 CET 1998 */
+/* Module-H ResourceReport-Format-Universe-1 */
+
+typedef struct Z_UniverseReportHits Z_UniverseReportHits;
+int z_UniverseReportHits (ODR o, Z_UniverseReportHits **p, int opt,
+                         const char *name);
+
+typedef struct Z_UniverseReportDuplicate Z_UniverseReportDuplicate;
+int z_UniverseReportDuplicate (ODR o, Z_UniverseReportDuplicate **p, int opt,
+                              const char *name);
+
+typedef struct Z_UniverseReport Z_UniverseReport;
+int z_UniverseReport (ODR o, Z_UniverseReport **p, int opt,
+                     const char *name);
+
+struct Z_UniverseReportHits {
+       Z_StringOrNumeric *database;
+       Z_StringOrNumeric *hits;
+};
+
+struct Z_UniverseReportDuplicate {
+       Z_StringOrNumeric *hitno;
+};
+
+struct Z_UniverseReport {
+       int *totalHits;
+       int which;
+       union {
+               Z_UniverseReportHits *databaseHits;
+               Z_UniverseReportDuplicate *duplicate;
+#define Z_UniverseReport_databaseHits 1
+#define Z_UniverseReport_duplicate 2
+       } u;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
index 3c3b970..7928a81 100755 (executable)
--- a/configure
+++ b/configure
@@ -1635,9 +1635,12 @@ else
        ILLLIB=""
        ASN_MAKEFILES="asn/Makefile"
        HFILE=prt-proto.h
+       if ! test -r include/yaz/prt-rsc.h ; then
+               cp asn/*.h include/yaz
+       fi
 fi
 echo $ac_n "checking whether proto.h needs to be generated""... $ac_c" 1>&6
-echo "configure:1641: checking whether proto.h needs to be generated" >&5
+echo "configure:1644: checking whether proto.h needs to be generated" >&5
 yaz_include=${srcdir}/include/yaz
 if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
        echo "$ac_t""no" 1>&6
@@ -1647,12 +1650,12 @@ else
 fi
 checkBoth=0
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1651: checking for connect" >&5
+echo "configure:1654: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1656 "configure"
+#line 1659 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -1675,7 +1678,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -1696,7 +1699,7 @@ fi
 
 if test "$ac_cv_func_connect" = "no"; then
        echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:1700: checking for main in -lsocket" >&5
+echo "configure:1703: checking for main in -lsocket" >&5
 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1704,14 +1707,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1708 "configure"
+#line 1711 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1737,12 +1740,12 @@ if test "$checkBoth" = "1"; then
        oldLibs=$LIBS
        LIBS="$LIBS -lsocket -lnsl"
        echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:1741: checking for accept" >&5
+echo "configure:1744: checking for accept" >&5
 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1746 "configure"
+#line 1749 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept(); below.  */
@@ -1765,7 +1768,7 @@ accept();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_accept=yes"
 else
@@ -1787,12 +1790,12 @@ fi
 
 fi
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1791: checking for gethostbyname" >&5
+echo "configure:1794: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1799 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -1815,7 +1818,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -1833,7 +1836,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:1837: checking for main in -lnsl" >&5
+echo "configure:1840: checking for main in -lnsl" >&5
 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1841,14 +1844,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1845 "configure"
+#line 1848 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1872,7 +1875,7 @@ fi
 
 READLINE_LIBS=""
 echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:1876: checking for readline in -lreadline" >&5
+echo "configure:1879: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1880,7 +1883,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1884 "configure"
+#line 1887 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1891,7 +1894,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1913,7 +1916,7 @@ fi
 
 if test "$ac_cv_lib_readline_readline" = "no"; then
        echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:1917: checking for readline in -lreadline" >&5
+echo "configure:1920: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1921,7 +1924,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1925 "configure"
+#line 1928 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1932,7 +1935,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1954,7 +1957,7 @@ fi
 
 fi
 echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:1958: checking for add_history in -lhistory" >&5
+echo "configure:1961: checking for add_history in -lhistory" >&5
 ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1962,7 +1965,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lhistory  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1966 "configure"
+#line 1969 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1973,7 +1976,7 @@ int main() {
 add_history()
 ; return 0; }
 EOF
-if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1998,17 +2001,17 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2002: checking for $ac_hdr" >&5
+echo "configure:2005: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2007 "configure"
+#line 2010 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2038,12 +2041,12 @@ fi
 for ac_func in vsnprintf gettimeofday
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2042: checking for $ac_func" >&5
+echo "configure:2045: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2047 "configure"
+#line 2050 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2066,7 +2069,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2104,10 +2107,10 @@ if test "$enable_tcpd" != ""; then
                CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
        fi
        echo $ac_n "checking for working tcpd.h""... $ac_c" 1>&6
-echo "configure:2108: checking for working tcpd.h" >&5
+echo "configure:2111: checking for working tcpd.h" >&5
        LIBS="$LIBS -lwrap -lnsl"
        cat > conftest.$ac_ext <<EOF
-#line 2111 "configure"
+#line 2114 "configure"
 #include "confdefs.h"
 #include <syslog.h>
 #include <tcpd.h>
@@ -2118,7 +2121,7 @@ struct request_info request_info; int i;
        i = hosts_access(&request_info);
 ; return 0; }
 EOF
-if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   tcpd_ok=1
 else
@@ -2141,12 +2144,12 @@ EOF
        fi
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2145: checking for ANSI C header files" >&5
+echo "configure:2148: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2150 "configure"
+#line 2153 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2154,7 +2157,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2171,7 +2174,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2175 "configure"
+#line 2178 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2189,7 +2192,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2193 "configure"
+#line 2196 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2210,7 +2213,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2214 "configure"
+#line 2217 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2221,7 +2224,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2257,7 +2260,7 @@ fi
 
 if test "$enable_threads" = "yes"; then
        echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-echo "configure:2261: checking for main in -lpthread" >&5
+echo "configure:2264: checking for main in -lpthread" >&5
 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2265,14 +2268,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2269 "configure"
+#line 2272 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2300,9 +2303,9 @@ else
 fi
 
        echo $ac_n "checking for working POSIX Threads""... $ac_c" 1>&6
-echo "configure:2304: checking for working POSIX Threads" >&5
+echo "configure:2307: checking for working POSIX Threads" >&5
        cat > conftest.$ac_ext <<EOF
-#line 2306 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 #include <pthread.h>
        int func(void *p) { return 0; }
@@ -2313,7 +2316,7 @@ int main() {
        int r = pthread_create (&pthread_id, 0, func, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   thread_ok=yes
 else
index 008c61d..b88f400 100644 (file)
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.33 2000-10-02 12:31:43 adam Exp $
+dnl $Id: configure.in,v 1.34 2000-10-03 12:55:50 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -29,6 +29,9 @@ else
        ILLLIB=""
        ASN_MAKEFILES="asn/Makefile"
        HFILE=prt-proto.h
+       if ! test -r include/yaz/prt-rsc.h ; then
+               cp asn/*.h include/yaz
+       fi
 fi
 AC_MSG_CHECKING(whether proto.h needs to be generated)
 yaz_include=${srcdir}/include/yaz
diff --git a/ill/ill-core.c b/ill/ill-core.c
deleted file mode 100644 (file)
index a7dd161..0000000
+++ /dev/null
@@ -1,1754 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ISO-10161-ILL-1 */
-
-#include <yaz/ill-core.h>
-
-int ill_APDU (ODR o, ILL_APDU **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, ILL_APDU_ILL_Request,
-                (Odr_fun) ill_Request, "ILL_Request"},
-               {-1, -1, -1, ILL_APDU_Forward_Notification,
-                (Odr_fun) ill_Forward_Notification, "Forward_Notification"},
-               {-1, -1, -1, ILL_APDU_Shipped,
-                (Odr_fun) ill_Shipped, "Shipped"},
-               {-1, -1, -1, ILL_APDU_ILL_Answer,
-                (Odr_fun) ill_Answer, "ILL_Answer"},
-               {-1, -1, -1, ILL_APDU_Conditional_Reply,
-                (Odr_fun) ill_Conditional_Reply, "Conditional_Reply"},
-               {-1, -1, -1, ILL_APDU_Cancel,
-                (Odr_fun) ill_Cancel, "Cancel"},
-               {-1, -1, -1, ILL_APDU_Cancel_Reply,
-                (Odr_fun) ill_Cancel_Reply, "Cancel_Reply"},
-               {-1, -1, -1, ILL_APDU_Received,
-                (Odr_fun) ill_Received, "Received"},
-               {-1, -1, -1, ILL_APDU_Recall,
-                (Odr_fun) ill_Recall, "Recall"},
-               {-1, -1, -1, ILL_APDU_Returned,
-                (Odr_fun) ill_Returned, "Returned"},
-               {-1, -1, -1, ILL_APDU_Checked_In,
-                (Odr_fun) ill_Checked_In, "Checked_In"},
-               {-1, -1, -1, ILL_APDU_Overdue,
-                (Odr_fun) ill_Overdue, "Overdue"},
-               {-1, -1, -1, ILL_APDU_Renew,
-                (Odr_fun) ill_Renew, "Renew"},
-               {-1, -1, -1, ILL_APDU_Renew_Answer,
-                (Odr_fun) ill_Renew_Answer, "Renew_Answer"},
-               {-1, -1, -1, ILL_APDU_Lost,
-                (Odr_fun) ill_Lost, "Lost"},
-               {-1, -1, -1, ILL_APDU_Damaged,
-                (Odr_fun) ill_Damaged, "Damaged"},
-               {-1, -1, -1, ILL_APDU_Message,
-                (Odr_fun) ill_Message, "Message"},
-               {-1, -1, -1, ILL_APDU_Status_Query,
-                (Odr_fun) ill_Status_Query, "Status_Query"},
-               {-1, -1, -1, ILL_APDU_Status_Or_Error_Report,
-                (Odr_fun) ill_Status_Or_Error_Report, "Status_Or_Error_Report"},
-               {-1, -1, -1, ILL_APDU_Expired,
-                (Odr_fun) ill_Expired, "Expired"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Request (ODR o, ILL_Request **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 1, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Transaction_Type,
-                       &(*p)->transaction_type, ODR_CONTEXT, 5, 0, "transaction_type") &&
-               odr_implicit_tag (o, ill_Delivery_Address,
-                       &(*p)->delivery_address, ODR_CONTEXT, 6, 1, "delivery_address") &&
-               ill_Delivery_Service(o, &(*p)->delivery_service, 1, "delivery_service") &&
-               odr_implicit_tag (o, ill_Delivery_Address,
-                       &(*p)->billing_address, ODR_CONTEXT, 8, 1, "billing_address") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 9) &&
-               odr_sequence_of(o, (Odr_fun) ill_Service_Type, &(*p)->iLL_service_type,
-                 &(*p)->num_iLL_service_type, "iLL_service_type") &&
-               odr_explicit_tag (o, odr_external,
-                       &(*p)->responder_specific_service, ODR_CONTEXT, 10, 1, "responder_specific_service") &&
-               odr_implicit_tag (o, ill_Requester_Optional_Messages_Type,
-                       &(*p)->requester_optional_messages, ODR_CONTEXT, 11, 0, "requester_optional_messages") &&
-               odr_implicit_tag (o, ill_Search_Type,
-                       &(*p)->search_type, ODR_CONTEXT, 12, 1, "search_type") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 13) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Supply_Medium_Info_Type, &(*p)->supply_medium_info_type,
-                 &(*p)->num_supply_medium_info_type, "supply_medium_info_type") || odr_ok(o)) &&
-               odr_implicit_tag (o, ill_Place_On_Hold_Type,
-                       &(*p)->place_on_hold, ODR_CONTEXT, 14, 0, "place_on_hold") &&
-               odr_implicit_tag (o, ill_Client_Id,
-                       &(*p)->client_id, ODR_CONTEXT, 15, 1, "client_id") &&
-               odr_implicit_tag (o, ill_Item_Id,
-                       &(*p)->item_id, ODR_CONTEXT, 16, 0, "item_id") &&
-               odr_implicit_tag (o, ill_Supplemental_Item_Description,
-                       &(*p)->supplemental_item_description, ODR_CONTEXT, 17, 1, "supplemental_item_description") &&
-               odr_implicit_tag (o, ill_Cost_Info_Type,
-                       &(*p)->cost_info_type, ODR_CONTEXT, 18, 1, "cost_info_type") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->copyright_compliance, ODR_CONTEXT, 19, 1, "copyright_compliance") &&
-               odr_implicit_tag (o, ill_Third_Party_Info_Type,
-                       &(*p)->third_party_info_type, ODR_CONTEXT, 20, 1, "third_party_info_type") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->retry_flag, ODR_CONTEXT, 21, 0, "retry_flag") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->forward_flag, ODR_CONTEXT, 22, 0, "forward_flag") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->forward_note, ODR_CONTEXT, 47, 1, "forward_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->iLL_request_extensions,
-                 &(*p)->num_iLL_request_extensions, "iLL_request_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Forward_Notification (ODR o, ILL_Forward_Notification **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 2, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 0, "responder_id") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->responder_address, ODR_CONTEXT, 24, 1, "responder_address") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->intermediary_id, ODR_CONTEXT, 25, 0, "intermediary_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->notification_note, ODR_CONTEXT, 48, 1, "notification_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->forward_notification_extensions,
-                 &(*p)->num_forward_notification_extensions, "forward_notification_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Shipped (ODR o, ILL_Shipped **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 3, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->responder_address, ODR_CONTEXT, 24, 1, "responder_address") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->intermediary_id, ODR_CONTEXT, 25, 1, "intermediary_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->supplier_id, ODR_CONTEXT, 26, 1, "supplier_id") &&
-               odr_implicit_tag (o, ill_Client_Id,
-                       &(*p)->client_id, ODR_CONTEXT, 15, 1, "client_id") &&
-               odr_implicit_tag (o, ill_Transaction_Type,
-                       &(*p)->transaction_type, ODR_CONTEXT, 5, 0, "transaction_type") &&
-               odr_implicit_tag (o, ill_Supplemental_Item_Description,
-                       &(*p)->supplemental_item_description, ODR_CONTEXT, 17, 1, "supplemental_item_description") &&
-               odr_implicit_tag (o, ill_Shipped_Service_Type,
-                       &(*p)->shipped_service_type, ODR_CONTEXT, 27, 0, "shipped_service_type") &&
-               odr_implicit_tag (o, ill_Responder_Optional_Messages_Type,
-                       &(*p)->responder_optional_messages, ODR_CONTEXT, 28, 1, "responder_optional_messages") &&
-               odr_implicit_tag (o, ill_Supply_Details,
-                       &(*p)->supply_details, ODR_CONTEXT, 29, 0, "supply_details") &&
-               odr_implicit_tag (o, ill_Postal_Address,
-                       &(*p)->return_to_address, ODR_CONTEXT, 30, 1, "return_to_address") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->shipped_extensions,
-                 &(*p)->num_shipped_extensions, "shipped_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Answer (ODR o, ILL_Answer **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, ILL_Answer_conditional_results,
-               (Odr_fun) ill_Conditional_Results, "conditional_results"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, ILL_Answer_retry_results,
-               (Odr_fun) ill_Retry_Results, "retry_results"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 3, ILL_Answer_unfilled_results,
-               (Odr_fun) ill_Unfilled_Results, "unfilled_results"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 4, ILL_Answer_locations_results,
-               (Odr_fun) ill_Locations_Results, "locations_results"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 5, ILL_Answer_will_supply_results,
-               (Odr_fun) ill_Will_Supply_Results, "will_supply_results"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 6, ILL_Answer_hold_placed_results,
-               (Odr_fun) ill_Hold_Placed_Results, "hold_placed_results"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 7, ILL_Answer_estimate_results,
-               (Odr_fun) ill_Estimate_Results, "estimate_results"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 4, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Transaction_Results,
-                       &(*p)->transaction_results, ODR_CONTEXT, 31, 0, "transaction_results") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 32, "results_explanation") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_explicit_tag (o, odr_external,
-                       &(*p)->responder_specific_results, ODR_CONTEXT, 33, 1, "responder_specific_results") &&
-               odr_implicit_tag (o, ill_Supplemental_Item_Description,
-                       &(*p)->supplemental_item_description, ODR_CONTEXT, 17, 1, "supplemental_item_description") &&
-               odr_implicit_tag (o, ill_Send_To_List_Type,
-                       &(*p)->send_to_list, ODR_CONTEXT, 23, 1, "send_to_list") &&
-               odr_implicit_tag (o, ill_Already_Tried_List_Type,
-                       &(*p)->already_tried_list, ODR_CONTEXT, 34, 1, "already_tried_list") &&
-               odr_implicit_tag (o, ill_Responder_Optional_Messages_Type,
-                       &(*p)->responder_optional_messages, ODR_CONTEXT, 28, 1, "responder_optional_messages") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->ill_answer_extensions,
-                 &(*p)->num_ill_answer_extensions, "ill_answer_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Conditional_Reply (ODR o, ILL_Conditional_Reply **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 5, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->answer, ODR_CONTEXT, 35, 0, "answer") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->conditional_reply_extensions,
-                 &(*p)->num_conditional_reply_extensions, "conditional_reply_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Cancel (ODR o, ILL_Cancel **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 6, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->cancel_extensions,
-                 &(*p)->num_cancel_extensions, "cancel_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Cancel_Reply (ODR o, ILL_Cancel_Reply **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 7, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->answer, ODR_CONTEXT, 35, 0, "answer") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->cancel_reply_extensions,
-                 &(*p)->num_cancel_reply_extensions, "cancel_reply_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Received (ODR o, ILL_Received **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 8, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->supplier_id, ODR_CONTEXT, 26, 1, "supplier_id") &&
-               odr_implicit_tag (o, ill_Supplemental_Item_Description,
-                       &(*p)->supplemental_item_description, ODR_CONTEXT, 17, 1, "supplemental_item_description") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_received, ODR_CONTEXT, 36, 0, "date_received") &&
-               odr_implicit_tag (o, ill_Shipped_Service_Type,
-                       &(*p)->shipped_service_type, ODR_CONTEXT, 27, 0, "shipped_service_type") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->received_extensions,
-                 &(*p)->num_received_extensions, "received_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Recall (ODR o, ILL_Recall **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 9, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->recall_extensions,
-                 &(*p)->num_recall_extensions, "recall_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Returned (ODR o, ILL_Returned **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 10, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Supplemental_Item_Description,
-                       &(*p)->supplemental_item_description, ODR_CONTEXT, 17, 1, "supplemental_item_description") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_returned, ODR_CONTEXT, 37, 0, "date_returned") &&
-               odr_explicit_tag (o, ill_Transportation_Mode,
-                       &(*p)->returned_via, ODR_CONTEXT, 38, 1, "returned_via") &&
-               odr_implicit_tag (o, ill_Amount,
-                       &(*p)->insured_for, ODR_CONTEXT, 39, 1, "insured_for") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->returned_extensions,
-                 &(*p)->num_returned_extensions, "returned_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Checked_In (ODR o, ILL_Checked_In **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 11, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_checked_in, ODR_CONTEXT, 40, 0, "date_checked_in") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->checked_in_extensions,
-                 &(*p)->num_checked_in_extensions, "checked_in_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Overdue_Extension (ODR o, ILL_Overdue_Extension **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) ill_Extension, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Overdue (ODR o, ILL_Overdue **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 12, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Date_Due,
-                       &(*p)->date_due, ODR_CONTEXT, 41, 0, "date_due") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_explicit_tag (o, ill_Overdue_Extension,
-                       &(*p)->overdue_extensions, ODR_CONTEXT, 49, 1, "overdue_extensions") &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Renew (ODR o, ILL_Renew **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 13, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->desired_due_date, ODR_CONTEXT, 42, 1, "desired_due_date") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->renew_extensions,
-                 &(*p)->num_renew_extensions, "renew_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Renew_Answer (ODR o, ILL_Renew_Answer **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 14, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->answer, ODR_CONTEXT, 35, 0, "answer") &&
-               odr_implicit_tag (o, ill_Date_Due,
-                       &(*p)->date_due, ODR_CONTEXT, 41, 1, "date_due") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->responder_note, ODR_CONTEXT, 46, 1, "responder_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->renew_answer_extensions,
-                 &(*p)->num_renew_answer_extensions, "renew_answer_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Lost (ODR o, ILL_Lost **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 15, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->note, ODR_CONTEXT, 46, 1, "note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->lost_extensions,
-                 &(*p)->num_lost_extensions, "lost_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Damaged (ODR o, ILL_Damaged **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 16, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Damaged_Details,
-                       &(*p)->damaged_details, ODR_CONTEXT, 5, 1, "damaged_details") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->note, ODR_CONTEXT, 46, 1, "note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->damaged_extensions,
-                 &(*p)->num_damaged_extensions, "damaged_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Message (ODR o, ILL_Message **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 17, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->note, ODR_CONTEXT, 46, 0, "note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->message_extensions,
-                 &(*p)->num_message_extensions, "message_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Status_Query (ODR o, ILL_Status_Query **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 18, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->note, ODR_CONTEXT, 46, 1, "note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->status_query_extensions,
-                 &(*p)->num_status_query_extensions, "status_query_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Status_Or_Error_Report (ODR o, ILL_Status_Or_Error_Report **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 19, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Reason_No_Report,
-                       &(*p)->reason_no_report, ODR_CONTEXT, 43, 1, "reason_no_report") &&
-               odr_implicit_tag (o, ill_Status_Report,
-                       &(*p)->status_report, ODR_CONTEXT, 44, 1, "status_report") &&
-               odr_implicit_tag (o, ill_Error_Report,
-                       &(*p)->error_report, ODR_CONTEXT, 45, 1, "error_report") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->note, ODR_CONTEXT, 46, 1, "note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->status_or_error_report_extensions,
-                 &(*p)->num_status_or_error_report_extensions, "status_or_error_report_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Expired (ODR o, ILL_Expired **p, int opt, const char *name)
-{
-       if (!odr_constructed_begin (o, p, ODR_APPLICATION, 20, name))
-               return opt && odr_ok(o);
-       if (o->direction == ODR_DECODE)
-               *p = odr_malloc (o, sizeof(**p));
-       if (!odr_sequence_begin (o, p, sizeof(**p), 0))
-       {
-               *p = 0;
-               return 0;
-       }
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 0, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 0, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->expired_extensions,
-                 &(*p)->num_expired_extensions, "expired_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o) &&
-               odr_constructed_end (o);
-}
-
-int ill_Account_Number (ODR o, ILL_Account_Number **p, int opt, const char *name)
-{
-       return ill_String (o, p, opt, name);
-}
-
-int ill_Already_Forwarded (ODR o, ILL_Already_Forwarded **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 0, 0, "responder_id") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->responder_address, ODR_CONTEXT, 1, 1, "responder_address") &&
-               odr_sequence_end (o);
-}
-
-int ill_Already_Tried_List_Type (ODR o, ILL_Already_Tried_List_Type **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) ill_System_Id, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Amount (ODR o, ILL_Amount **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_visiblestring,
-                       &(*p)->currency_code, ODR_CONTEXT, 0, 1, "currency_code") &&
-               odr_implicit_tag (o, ill_AmountString,
-                       &(*p)->monetary_value, ODR_CONTEXT, 1, 0, "monetary_value") &&
-               odr_sequence_end (o);
-}
-
-int ill_AmountString (ODR o, ILL_AmountString **p, int opt, const char *name)
-{
-       return odr_visiblestring (o, p, opt, name);
-}
-
-int ill_Client_Id (ODR o, ILL_Client_Id **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->client_name, ODR_CONTEXT, 0, 1, "client_name") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->client_status, ODR_CONTEXT, 1, 1, "client_status") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->client_identifier, ODR_CONTEXT, 2, 1, "client_identifier") &&
-               odr_sequence_end (o);
-}
-
-int ill_Conditional_Results (ODR o, ILL_Conditional_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->conditions, ODR_CONTEXT, 0, 0, "conditions") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_for_reply, ODR_CONTEXT, 1, 1, "date_for_reply") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") || odr_ok(o)) &&
-               ill_Delivery_Service(o, &(*p)->proposed_delivery_service, 1, "proposed_delivery_service") &&
-               odr_sequence_end (o);
-}
-
-int ill_Cost_Info_Type (ODR o, ILL_Cost_Info_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_Account_Number,
-                       &(*p)->account_number, ODR_CONTEXT, 0, 1, "account_number") &&
-               odr_implicit_tag (o, ill_Amount,
-                       &(*p)->maximum_cost, ODR_CONTEXT, 1, 1, "maximum_cost") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->reciprocal_agreement, ODR_CONTEXT, 2, 0, "reciprocal_agreement") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->will_pay_fee, ODR_CONTEXT, 3, 0, "will_pay_fee") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->payment_provided, ODR_CONTEXT, 4, 0, "payment_provided") &&
-               odr_sequence_end (o);
-}
-
-int ill_Current_State (ODR o, ILL_Current_State **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Damaged_DetailsSpecific_units (ODR o, ILL_Damaged_DetailsSpecific_units **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) odr_integer, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Damaged_Details (ODR o, ILL_Damaged_Details **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, ILL_Damaged_Details_complete_document,
-               (Odr_fun) odr_null, "complete_document"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, ILL_Damaged_Details_specific_units,
-               (Odr_fun) ill_Damaged_DetailsSpecific_units, "specific_units"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->document_type_id, ODR_CONTEXT, 0, 1, "document_type_id") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_sequence_end (o);
-}
-
-int ill_Date_Due (ODR o, ILL_Date_Due **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_due_field, ODR_CONTEXT, 0, 0, "date_due_field") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->renewable, ODR_CONTEXT, 1, 0, "renewable") &&
-               odr_sequence_end (o);
-}
-
-int ill_Delivery_Address (ODR o, ILL_Delivery_Address **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_Postal_Address,
-                       &(*p)->postal_address, ODR_CONTEXT, 0, 1, "postal_address") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->electronic_address, ODR_CONTEXT, 1, 1, "electronic_address") &&
-               odr_sequence_end (o);
-}
-
-int ill_Delivery_ServiceElectronic_delivery (ODR o, ILL_Delivery_ServiceElectronic_delivery **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) ill_Electronic_Delivery_Service, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Delivery_Service (ODR o, ILL_Delivery_Service **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 7, ILL_Delivery_Service_physical_delivery,
-               (Odr_fun) ill_Transportation_Mode, "physical_delivery"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 50, ILL_Delivery_Service_electronic_delivery,
-               (Odr_fun) ill_Delivery_ServiceElectronic_delivery, "electronic_delivery"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Electronic_Delivery_Service_0 (ODR o, ILL_Electronic_Delivery_Service_0 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->e_delivery_mode, ODR_CONTEXT, 0, 0, "e_delivery_mode") &&
-               odr_explicit_tag (o, odr_any,
-                       &(*p)->e_delivery_parameters, ODR_CONTEXT, 1, 0, "e_delivery_parameters") &&
-               odr_sequence_end (o);
-}
-
-int ill_Electronic_Delivery_Service_1 (ODR o, ILL_Electronic_Delivery_Service_1 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->document_type_id, ODR_CONTEXT, 2, 0, "document_type_id") &&
-               odr_explicit_tag (o, odr_any,
-                       &(*p)->document_type_parameters, ODR_CONTEXT, 3, 0, "document_type_parameters") &&
-               odr_sequence_end (o);
-}
-
-int ill_Electronic_Delivery_Service (ODR o, ILL_Electronic_Delivery_Service **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, ILL_Electronic_Delivery_Service_e_delivery_address,
-               (Odr_fun) ill_System_Address, "e_delivery_address"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, ILL_Electronic_Delivery_Service_e_delivery_id,
-               (Odr_fun) ill_System_Id, "e_delivery_id"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_Electronic_Delivery_Service_0,
-                       &(*p)->e_delivery_service, ODR_CONTEXT, 0, 1, "e_delivery_service") &&
-               odr_implicit_tag (o, ill_Electronic_Delivery_Service_1,
-                       &(*p)->document_type, ODR_CONTEXT, 1, 1, "document_type") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->e_delivery_description, ODR_CONTEXT, 4, 1, "e_delivery_description") &&
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 5, "e_delivery_details") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->name_or_code, ODR_CONTEXT, 6, 1, "name_or_code") &&
-               odr_implicit_tag (o, ill_ISO_Time,
-                       &(*p)->delivery_time, ODR_CONTEXT, 7, 1, "delivery_time") &&
-               odr_sequence_end (o);
-}
-
-int ill_Error_Report (ODR o, ILL_Error_Report **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->correlation_information, ODR_CONTEXT, 0, 0, "correlation_information") &&
-               odr_implicit_tag (o, ill_Report_Source,
-                       &(*p)->report_source, ODR_CONTEXT, 1, 0, "report_source") &&
-               odr_explicit_tag (o, ill_User_Error_Report,
-                       &(*p)->user_error_report, ODR_CONTEXT, 2, 1, "user_error_report") &&
-               odr_explicit_tag (o, ill_Provider_Error_Report,
-                       &(*p)->provider_error_report, ODR_CONTEXT, 3, 1, "provider_error_report") &&
-               odr_sequence_end (o);
-}
-
-int ill_Estimate_Results (ODR o, ILL_Estimate_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->cost_estimate, ODR_CONTEXT, 0, 0, "cost_estimate") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int ill_Extension (ODR o, ILL_Extension **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->identifier, ODR_CONTEXT, 0, 0, "identifier") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->critical, ODR_CONTEXT, 1, 0, "critical") &&
-               odr_explicit_tag (o, odr_any,
-                       &(*p)->item, ODR_CONTEXT, 2, 0, "item") &&
-               odr_sequence_end (o);
-}
-
-int ill_General_Problem (ODR o, ILL_General_Problem **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_History_Report (ODR o, ILL_History_Report **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_requested, ODR_CONTEXT, 0, 1, "date_requested") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->author, ODR_CONTEXT, 1, 1, "author") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->title, ODR_CONTEXT, 2, 1, "title") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->author_of_article, ODR_CONTEXT, 3, 1, "author_of_article") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->title_of_article, ODR_CONTEXT, 4, 1, "title_of_article") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_of_last_transition, ODR_CONTEXT, 5, 0, "date_of_last_transition") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->most_recent_service, ODR_CONTEXT, 6, 0, "most_recent_service") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_of_most_recent_service, ODR_CONTEXT, 7, 0, "date_of_most_recent_service") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->initiator_of_most_recent_service, ODR_CONTEXT, 8, 0, "initiator_of_most_recent_service") &&
-               odr_implicit_tag (o, ill_Shipped_Service_Type,
-                       &(*p)->shipped_service_type, ODR_CONTEXT, 9, 1, "shipped_service_type") &&
-               odr_implicit_tag (o, ill_Transaction_Results,
-                       &(*p)->transaction_results, ODR_CONTEXT, 10, 1, "transaction_results") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->most_recent_service_note, ODR_CONTEXT, 11, 1, "most_recent_service_note") &&
-               odr_sequence_end (o);
-}
-
-int ill_Hold_Placed_Results (ODR o, ILL_Hold_Placed_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->estimated_date_available, ODR_CONTEXT, 0, 0, "estimated_date_available") &&
-               odr_implicit_tag (o, ill_Medium_Type,
-                       &(*p)->hold_placed_medium_type, ODR_CONTEXT, 1, 1, "hold_placed_medium_type") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int ill_APDU_Type (ODR o, ILL_APDU_Type **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Service_Type (ODR o, ILL_Service_Type **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_String (ODR o, ILL_String **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, ILL_String_GeneralString,
-                (Odr_fun) odr_generalstring, "GeneralString"},
-               {-1, -1, -1, ILL_String_EDIFACTString,
-                (Odr_fun) ill_EDIFACTString, "EDIFACTString"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Intermediary_Problem (ODR o, ILL_Intermediary_Problem **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_ISO_Date (ODR o, ILL_ISO_Date **p, int opt, const char *name)
-{
-       return odr_visiblestring (o, p, opt, name);
-}
-
-int ill_ISO_Time (ODR o, ILL_ISO_Time **p, int opt, const char *name)
-{
-       return odr_visiblestring (o, p, opt, name);
-}
-
-int ill_Item_Id (ODR o, ILL_Item_Id **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->item_type, ODR_CONTEXT, 0, 1, "item_type") &&
-               odr_implicit_tag (o, ill_Medium_Type,
-                       &(*p)->held_medium_type, ODR_CONTEXT, 1, 1, "held_medium_type") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->call_number, ODR_CONTEXT, 2, 1, "call_number") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->author, ODR_CONTEXT, 3, 1, "author") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->title, ODR_CONTEXT, 4, 1, "title") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->sub_title, ODR_CONTEXT, 5, 1, "sub_title") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->sponsoring_body, ODR_CONTEXT, 6, 1, "sponsoring_body") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->place_of_publication, ODR_CONTEXT, 7, 1, "place_of_publication") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->publisher, ODR_CONTEXT, 8, 1, "publisher") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->series_title_number, ODR_CONTEXT, 9, 1, "series_title_number") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->volume_issue, ODR_CONTEXT, 10, 1, "volume_issue") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->edition, ODR_CONTEXT, 11, 1, "edition") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->publication_date, ODR_CONTEXT, 12, 1, "publication_date") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->publication_date_of_component, ODR_CONTEXT, 13, 1, "publication_date_of_component") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->author_of_article, ODR_CONTEXT, 14, 1, "author_of_article") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->title_of_article, ODR_CONTEXT, 15, 1, "title_of_article") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->pagination, ODR_CONTEXT, 16, 1, "pagination") &&
-               odr_explicit_tag (o, odr_external,
-                       &(*p)->national_bibliography_no, ODR_CONTEXT, 17, 1, "national_bibliography_no") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->iSBN, ODR_CONTEXT, 18, 1, "iSBN") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->iSSN, ODR_CONTEXT, 19, 1, "iSSN") &&
-               odr_explicit_tag (o, odr_external,
-                       &(*p)->system_no, ODR_CONTEXT, 20, 1, "system_no") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->additional_no_letters, ODR_CONTEXT, 21, 1, "additional_no_letters") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->verification_reference_source, ODR_CONTEXT, 22, 1, "verification_reference_source") &&
-               odr_sequence_end (o);
-}
-
-int ill_Location_Info (ODR o, ILL_Location_Info **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->location_id, ODR_CONTEXT, 0, 0, "location_id") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->location_address, ODR_CONTEXT, 1, 1, "location_address") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->location_note, ODR_CONTEXT, 2, 1, "location_note") &&
-               odr_sequence_end (o);
-}
-
-int ill_Locations_Results (ODR o, ILL_Locations_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_Reason_Locs_Provided,
-                       &(*p)->reason_locs_provided, ODR_CONTEXT, 0, 1, "reason_locs_provided") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") &&
-               odr_sequence_end (o);
-}
-
-int ill_Medium_Type (ODR o, ILL_Medium_Type **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Name_Of_Person_Or_Institution (ODR o, ILL_Name_Of_Person_Or_Institution **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, ILL_Name_Of_Person_Or_Institution_name_of_person,
-               (Odr_fun) ill_String, "name_of_person"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, ILL_Name_Of_Person_Or_Institution_name_of_institution,
-               (Odr_fun) ill_String, "name_of_institution"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Person_Or_Institution_Symbol (ODR o, ILL_Person_Or_Institution_Symbol **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, ILL_Person_Or_Institution_Symbol_person_symbol,
-               (Odr_fun) ill_String, "person_symbol"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, ILL_Person_Or_Institution_Symbol_institution_symbol,
-               (Odr_fun) ill_String, "institution_symbol"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Place_On_Hold_Type (ODR o, ILL_Place_On_Hold_Type **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Postal_Address (ODR o, ILL_Postal_Address **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_Name_Of_Person_Or_Institution,
-                       &(*p)->name_of_person_or_institution, ODR_CONTEXT, 0, 1, "name_of_person_or_institution") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->extended_postal_delivery_address, ODR_CONTEXT, 1, 1, "extended_postal_delivery_address") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->street_and_number, ODR_CONTEXT, 2, 1, "street_and_number") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->post_office_box, ODR_CONTEXT, 3, 1, "post_office_box") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->city, ODR_CONTEXT, 4, 1, "city") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->region, ODR_CONTEXT, 5, 1, "region") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->country, ODR_CONTEXT, 6, 1, "country") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->postal_code, ODR_CONTEXT, 7, 1, "postal_code") &&
-               odr_sequence_end (o);
-}
-
-int ill_Provider_Error_Report (ODR o, ILL_Provider_Error_Report **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, ILL_Provider_Error_Report_general_problem,
-               (Odr_fun) ill_General_Problem, "general_problem"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, ILL_Provider_Error_Report_transaction_id_problem,
-               (Odr_fun) ill_Transaction_Id_Problem, "transaction_id_problem"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, ILL_Provider_Error_Report_state_transition_prohibited,
-               (Odr_fun) ill_State_Transition_Prohibited, "state_transition_prohibited"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Reason_Locs_Provided (ODR o, ILL_Reason_Locs_Provided **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Reason_No_Report (ODR o, ILL_Reason_No_Report **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Reason_Unfilled (ODR o, ILL_Reason_Unfilled **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Report_Source (ODR o, ILL_Report_Source **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Requester_Optional_Messages_Type (ODR o, ILL_Requester_Optional_Messages_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->can_send_RECEIVED, ODR_CONTEXT, 0, 0, "can_send_RECEIVED") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->can_send_RETURNED, ODR_CONTEXT, 1, 0, "can_send_RETURNED") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->requester_SHIPPED, ODR_CONTEXT, 2, 0, "requester_SHIPPED") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->requester_CHECKED_IN, ODR_CONTEXT, 3, 0, "requester_CHECKED_IN") &&
-               odr_sequence_end (o);
-}
-
-int ill_Responder_Optional_Messages_Type (ODR o, ILL_Responder_Optional_Messages_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->can_send_SHIPPED, ODR_CONTEXT, 0, 0, "can_send_SHIPPED") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->can_send_CHECKED_IN, ODR_CONTEXT, 1, 0, "can_send_CHECKED_IN") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->responder_RECEIVED, ODR_CONTEXT, 2, 0, "responder_RECEIVED") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->responder_RETURNED, ODR_CONTEXT, 3, 0, "responder_RETURNED") &&
-               odr_sequence_end (o);
-}
-
-int ill_Retry_Results (ODR o, ILL_Retry_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->reason_not_available, ODR_CONTEXT, 0, 1, "reason_not_available") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->retry_date, ODR_CONTEXT, 1, 1, "retry_date") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int ill_Search_Type (ODR o, ILL_Search_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->level_of_service, ODR_CONTEXT, 0, 1, "level_of_service") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->need_before_date, ODR_CONTEXT, 1, 1, "need_before_date") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->expiry_flag, ODR_CONTEXT, 2, 0, "expiry_flag") &&
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->expiry_date, ODR_CONTEXT, 3, 1, "expiry_date") &&
-               odr_sequence_end (o);
-}
-
-int ill_Security_Problem (ODR o, ILL_Security_Problem **p, int opt, const char *name)
-{
-       return ill_String (o, p, opt, name);
-}
-
-int ill_Send_To_List_Type_s (ODR o, ILL_Send_To_List_Type_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->system_id, ODR_CONTEXT, 0, 0, "system_id") &&
-               odr_explicit_tag (o, ill_Account_Number,
-                       &(*p)->account_number, ODR_CONTEXT, 1, 1, "account_number") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->system_address, ODR_CONTEXT, 2, 1, "system_address") &&
-               odr_sequence_end (o);
-}
-
-int ill_Send_To_List_Type (ODR o, ILL_Send_To_List_Type **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) ill_Send_To_List_Type_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Service_Date_this (ODR o, ILL_Service_Date_this **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date, ODR_CONTEXT, 0, 0, "date") &&
-               odr_implicit_tag (o, ill_ISO_Time,
-                       &(*p)->time, ODR_CONTEXT, 1, 1, "time") &&
-               odr_sequence_end (o);
-}
-
-int ill_Service_Date_original (ODR o, ILL_Service_Date_original **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date, ODR_CONTEXT, 0, 0, "date") &&
-               odr_implicit_tag (o, ill_ISO_Time,
-                       &(*p)->time, ODR_CONTEXT, 1, 1, "time") &&
-               odr_sequence_end (o);
-}
-
-int ill_Service_Date_Time (ODR o, ILL_Service_Date_Time **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_Service_Date_this,
-                       &(*p)->date_time_of_this_service, ODR_CONTEXT, 0, 0, "date_time_of_this_service") &&
-               odr_implicit_tag (o, ill_Service_Date_original,
-                       &(*p)->date_time_of_original_service, ODR_CONTEXT, 1, 1, "date_time_of_original_service") &&
-               odr_sequence_end (o);
-}
-
-int ill_Shipped_Service_Type (ODR o, ILL_Shipped_Service_Type **p, int opt, const char *name)
-{
-       return ill_Service_Type (o, p, opt, name);
-}
-
-int ill_State_Transition_Prohibited (ODR o, ILL_State_Transition_Prohibited **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_APDU_Type,
-                       &(*p)->aPDU_type, ODR_CONTEXT, 0, 0, "aPDU_type") &&
-               odr_implicit_tag (o, ill_Current_State,
-                       &(*p)->current_state, ODR_CONTEXT, 1, 0, "current_state") &&
-               odr_sequence_end (o);
-}
-
-int ill_Status_Report (ODR o, ILL_Status_Report **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_History_Report,
-                       &(*p)->user_status_report, ODR_CONTEXT, 0, 0, "user_status_report") &&
-               odr_implicit_tag (o, ill_Current_State,
-                       &(*p)->provider_status_report, ODR_CONTEXT, 1, 0, "provider_status_report") &&
-               odr_sequence_end (o);
-}
-
-int ill_Supplemental_Item_Description (ODR o, ILL_Supplemental_Item_Description **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) odr_external, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Supply_Details (ODR o, ILL_Supply_Details **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 5, ILL_Supply_Details_physical_delivery,
-               (Odr_fun) ill_Transportation_Mode, "physical_delivery"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 50, ILL_Supply_Details_electronic_delivery,
-               (Odr_fun) ill_Electronic_Delivery_Service, "electronic_delivery"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_ISO_Date,
-                       &(*p)->date_shipped, ODR_CONTEXT, 0, 1, "date_shipped") &&
-               odr_implicit_tag (o, ill_Date_Due,
-                       &(*p)->date_due, ODR_CONTEXT, 1, 1, "date_due") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->chargeable_units, ODR_CONTEXT, 2, 1, "chargeable_units") &&
-               odr_implicit_tag (o, ill_Amount,
-                       &(*p)->cost, ODR_CONTEXT, 3, 1, "cost") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->shipped_conditions, ODR_CONTEXT, 4, 1, "shipped_conditions") &&
-               (odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) || odr_ok(o)) &&
-               odr_implicit_tag (o, ill_Amount,
-                       &(*p)->insured_for, ODR_CONTEXT, 6, 1, "insured_for") &&
-               odr_implicit_tag (o, ill_Amount,
-                       &(*p)->return_insurance_require, ODR_CONTEXT, 7, 1, "return_insurance_require") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 8) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Units_Per_Medium_Type, &(*p)->no_of_units_per_medium,
-                 &(*p)->num_no_of_units_per_medium, "no_of_units_per_medium") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int ill_Supply_Medium_Info_Type (ODR o, ILL_Supply_Medium_Info_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_Supply_Medium_Type,
-                       &(*p)->supply_medium_type, ODR_CONTEXT, 0, 0, "supply_medium_type") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->medium_characteristics, ODR_CONTEXT, 1, 1, "medium_characteristics") &&
-               odr_sequence_end (o);
-}
-
-int ill_Supply_Medium_Type (ODR o, ILL_Supply_Medium_Type **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_System_Address (ODR o, ILL_System_Address **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->telecom_service_identifier, ODR_CONTEXT, 0, 1, "telecom_service_identifier") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->telecom_service_address, ODR_CONTEXT, 1, 1, "telecom_service_address") &&
-               odr_sequence_end (o);
-}
-
-int ill_System_Id (ODR o, ILL_System_Id **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_Person_Or_Institution_Symbol,
-                       &(*p)->person_or_institution_symbol, ODR_CONTEXT, 0, 1, "person_or_institution_symbol") &&
-               odr_explicit_tag (o, ill_Name_Of_Person_Or_Institution,
-                       &(*p)->name_of_person_or_institution, ODR_CONTEXT, 1, 1, "name_of_person_or_institution") &&
-               odr_sequence_end (o);
-}
-
-int ill_Third_Party_Info_Type (ODR o, ILL_Third_Party_Info_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->permission_to_forward, ODR_CONTEXT, 0, 0, "permission_to_forward") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->permission_to_chain, ODR_CONTEXT, 1, 0, "permission_to_chain") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->permission_to_partition, ODR_CONTEXT, 2, 0, "permission_to_partition") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->permission_to_change_send_to_list, ODR_CONTEXT, 3, 0, "permission_to_change_send_to_list") &&
-               odr_implicit_tag (o, ill_System_Address,
-                       &(*p)->initial_requester_address, ODR_CONTEXT, 4, 1, "initial_requester_address") &&
-               odr_implicit_tag (o, odr_enum,
-                       &(*p)->preference, ODR_CONTEXT, 5, 0, "preference") &&
-               odr_implicit_tag (o, ill_Send_To_List_Type,
-                       &(*p)->send_to_list, ODR_CONTEXT, 6, 1, "send_to_list") &&
-               odr_implicit_tag (o, ill_Already_Tried_List_Type,
-                       &(*p)->already_tried_list, ODR_CONTEXT, 7, 1, "already_tried_list") &&
-               odr_sequence_end (o);
-}
-
-int ill_Transaction_Id (ODR o, ILL_Transaction_Id **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->initial_requester_id, ODR_CONTEXT, 0, 1, "initial_requester_id") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->transaction_group_qualifier, ODR_CONTEXT, 1, 0, "transaction_group_qualifier") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->transaction_qualifier, ODR_CONTEXT, 2, 0, "transaction_qualifier") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->sub_transaction_qualifier, ODR_CONTEXT, 3, 1, "sub_transaction_qualifier") &&
-               odr_sequence_end (o);
-}
-
-int ill_Transaction_Id_Problem (ODR o, ILL_Transaction_Id_Problem **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Transaction_Results (ODR o, ILL_Transaction_Results **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Transaction_Type (ODR o, ILL_Transaction_Type **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Transportation_Mode (ODR o, ILL_Transportation_Mode **p, int opt, const char *name)
-{
-       return ill_String (o, p, opt, name);
-}
-
-int ill_Unable_To_Perform (ODR o, ILL_Unable_To_Perform **p, int opt, const char *name)
-{
-       return odr_enum (o, p, opt, name);
-}
-
-int ill_Unfilled_Results (ODR o, ILL_Unfilled_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, ill_Reason_Unfilled,
-                       &(*p)->reason_unfilled, ODR_CONTEXT, 0, 0, "reason_unfilled") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int ill_Units_Per_Medium_Type (ODR o, ILL_Units_Per_Medium_Type **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, ill_Supply_Medium_Type,
-                       &(*p)->medium, ODR_CONTEXT, 0, 0, "medium") &&
-               odr_explicit_tag (o, odr_integer,
-                       &(*p)->no_of_units, ODR_CONTEXT, 1, 0, "no_of_units") &&
-               odr_sequence_end (o);
-}
-
-int ill_User_Error_Report (ODR o, ILL_User_Error_Report **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, ILL_User_Error_Report_already_forwarded,
-               (Odr_fun) ill_Already_Forwarded, "already_forwarded"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, ILL_User_Error_Report_intermediary_problem,
-               (Odr_fun) ill_Intermediary_Problem, "intermediary_problem"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, ILL_User_Error_Report_security_problem,
-               (Odr_fun) ill_Security_Problem, "security_problem"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, ILL_User_Error_Report_unable_to_perform,
-               (Odr_fun) ill_Unable_To_Perform, "unable_to_perform"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int ill_Will_Supply_Results (ODR o, ILL_Will_Supply_Results **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, odr_enum,
-                       &(*p)->reason_will_supply, ODR_CONTEXT, 0, 0, "reason_will_supply") &&
-               odr_explicit_tag (o, ill_ISO_Date,
-                       &(*p)->supply_date, ODR_CONTEXT, 1, 1, "supply_date") &&
-               odr_explicit_tag (o, ill_Postal_Address,
-                       &(*p)->return_to_address, ODR_CONTEXT, 2, 1, "return_to_address") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Location_Info, &(*p)->locations,
-                 &(*p)->num_locations, "locations") || odr_ok(o)) &&
-               odr_explicit_tag (o, ill_Electronic_Delivery_Service,
-                       &(*p)->electronic_delivery_service, ODR_CONTEXT, 4, 1, "electronic_delivery_service") &&
-               odr_sequence_end (o);
-}
-
-int ill_EDIFACTString (ODR o, ILL_EDIFACTString **p, int opt, const char *name)
-{
-       return odr_visiblestring (o, p, opt, name);
-}
-
-
diff --git a/ill/item-req.c b/ill/item-req.c
deleted file mode 100644 (file)
index b0b4c44..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: Z39.50-extendedService-ItemOrder-ItemRequest-1 */
-
-#include <yaz/item-req.h>
-
-int ill_ItemRequest (ODR o, ILL_ItemRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->protocol_version_num, ODR_CONTEXT, 0, 0, "protocol_version_num") &&
-               odr_implicit_tag (o, ill_Transaction_Id,
-                       &(*p)->transaction_id, ODR_CONTEXT, 1, 1, "transaction_id") &&
-               odr_implicit_tag (o, ill_Service_Date_Time,
-                       &(*p)->service_date_time, ODR_CONTEXT, 2, 1, "service_date_time") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->requester_id, ODR_CONTEXT, 3, 1, "requester_id") &&
-               odr_implicit_tag (o, ill_System_Id,
-                       &(*p)->responder_id, ODR_CONTEXT, 4, 1, "responder_id") &&
-               odr_implicit_tag (o, ill_Transaction_Type,
-                       &(*p)->transaction_type, ODR_CONTEXT, 5, 0, "transaction_type") &&
-               odr_implicit_tag (o, ill_Delivery_Address,
-                       &(*p)->delivery_address, ODR_CONTEXT, 6, 1, "delivery_address") &&
-               ill_Delivery_Service(o, &(*p)->delivery_service, 1, "delivery_service") &&
-               odr_implicit_tag (o, ill_Delivery_Address,
-                       &(*p)->billing_address, ODR_CONTEXT, 8, 1, "billing_address") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 9) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Service_Type, &(*p)->iLL_service_type,
-                 &(*p)->num_iLL_service_type, "iLL_service_type") || odr_ok(o)) &&
-               odr_explicit_tag (o, odr_external,
-                       &(*p)->responder_specific_service, ODR_CONTEXT, 10, 1, "responder_specific_service") &&
-               odr_implicit_tag (o, ill_Requester_Optional_Messages_Type,
-                       &(*p)->requester_optional_messages, ODR_CONTEXT, 11, 1, "requester_optional_messages") &&
-               odr_implicit_tag (o, ill_Search_Type,
-                       &(*p)->search_type, ODR_CONTEXT, 12, 1, "search_type") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 13) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Supply_Medium_Info_Type, &(*p)->supply_medium_info_type,
-                 &(*p)->num_supply_medium_info_type, "supply_medium_info_type") || odr_ok(o)) &&
-               odr_implicit_tag (o, ill_Place_On_Hold_Type,
-                       &(*p)->place_on_hold, ODR_CONTEXT, 14, 0, "place_on_hold") &&
-               odr_implicit_tag (o, ill_Client_Id,
-                       &(*p)->client_id, ODR_CONTEXT, 15, 1, "client_id") &&
-               odr_implicit_tag (o, ill_Item_Id,
-                       &(*p)->item_id, ODR_CONTEXT, 16, 1, "item_id") &&
-               odr_implicit_tag (o, ill_Supplemental_Item_Description,
-                       &(*p)->supplemental_item_description, ODR_CONTEXT, 17, 1, "supplemental_item_description") &&
-               odr_implicit_tag (o, ill_Cost_Info_Type,
-                       &(*p)->cost_info_type, ODR_CONTEXT, 18, 1, "cost_info_type") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->copyright_compliance, ODR_CONTEXT, 19, 1, "copyright_compliance") &&
-               odr_implicit_tag (o, ill_Third_Party_Info_Type,
-                       &(*p)->third_party_info_type, ODR_CONTEXT, 20, 1, "third_party_info_type") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->retry_flag, ODR_CONTEXT, 21, 0, "retry_flag") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->forward_flag, ODR_CONTEXT, 22, 0, "forward_flag") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->requester_note, ODR_CONTEXT, 46, 1, "requester_note") &&
-               odr_explicit_tag (o, ill_String,
-                       &(*p)->forward_note, ODR_CONTEXT, 47, 1, "forward_note") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 49) &&
-               (odr_sequence_of(o, (Odr_fun) ill_Extension, &(*p)->iLL_request_extensions,
-                 &(*p)->num_iLL_request_extensions, "iLL_request_extensions") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
index fd840ee..980261e 100644 (file)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.8 2000-03-14 09:19:49 ian Exp $
+## $Id: Makefile.am,v 1.9 2000-10-03 12:55:50 adam Exp $
 
 pkginclude_HEADERS= backend.h ccl.h comstack.h \
  d1_attset.h d1_map.h data1.h diagbib1.h \
@@ -11,7 +11,5 @@ pkginclude_HEADERS= backend.h ccl.h comstack.h \
  z-grs.h z-opac.h z-proto.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h \
  z-univ.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h zes-psched.h zes-admin.h \
  \
- zes-pset.h zes-update.h zes-update0.h \
- prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h \
- prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h
+ zes-pset.h zes-update.h zes-update0.h
 
index 6bdcb50..3c2bbb2 100644 (file)
@@ -79,7 +79,7 @@ SUBDIRS_VAR = @SUBDIRS_VAR@
 VERSION = @VERSION@
 YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
 
-pkginclude_HEADERS = backend.h ccl.h comstack.h  d1_attset.h d1_map.h data1.h diagbib1.h  log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h  pquery.h prt-ext.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h  yaz-ccl.h yaz-util.h yaz-version.h yconfig.h proto.h   ill.h ill-core.h item-req.h z-accdes1.h z-accform1.h  z-acckrb1.h z-core.h z-date.h z-diag1.h z-espec1.h z-estask.h z-exp.h  z-grs.h z-opac.h z-proto.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h  z-univ.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h zes-psched.h zes-admin.h   zes-pset.h zes-update.h zes-update0.h  prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h  prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h
+pkginclude_HEADERS = backend.h ccl.h comstack.h  d1_attset.h d1_map.h data1.h diagbib1.h  log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h  pquery.h prt-ext.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h  yaz-ccl.h yaz-util.h yaz-version.h yconfig.h proto.h   ill.h ill-core.h item-req.h z-accdes1.h z-accform1.h  z-acckrb1.h z-core.h z-date.h z-diag1.h z-espec1.h z-estask.h z-exp.h  z-grs.h z-opac.h z-proto.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h  z-univ.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h zes-psched.h zes-admin.h   zes-pset.h zes-update.h zes-update0.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
diff --git a/include/yaz/ill-core.h b/include/yaz/ill-core.h
deleted file mode 100644 (file)
index 37431b6..0000000
+++ /dev/null
@@ -1,1329 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ISO-10161-ILL-1 */
-
-#ifndef ill_core_H
-#define ill_core_H
-
-#include <yaz/odr.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-typedef struct ILL_APDU ILL_APDU;
-YAZ_EXPORT int ill_APDU (ODR o, ILL_APDU **p, int opt, const char *name);
-
-typedef struct ILL_Request ILL_Request;
-YAZ_EXPORT int ill_Request (ODR o, ILL_Request **p, int opt, const char *name);
-
-typedef struct ILL_Forward_Notification ILL_Forward_Notification;
-YAZ_EXPORT int ill_Forward_Notification (ODR o, ILL_Forward_Notification **p, int opt, const char *name);
-
-typedef struct ILL_Shipped ILL_Shipped;
-YAZ_EXPORT int ill_Shipped (ODR o, ILL_Shipped **p, int opt, const char *name);
-
-typedef struct ILL_Answer ILL_Answer;
-YAZ_EXPORT int ill_Answer (ODR o, ILL_Answer **p, int opt, const char *name);
-
-typedef struct ILL_Conditional_Reply ILL_Conditional_Reply;
-YAZ_EXPORT int ill_Conditional_Reply (ODR o, ILL_Conditional_Reply **p, int opt, const char *name);
-
-typedef struct ILL_Cancel ILL_Cancel;
-YAZ_EXPORT int ill_Cancel (ODR o, ILL_Cancel **p, int opt, const char *name);
-
-typedef struct ILL_Cancel_Reply ILL_Cancel_Reply;
-YAZ_EXPORT int ill_Cancel_Reply (ODR o, ILL_Cancel_Reply **p, int opt, const char *name);
-
-typedef struct ILL_Received ILL_Received;
-YAZ_EXPORT int ill_Received (ODR o, ILL_Received **p, int opt, const char *name);
-
-typedef struct ILL_Recall ILL_Recall;
-YAZ_EXPORT int ill_Recall (ODR o, ILL_Recall **p, int opt, const char *name);
-
-typedef struct ILL_Returned ILL_Returned;
-YAZ_EXPORT int ill_Returned (ODR o, ILL_Returned **p, int opt, const char *name);
-
-typedef struct ILL_Checked_In ILL_Checked_In;
-YAZ_EXPORT int ill_Checked_In (ODR o, ILL_Checked_In **p, int opt, const char *name);
-
-typedef struct ILL_Overdue_Extension ILL_Overdue_Extension;
-YAZ_EXPORT int ill_Overdue_Extension (ODR o, ILL_Overdue_Extension **p, int opt, const char *name);
-
-typedef struct ILL_Overdue ILL_Overdue;
-YAZ_EXPORT int ill_Overdue (ODR o, ILL_Overdue **p, int opt, const char *name);
-
-typedef struct ILL_Renew ILL_Renew;
-YAZ_EXPORT int ill_Renew (ODR o, ILL_Renew **p, int opt, const char *name);
-
-typedef struct ILL_Renew_Answer ILL_Renew_Answer;
-YAZ_EXPORT int ill_Renew_Answer (ODR o, ILL_Renew_Answer **p, int opt, const char *name);
-
-typedef struct ILL_Lost ILL_Lost;
-YAZ_EXPORT int ill_Lost (ODR o, ILL_Lost **p, int opt, const char *name);
-
-typedef struct ILL_Damaged ILL_Damaged;
-YAZ_EXPORT int ill_Damaged (ODR o, ILL_Damaged **p, int opt, const char *name);
-
-typedef struct ILL_Message ILL_Message;
-YAZ_EXPORT int ill_Message (ODR o, ILL_Message **p, int opt, const char *name);
-
-typedef struct ILL_Status_Query ILL_Status_Query;
-YAZ_EXPORT int ill_Status_Query (ODR o, ILL_Status_Query **p, int opt, const char *name);
-
-typedef struct ILL_Status_Or_Error_Report ILL_Status_Or_Error_Report;
-YAZ_EXPORT int ill_Status_Or_Error_Report (ODR o, ILL_Status_Or_Error_Report **p, int opt, const char *name);
-
-typedef struct ILL_Expired ILL_Expired;
-YAZ_EXPORT int ill_Expired (ODR o, ILL_Expired **p, int opt, const char *name);
-
-typedef struct ILL_Already_Forwarded ILL_Already_Forwarded;
-YAZ_EXPORT int ill_Already_Forwarded (ODR o, ILL_Already_Forwarded **p, int opt, const char *name);
-
-typedef struct ILL_Already_Tried_List_Type ILL_Already_Tried_List_Type;
-YAZ_EXPORT int ill_Already_Tried_List_Type (ODR o, ILL_Already_Tried_List_Type **p, int opt, const char *name);
-
-typedef struct ILL_Amount ILL_Amount;
-YAZ_EXPORT int ill_Amount (ODR o, ILL_Amount **p, int opt, const char *name);
-
-typedef char  ILL_AmountString;
-YAZ_EXPORT int ill_AmountString (ODR o, ILL_AmountString **p, int opt, const char *name);
-
-typedef struct ILL_Client_Id ILL_Client_Id;
-YAZ_EXPORT int ill_Client_Id (ODR o, ILL_Client_Id **p, int opt, const char *name);
-
-typedef struct ILL_Conditional_Results ILL_Conditional_Results;
-YAZ_EXPORT int ill_Conditional_Results (ODR o, ILL_Conditional_Results **p, int opt, const char *name);
-
-typedef struct ILL_Cost_Info_Type ILL_Cost_Info_Type;
-YAZ_EXPORT int ill_Cost_Info_Type (ODR o, ILL_Cost_Info_Type **p, int opt, const char *name);
-
-typedef int  ILL_Current_State;
-YAZ_EXPORT int ill_Current_State (ODR o, ILL_Current_State **p, int opt, const char *name);
-
-typedef struct ILL_Damaged_DetailsSpecific_units ILL_Damaged_DetailsSpecific_units;
-YAZ_EXPORT int ill_Damaged_DetailsSpecific_units (ODR o, ILL_Damaged_DetailsSpecific_units **p, int opt, const char *name);
-
-typedef struct ILL_Damaged_Details ILL_Damaged_Details;
-YAZ_EXPORT int ill_Damaged_Details (ODR o, ILL_Damaged_Details **p, int opt, const char *name);
-
-typedef struct ILL_Date_Due ILL_Date_Due;
-YAZ_EXPORT int ill_Date_Due (ODR o, ILL_Date_Due **p, int opt, const char *name);
-
-typedef struct ILL_Delivery_Address ILL_Delivery_Address;
-YAZ_EXPORT int ill_Delivery_Address (ODR o, ILL_Delivery_Address **p, int opt, const char *name);
-
-typedef struct ILL_Delivery_ServiceElectronic_delivery ILL_Delivery_ServiceElectronic_delivery;
-YAZ_EXPORT int ill_Delivery_ServiceElectronic_delivery (ODR o, ILL_Delivery_ServiceElectronic_delivery **p, int opt, const char *name);
-
-typedef struct ILL_Delivery_Service ILL_Delivery_Service;
-YAZ_EXPORT int ill_Delivery_Service (ODR o, ILL_Delivery_Service **p, int opt, const char *name);
-
-typedef struct ILL_Electronic_Delivery_Service_0 ILL_Electronic_Delivery_Service_0;
-YAZ_EXPORT int ill_Electronic_Delivery_Service_0 (ODR o, ILL_Electronic_Delivery_Service_0 **p, int opt, const char *name);
-
-typedef struct ILL_Electronic_Delivery_Service_1 ILL_Electronic_Delivery_Service_1;
-YAZ_EXPORT int ill_Electronic_Delivery_Service_1 (ODR o, ILL_Electronic_Delivery_Service_1 **p, int opt, const char *name);
-
-typedef struct ILL_Electronic_Delivery_Service ILL_Electronic_Delivery_Service;
-YAZ_EXPORT int ill_Electronic_Delivery_Service (ODR o, ILL_Electronic_Delivery_Service **p, int opt, const char *name);
-
-typedef struct ILL_Error_Report ILL_Error_Report;
-YAZ_EXPORT int ill_Error_Report (ODR o, ILL_Error_Report **p, int opt, const char *name);
-
-typedef struct ILL_Estimate_Results ILL_Estimate_Results;
-YAZ_EXPORT int ill_Estimate_Results (ODR o, ILL_Estimate_Results **p, int opt, const char *name);
-
-typedef struct ILL_Extension ILL_Extension;
-YAZ_EXPORT int ill_Extension (ODR o, ILL_Extension **p, int opt, const char *name);
-
-typedef int  ILL_General_Problem;
-YAZ_EXPORT int ill_General_Problem (ODR o, ILL_General_Problem **p, int opt, const char *name);
-
-typedef struct ILL_History_Report ILL_History_Report;
-YAZ_EXPORT int ill_History_Report (ODR o, ILL_History_Report **p, int opt, const char *name);
-
-typedef struct ILL_Hold_Placed_Results ILL_Hold_Placed_Results;
-YAZ_EXPORT int ill_Hold_Placed_Results (ODR o, ILL_Hold_Placed_Results **p, int opt, const char *name);
-
-typedef int  ILL_APDU_Type;
-YAZ_EXPORT int ill_APDU_Type (ODR o, ILL_APDU_Type **p, int opt, const char *name);
-
-typedef int  ILL_Service_Type;
-YAZ_EXPORT int ill_Service_Type (ODR o, ILL_Service_Type **p, int opt, const char *name);
-
-typedef struct ILL_String ILL_String;
-YAZ_EXPORT int ill_String (ODR o, ILL_String **p, int opt, const char *name);
-
-typedef ILL_String  ILL_Account_Number;
-YAZ_EXPORT int ill_Account_Number (ODR o, ILL_Account_Number **p, int opt, const char *name);
-
-typedef int  ILL_Intermediary_Problem;
-YAZ_EXPORT int ill_Intermediary_Problem (ODR o, ILL_Intermediary_Problem **p, int opt, const char *name);
-
-typedef char  ILL_ISO_Date;
-YAZ_EXPORT int ill_ISO_Date (ODR o, ILL_ISO_Date **p, int opt, const char *name);
-
-typedef char  ILL_ISO_Time;
-YAZ_EXPORT int ill_ISO_Time (ODR o, ILL_ISO_Time **p, int opt, const char *name);
-
-typedef struct ILL_Item_Id ILL_Item_Id;
-YAZ_EXPORT int ill_Item_Id (ODR o, ILL_Item_Id **p, int opt, const char *name);
-
-typedef struct ILL_Location_Info ILL_Location_Info;
-YAZ_EXPORT int ill_Location_Info (ODR o, ILL_Location_Info **p, int opt, const char *name);
-
-typedef struct ILL_Locations_Results ILL_Locations_Results;
-YAZ_EXPORT int ill_Locations_Results (ODR o, ILL_Locations_Results **p, int opt, const char *name);
-
-typedef int  ILL_Medium_Type;
-YAZ_EXPORT int ill_Medium_Type (ODR o, ILL_Medium_Type **p, int opt, const char *name);
-
-typedef struct ILL_Name_Of_Person_Or_Institution ILL_Name_Of_Person_Or_Institution;
-YAZ_EXPORT int ill_Name_Of_Person_Or_Institution (ODR o, ILL_Name_Of_Person_Or_Institution **p, int opt, const char *name);
-
-typedef struct ILL_Person_Or_Institution_Symbol ILL_Person_Or_Institution_Symbol;
-YAZ_EXPORT int ill_Person_Or_Institution_Symbol (ODR o, ILL_Person_Or_Institution_Symbol **p, int opt, const char *name);
-
-typedef int  ILL_Place_On_Hold_Type;
-YAZ_EXPORT int ill_Place_On_Hold_Type (ODR o, ILL_Place_On_Hold_Type **p, int opt, const char *name);
-
-typedef struct ILL_Postal_Address ILL_Postal_Address;
-YAZ_EXPORT int ill_Postal_Address (ODR o, ILL_Postal_Address **p, int opt, const char *name);
-
-typedef struct ILL_Provider_Error_Report ILL_Provider_Error_Report;
-YAZ_EXPORT int ill_Provider_Error_Report (ODR o, ILL_Provider_Error_Report **p, int opt, const char *name);
-
-typedef int  ILL_Reason_Locs_Provided;
-YAZ_EXPORT int ill_Reason_Locs_Provided (ODR o, ILL_Reason_Locs_Provided **p, int opt, const char *name);
-
-typedef int  ILL_Reason_No_Report;
-YAZ_EXPORT int ill_Reason_No_Report (ODR o, ILL_Reason_No_Report **p, int opt, const char *name);
-
-typedef int  ILL_Reason_Unfilled;
-YAZ_EXPORT int ill_Reason_Unfilled (ODR o, ILL_Reason_Unfilled **p, int opt, const char *name);
-
-typedef int  ILL_Report_Source;
-YAZ_EXPORT int ill_Report_Source (ODR o, ILL_Report_Source **p, int opt, const char *name);
-
-typedef struct ILL_Requester_Optional_Messages_Type ILL_Requester_Optional_Messages_Type;
-YAZ_EXPORT int ill_Requester_Optional_Messages_Type (ODR o, ILL_Requester_Optional_Messages_Type **p, int opt, const char *name);
-
-typedef struct ILL_Responder_Optional_Messages_Type ILL_Responder_Optional_Messages_Type;
-YAZ_EXPORT int ill_Responder_Optional_Messages_Type (ODR o, ILL_Responder_Optional_Messages_Type **p, int opt, const char *name);
-
-typedef struct ILL_Retry_Results ILL_Retry_Results;
-YAZ_EXPORT int ill_Retry_Results (ODR o, ILL_Retry_Results **p, int opt, const char *name);
-
-typedef struct ILL_Search_Type ILL_Search_Type;
-YAZ_EXPORT int ill_Search_Type (ODR o, ILL_Search_Type **p, int opt, const char *name);
-
-typedef ILL_String  ILL_Security_Problem;
-YAZ_EXPORT int ill_Security_Problem (ODR o, ILL_Security_Problem **p, int opt, const char *name);
-
-typedef struct ILL_Send_To_List_Type_s ILL_Send_To_List_Type_s;
-YAZ_EXPORT int ill_Send_To_List_Type_s (ODR o, ILL_Send_To_List_Type_s **p, int opt, const char *name);
-
-typedef struct ILL_Send_To_List_Type ILL_Send_To_List_Type;
-YAZ_EXPORT int ill_Send_To_List_Type (ODR o, ILL_Send_To_List_Type **p, int opt, const char *name);
-
-typedef struct ILL_Service_Date_this ILL_Service_Date_this;
-YAZ_EXPORT int ill_Service_Date_this (ODR o, ILL_Service_Date_this **p, int opt, const char *name);
-
-typedef struct ILL_Service_Date_original ILL_Service_Date_original;
-YAZ_EXPORT int ill_Service_Date_original (ODR o, ILL_Service_Date_original **p, int opt, const char *name);
-
-typedef struct ILL_Service_Date_Time ILL_Service_Date_Time;
-YAZ_EXPORT int ill_Service_Date_Time (ODR o, ILL_Service_Date_Time **p, int opt, const char *name);
-
-typedef ILL_Service_Type  ILL_Shipped_Service_Type;
-YAZ_EXPORT int ill_Shipped_Service_Type (ODR o, ILL_Shipped_Service_Type **p, int opt, const char *name);
-
-typedef struct ILL_State_Transition_Prohibited ILL_State_Transition_Prohibited;
-YAZ_EXPORT int ill_State_Transition_Prohibited (ODR o, ILL_State_Transition_Prohibited **p, int opt, const char *name);
-
-typedef struct ILL_Status_Report ILL_Status_Report;
-YAZ_EXPORT int ill_Status_Report (ODR o, ILL_Status_Report **p, int opt, const char *name);
-
-typedef struct ILL_Supplemental_Item_Description ILL_Supplemental_Item_Description;
-YAZ_EXPORT int ill_Supplemental_Item_Description (ODR o, ILL_Supplemental_Item_Description **p, int opt, const char *name);
-
-typedef struct ILL_Supply_Details ILL_Supply_Details;
-YAZ_EXPORT int ill_Supply_Details (ODR o, ILL_Supply_Details **p, int opt, const char *name);
-
-typedef struct ILL_Supply_Medium_Info_Type ILL_Supply_Medium_Info_Type;
-YAZ_EXPORT int ill_Supply_Medium_Info_Type (ODR o, ILL_Supply_Medium_Info_Type **p, int opt, const char *name);
-
-typedef int  ILL_Supply_Medium_Type;
-YAZ_EXPORT int ill_Supply_Medium_Type (ODR o, ILL_Supply_Medium_Type **p, int opt, const char *name);
-
-typedef struct ILL_System_Address ILL_System_Address;
-YAZ_EXPORT int ill_System_Address (ODR o, ILL_System_Address **p, int opt, const char *name);
-
-typedef struct ILL_System_Id ILL_System_Id;
-YAZ_EXPORT int ill_System_Id (ODR o, ILL_System_Id **p, int opt, const char *name);
-
-typedef struct ILL_Third_Party_Info_Type ILL_Third_Party_Info_Type;
-YAZ_EXPORT int ill_Third_Party_Info_Type (ODR o, ILL_Third_Party_Info_Type **p, int opt, const char *name);
-
-typedef struct ILL_Transaction_Id ILL_Transaction_Id;
-YAZ_EXPORT int ill_Transaction_Id (ODR o, ILL_Transaction_Id **p, int opt, const char *name);
-
-typedef int  ILL_Transaction_Id_Problem;
-YAZ_EXPORT int ill_Transaction_Id_Problem (ODR o, ILL_Transaction_Id_Problem **p, int opt, const char *name);
-
-typedef int  ILL_Transaction_Results;
-YAZ_EXPORT int ill_Transaction_Results (ODR o, ILL_Transaction_Results **p, int opt, const char *name);
-
-typedef int  ILL_Transaction_Type;
-YAZ_EXPORT int ill_Transaction_Type (ODR o, ILL_Transaction_Type **p, int opt, const char *name);
-
-typedef ILL_String  ILL_Transportation_Mode;
-YAZ_EXPORT int ill_Transportation_Mode (ODR o, ILL_Transportation_Mode **p, int opt, const char *name);
-
-typedef int  ILL_Unable_To_Perform;
-YAZ_EXPORT int ill_Unable_To_Perform (ODR o, ILL_Unable_To_Perform **p, int opt, const char *name);
-
-typedef struct ILL_Unfilled_Results ILL_Unfilled_Results;
-YAZ_EXPORT int ill_Unfilled_Results (ODR o, ILL_Unfilled_Results **p, int opt, const char *name);
-
-typedef struct ILL_Units_Per_Medium_Type ILL_Units_Per_Medium_Type;
-YAZ_EXPORT int ill_Units_Per_Medium_Type (ODR o, ILL_Units_Per_Medium_Type **p, int opt, const char *name);
-
-typedef struct ILL_User_Error_Report ILL_User_Error_Report;
-YAZ_EXPORT int ill_User_Error_Report (ODR o, ILL_User_Error_Report **p, int opt, const char *name);
-
-typedef struct ILL_Will_Supply_Results ILL_Will_Supply_Results;
-YAZ_EXPORT int ill_Will_Supply_Results (ODR o, ILL_Will_Supply_Results **p, int opt, const char *name);
-
-typedef char  ILL_EDIFACTString;
-YAZ_EXPORT int ill_EDIFACTString (ODR o, ILL_EDIFACTString **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct ILL_APDU {
-       int which;
-       union {
-               ILL_Request *ILL_Request;
-               ILL_Forward_Notification *Forward_Notification;
-               ILL_Shipped *Shipped;
-               ILL_Answer *ILL_Answer;
-               ILL_Conditional_Reply *Conditional_Reply;
-               ILL_Cancel *Cancel;
-               ILL_Cancel_Reply *Cancel_Reply;
-               ILL_Received *Received;
-               ILL_Recall *Recall;
-               ILL_Returned *Returned;
-               ILL_Checked_In *Checked_In;
-               ILL_Overdue *Overdue;
-               ILL_Renew *Renew;
-               ILL_Renew_Answer *Renew_Answer;
-               ILL_Lost *Lost;
-               ILL_Damaged *Damaged;
-               ILL_Message *Message;
-               ILL_Status_Query *Status_Query;
-               ILL_Status_Or_Error_Report *Status_Or_Error_Report;
-               ILL_Expired *Expired;
-#define ILL_APDU_ILL_Request 1
-#define ILL_APDU_Forward_Notification 2
-#define ILL_APDU_Shipped 3
-#define ILL_APDU_ILL_Answer 4
-#define ILL_APDU_Conditional_Reply 5
-#define ILL_APDU_Cancel 6
-#define ILL_APDU_Cancel_Reply 7
-#define ILL_APDU_Received 8
-#define ILL_APDU_Recall 9
-#define ILL_APDU_Returned 10
-#define ILL_APDU_Checked_In 11
-#define ILL_APDU_Overdue 12
-#define ILL_APDU_Renew 13
-#define ILL_APDU_Renew_Answer 14
-#define ILL_APDU_Lost 15
-#define ILL_APDU_Damaged 16
-#define ILL_APDU_Message 17
-#define ILL_APDU_Status_Query 18
-#define ILL_APDU_Status_Or_Error_Report 19
-#define ILL_APDU_Expired 20
-       } u;
-};
-
-struct ILL_Request {
-#define ILL_Request_version_1 1
-#define ILL_Request_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Transaction_Type *transaction_type;
-       ILL_Delivery_Address *delivery_address; /* OPT */
-       ILL_Delivery_Service *delivery_service; /* OPT */
-       ILL_Delivery_Address *billing_address; /* OPT */
-       int num_iLL_service_type;
-       ILL_Service_Type **iLL_service_type;
-       Odr_external *responder_specific_service; /* OPT */
-       ILL_Requester_Optional_Messages_Type *requester_optional_messages;
-       ILL_Search_Type *search_type; /* OPT */
-       int num_supply_medium_info_type;
-       ILL_Supply_Medium_Info_Type **supply_medium_info_type; /* OPT */
-       ILL_Place_On_Hold_Type *place_on_hold;
-       ILL_Client_Id *client_id; /* OPT */
-       ILL_Item_Id *item_id;
-       ILL_Supplemental_Item_Description *supplemental_item_description; /* OPT */
-       ILL_Cost_Info_Type *cost_info_type; /* OPT */
-       ILL_String *copyright_compliance; /* OPT */
-       ILL_Third_Party_Info_Type *third_party_info_type; /* OPT */
-       bool_t *retry_flag;
-       bool_t *forward_flag;
-       ILL_String *requester_note; /* OPT */
-       ILL_String *forward_note; /* OPT */
-       int num_iLL_request_extensions;
-       ILL_Extension **iLL_request_extensions; /* OPT */
-};
-
-struct ILL_Forward_Notification {
-#define ILL_Forward_Notification_version_1 1
-#define ILL_Forward_Notification_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id;
-       ILL_System_Address *responder_address; /* OPT */
-       ILL_System_Id *intermediary_id;
-       ILL_String *notification_note; /* OPT */
-       int num_forward_notification_extensions;
-       ILL_Extension **forward_notification_extensions; /* OPT */
-};
-
-struct ILL_Shipped {
-#define ILL_Shipped_version_1 1
-#define ILL_Shipped_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_System_Address *responder_address; /* OPT */
-       ILL_System_Id *intermediary_id; /* OPT */
-       ILL_System_Id *supplier_id; /* OPT */
-       ILL_Client_Id *client_id; /* OPT */
-       ILL_Transaction_Type *transaction_type;
-       ILL_Supplemental_Item_Description *supplemental_item_description; /* OPT */
-       ILL_Shipped_Service_Type *shipped_service_type;
-       ILL_Responder_Optional_Messages_Type *responder_optional_messages; /* OPT */
-       ILL_Supply_Details *supply_details;
-       ILL_Postal_Address *return_to_address; /* OPT */
-       ILL_String *responder_note; /* OPT */
-       int num_shipped_extensions;
-       ILL_Extension **shipped_extensions; /* OPT */
-};
-
-struct ILL_Answer {
-#define ILL_Answer_version_1 1
-#define ILL_Answer_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Transaction_Results *transaction_results;
-       int which;
-       union {
-               ILL_Conditional_Results *conditional_results;
-               ILL_Retry_Results *retry_results;
-               ILL_Unfilled_Results *unfilled_results;
-               ILL_Locations_Results *locations_results;
-               ILL_Will_Supply_Results *will_supply_results;
-               ILL_Hold_Placed_Results *hold_placed_results;
-               ILL_Estimate_Results *estimate_results;
-#define ILL_Answer_conditional_results 1
-#define ILL_Answer_retry_results 2
-#define ILL_Answer_unfilled_results 3
-#define ILL_Answer_locations_results 4
-#define ILL_Answer_will_supply_results 5
-#define ILL_Answer_hold_placed_results 6
-#define ILL_Answer_estimate_results 7
-       } u; /* OPT */
-       Odr_external *responder_specific_results; /* OPT */
-       ILL_Supplemental_Item_Description *supplemental_item_description; /* OPT */
-       ILL_Send_To_List_Type *send_to_list; /* OPT */
-       ILL_Already_Tried_List_Type *already_tried_list; /* OPT */
-       ILL_Responder_Optional_Messages_Type *responder_optional_messages; /* OPT */
-       ILL_String *responder_note; /* OPT */
-       int num_ill_answer_extensions;
-       ILL_Extension **ill_answer_extensions; /* OPT */
-};
-
-struct ILL_Conditional_Reply {
-#define ILL_Conditional_Reply_version_1 1
-#define ILL_Conditional_Reply_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       bool_t *answer;
-       ILL_String *requester_note; /* OPT */
-       int num_conditional_reply_extensions;
-       ILL_Extension **conditional_reply_extensions; /* OPT */
-};
-
-struct ILL_Cancel {
-#define ILL_Cancel_version_1 1
-#define ILL_Cancel_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_String *requester_note; /* OPT */
-       int num_cancel_extensions;
-       ILL_Extension **cancel_extensions; /* OPT */
-};
-
-struct ILL_Cancel_Reply {
-#define ILL_Cancel_Reply_version_1 1
-#define ILL_Cancel_Reply_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       bool_t *answer;
-       ILL_String *responder_note; /* OPT */
-       int num_cancel_reply_extensions;
-       ILL_Extension **cancel_reply_extensions; /* OPT */
-};
-
-struct ILL_Received {
-#define ILL_Received_version_1 1
-#define ILL_Received_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_System_Id *supplier_id; /* OPT */
-       ILL_Supplemental_Item_Description *supplemental_item_description; /* OPT */
-       ILL_ISO_Date *date_received;
-       ILL_Shipped_Service_Type *shipped_service_type;
-       ILL_String *requester_note; /* OPT */
-       int num_received_extensions;
-       ILL_Extension **received_extensions; /* OPT */
-};
-
-struct ILL_Recall {
-#define ILL_Recall_version_1 1
-#define ILL_Recall_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_String *responder_note; /* OPT */
-       int num_recall_extensions;
-       ILL_Extension **recall_extensions; /* OPT */
-};
-
-struct ILL_Returned {
-#define ILL_Returned_version_1 1
-#define ILL_Returned_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Supplemental_Item_Description *supplemental_item_description; /* OPT */
-       ILL_ISO_Date *date_returned;
-       ILL_Transportation_Mode *returned_via; /* OPT */
-       ILL_Amount *insured_for; /* OPT */
-       ILL_String *requester_note; /* OPT */
-       int num_returned_extensions;
-       ILL_Extension **returned_extensions; /* OPT */
-};
-
-struct ILL_Checked_In {
-#define ILL_Checked_In_version_1 1
-#define ILL_Checked_In_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_ISO_Date *date_checked_in;
-       ILL_String *responder_note; /* OPT */
-       int num_checked_in_extensions;
-       ILL_Extension **checked_in_extensions; /* OPT */
-};
-
-struct ILL_Overdue_Extension {
-       int num;
-       ILL_Extension **elements;
-};
-
-struct ILL_Overdue {
-#define ILL_Overdue_version_1 1
-#define ILL_Overdue_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Date_Due *date_due;
-       ILL_String *responder_note; /* OPT */
-       ILL_Overdue_Extension *overdue_extensions; /* OPT */
-};
-
-struct ILL_Renew {
-#define ILL_Renew_version_1 1
-#define ILL_Renew_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_ISO_Date *desired_due_date; /* OPT */
-       ILL_String *requester_note; /* OPT */
-       int num_renew_extensions;
-       ILL_Extension **renew_extensions; /* OPT */
-};
-
-struct ILL_Renew_Answer {
-#define ILL_Renew_Answer_version_1 1
-#define ILL_Renew_Answer_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       bool_t *answer;
-       ILL_Date_Due *date_due; /* OPT */
-       ILL_String *responder_note; /* OPT */
-       int num_renew_answer_extensions;
-       ILL_Extension **renew_answer_extensions; /* OPT */
-};
-
-struct ILL_Lost {
-#define ILL_Lost_version_1 1
-#define ILL_Lost_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_String *note; /* OPT */
-       int num_lost_extensions;
-       ILL_Extension **lost_extensions; /* OPT */
-};
-
-struct ILL_Damaged {
-#define ILL_Damaged_version_1 1
-#define ILL_Damaged_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Damaged_Details *damaged_details; /* OPT */
-       ILL_String *note; /* OPT */
-       int num_damaged_extensions;
-       ILL_Extension **damaged_extensions; /* OPT */
-};
-
-struct ILL_Message {
-#define ILL_Message_version_1 1
-#define ILL_Message_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_String *note;
-       int num_message_extensions;
-       ILL_Extension **message_extensions; /* OPT */
-};
-
-struct ILL_Status_Query {
-#define ILL_Status_Query_version_1 1
-#define ILL_Status_Query_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_String *note; /* OPT */
-       int num_status_query_extensions;
-       ILL_Extension **status_query_extensions; /* OPT */
-};
-
-struct ILL_Status_Or_Error_Report {
-#define ILL_Status_Or_Error_Report_version_1 1
-#define ILL_Status_Or_Error_Report_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Reason_No_Report *reason_no_report; /* OPT */
-       ILL_Status_Report *status_report; /* OPT */
-       ILL_Error_Report *error_report; /* OPT */
-       ILL_String *note; /* OPT */
-       int num_status_or_error_report_extensions;
-       ILL_Extension **status_or_error_report_extensions; /* OPT */
-};
-
-struct ILL_Expired {
-#define ILL_Expired_version_1 1
-#define ILL_Expired_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id;
-       ILL_Service_Date_Time *service_date_time;
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       int num_expired_extensions;
-       ILL_Extension **expired_extensions; /* OPT */
-};
-
-
-
-struct ILL_Already_Forwarded {
-       ILL_System_Id *responder_id;
-       ILL_System_Address *responder_address; /* OPT */
-};
-
-struct ILL_Already_Tried_List_Type {
-       int num;
-       ILL_System_Id **elements;
-};
-
-struct ILL_Amount {
-       char *currency_code; /* OPT */
-       ILL_AmountString *monetary_value;
-};
-
-
-
-struct ILL_Client_Id {
-       ILL_String *client_name; /* OPT */
-       ILL_String *client_status; /* OPT */
-       ILL_String *client_identifier; /* OPT */
-};
-
-struct ILL_Conditional_Results {
-#define ILL_Conditional_Results_cost_exceeds_limit 13
-#define ILL_Conditional_Results_charges 14
-#define ILL_Conditional_Results_prepayment_required 15
-#define ILL_Conditional_Results_lacks_copyright_compliance 16
-#define ILL_Conditional_Results_library_use_only 22
-#define ILL_Conditional_Results_no_reproduction 23
-#define ILL_Conditional_Results_client_signature_required 24
-#define ILL_Conditional_Results_special_collections_supervision_required 25
-#define ILL_Conditional_Results_other 27
-#define ILL_Conditional_Results_responder_specific 28
-#define ILL_Conditional_Results_proposed_delivery_service 30
-       int *conditions;
-       ILL_ISO_Date *date_for_reply; /* OPT */
-       int num_locations;
-       ILL_Location_Info **locations; /* OPT */
-       ILL_Delivery_Service *proposed_delivery_service; /* OPT */
-};
-
-struct ILL_Cost_Info_Type {
-       ILL_Account_Number *account_number; /* OPT */
-       ILL_Amount *maximum_cost; /* OPT */
-       bool_t *reciprocal_agreement;
-       bool_t *will_pay_fee;
-       bool_t *payment_provided;
-};
-
-#define ILL_Current_State_nOT_SUPPLIED 1
-#define ILL_Current_State_pENDING 2
-#define ILL_Current_State_iN_PROCESS 3
-#define ILL_Current_State_fORWARD 4
-#define ILL_Current_State_cONDITIONAL 5
-#define ILL_Current_State_cANCEL_PENDING 6
-#define ILL_Current_State_cANCELLED 7
-#define ILL_Current_State_sHIPPED 8
-#define ILL_Current_State_rECEIVED 9
-#define ILL_Current_State_rENEW_PENDING 10
-#define ILL_Current_State_nOT_RECEIVED_OVERDUE 11
-#define ILL_Current_State_rENEW_OVERDUE 12
-#define ILL_Current_State_oVERDUE 13
-#define ILL_Current_State_rETURNED 14
-#define ILL_Current_State_cHECKED_IN 15
-#define ILL_Current_State_rECALL 16
-#define ILL_Current_State_lOST 17
-#define ILL_Current_State_uNKNOWN 18
-
-struct ILL_Damaged_DetailsSpecific_units {
-       int num;
-       int **elements;
-};
-
-struct ILL_Damaged_Details {
-       Odr_oid *document_type_id; /* OPT */
-       int which;
-       union {
-               Odr_null *complete_document;
-               ILL_Damaged_DetailsSpecific_units *specific_units;
-#define ILL_Damaged_Details_complete_document 1
-#define ILL_Damaged_Details_specific_units 2
-       } u;
-};
-
-struct ILL_Date_Due {
-       ILL_ISO_Date *date_due_field;
-       bool_t *renewable;
-};
-
-struct ILL_Delivery_Address {
-       ILL_Postal_Address *postal_address; /* OPT */
-       ILL_System_Address *electronic_address; /* OPT */
-};
-
-struct ILL_Delivery_ServiceElectronic_delivery {
-       int num;
-       ILL_Electronic_Delivery_Service **elements;
-};
-
-struct ILL_Delivery_Service {
-       int which;
-       union {
-               ILL_Transportation_Mode *physical_delivery;
-               ILL_Delivery_ServiceElectronic_delivery *electronic_delivery;
-#define ILL_Delivery_Service_physical_delivery 1
-#define ILL_Delivery_Service_electronic_delivery 2
-       } u;
-};
-
-struct ILL_Electronic_Delivery_Service_0 {
-       Odr_oid *e_delivery_mode;
-       Odr_any *e_delivery_parameters;
-};
-
-struct ILL_Electronic_Delivery_Service_1 {
-       Odr_oid *document_type_id;
-       Odr_any *document_type_parameters;
-};
-
-struct ILL_Electronic_Delivery_Service {
-       ILL_Electronic_Delivery_Service_0 *e_delivery_service; /* OPT */
-       ILL_Electronic_Delivery_Service_1 *document_type; /* OPT */
-       ILL_String *e_delivery_description; /* OPT */
-       int which;
-       union {
-               ILL_System_Address *e_delivery_address;
-               ILL_System_Id *e_delivery_id;
-#define ILL_Electronic_Delivery_Service_e_delivery_address 1
-#define ILL_Electronic_Delivery_Service_e_delivery_id 2
-       } u;
-       ILL_String *name_or_code; /* OPT */
-       ILL_ISO_Time *delivery_time; /* OPT */
-};
-
-struct ILL_Error_Report {
-       ILL_String *correlation_information;
-       ILL_Report_Source *report_source;
-       ILL_User_Error_Report *user_error_report; /* OPT */
-       ILL_Provider_Error_Report *provider_error_report; /* OPT */
-};
-
-struct ILL_Estimate_Results {
-       ILL_String *cost_estimate;
-       int num_locations;
-       ILL_Location_Info **locations; /* OPT */
-};
-
-struct ILL_Extension {
-       int *identifier;
-       bool_t *critical;
-       Odr_any *item;
-};
-
-#define ILL_General_Problem_unrecognized_APDU 1
-#define ILL_General_Problem_mistyped_APDU 2
-#define ILL_General_Problem_badly_structured_APDU 3
-#define ILL_General_Problem_protocol_version_not_supported 4
-#define ILL_General_Problem_other 5
-
-struct ILL_History_Report {
-       ILL_ISO_Date *date_requested; /* OPT */
-       ILL_String *author; /* OPT */
-       ILL_String *title; /* OPT */
-       ILL_String *author_of_article; /* OPT */
-       ILL_String *title_of_article; /* OPT */
-       ILL_ISO_Date *date_of_last_transition;
-#define ILL_History_Report_iLL_REQUEST 1
-#define ILL_History_Report_fORWARD 21
-#define ILL_History_Report_fORWARD_NOTIFICATION 2
-#define ILL_History_Report_sHIPPED 3
-#define ILL_History_Report_iLL_ANSWER 4
-#define ILL_History_Report_cONDITIONAL_REPLY 5
-#define ILL_History_Report_cANCEL 6
-#define ILL_History_Report_cANCEL_REPLY 7
-#define ILL_History_Report_rECEIVED 8
-#define ILL_History_Report_rECALL 9
-#define ILL_History_Report_rETURNED 10
-#define ILL_History_Report_cHECKED_IN 11
-#define ILL_History_Report_rENEW_ANSWER 14
-#define ILL_History_Report_lOST 15
-#define ILL_History_Report_dAMAGED 16
-#define ILL_History_Report_mESSAGE 17
-#define ILL_History_Report_sTATUS_QUERY 18
-#define ILL_History_Report_sTATUS_OR_ERROR_REPORT 19
-#define ILL_History_Report_eXPIRED 20
-       int *most_recent_service;
-       ILL_ISO_Date *date_of_most_recent_service;
-       ILL_System_Id *initiator_of_most_recent_service;
-       ILL_Shipped_Service_Type *shipped_service_type; /* OPT */
-       ILL_Transaction_Results *transaction_results; /* OPT */
-       ILL_String *most_recent_service_note; /* OPT */
-};
-
-struct ILL_Hold_Placed_Results {
-       ILL_ISO_Date *estimated_date_available;
-       ILL_Medium_Type *hold_placed_medium_type; /* OPT */
-       int num_locations;
-       ILL_Location_Info **locations; /* OPT */
-};
-
-#define ILL_APDU_Type_iLL_REQUEST 1
-#define ILL_APDU_Type_fORWARD_NOTIFICATION 2
-#define ILL_APDU_Type_sHIPPED 3
-#define ILL_APDU_Type_iLL_ANSWER 4
-#define ILL_APDU_Type_cONDITIONAL_REPLY 5
-#define ILL_APDU_Type_cANCEL 6
-#define ILL_APDU_Type_cANCEL_REPLY 7
-#define ILL_APDU_Type_rECEIVED 8
-#define ILL_APDU_Type_rECALL 9
-#define ILL_APDU_Type_rETURNED 10
-#define ILL_APDU_Type_cHECKED_IN 11
-#define ILL_APDU_Type_oVERDUE 12
-#define ILL_APDU_Type_rENEW 13
-#define ILL_APDU_Type_rENEW_ANSWER 14
-#define ILL_APDU_Type_lOST 15
-#define ILL_APDU_Type_dAMAGED 16
-#define ILL_APDU_Type_mESSAGE 17
-#define ILL_APDU_Type_sTATUS_QUERY 18
-#define ILL_APDU_Type_sTATUS_OR_ERROR_REPORT 19
-#define ILL_APDU_Type_eXPIRED 20
-
-#define ILL_Service_Type_loan 1
-#define ILL_Service_Type_copy_non_returnable 2
-#define ILL_Service_Type_locations 3
-#define ILL_Service_Type_estimate 4
-#define ILL_Service_Type_responder_specific 5
-
-struct ILL_String {
-       int which;
-       union {
-               char *GeneralString;
-               ILL_EDIFACTString *EDIFACTString;
-#define ILL_String_GeneralString 1
-#define ILL_String_EDIFACTString 2
-       } u;
-};
-
-#define ILL_Intermediary_Problem_cannot_send_onward 1
-
-
-
-
-
-struct ILL_Item_Id {
-#define ILL_Item_Id_monograph 1
-#define ILL_Item_Id_serial 2
-#define ILL_Item_Id_other 3
-       int *item_type; /* OPT */
-       ILL_Medium_Type *held_medium_type; /* OPT */
-       ILL_String *call_number; /* OPT */
-       ILL_String *author; /* OPT */
-       ILL_String *title; /* OPT */
-       ILL_String *sub_title; /* OPT */
-       ILL_String *sponsoring_body; /* OPT */
-       ILL_String *place_of_publication; /* OPT */
-       ILL_String *publisher; /* OPT */
-       ILL_String *series_title_number; /* OPT */
-       ILL_String *volume_issue; /* OPT */
-       ILL_String *edition; /* OPT */
-       ILL_String *publication_date; /* OPT */
-       ILL_String *publication_date_of_component; /* OPT */
-       ILL_String *author_of_article; /* OPT */
-       ILL_String *title_of_article; /* OPT */
-       ILL_String *pagination; /* OPT */
-       Odr_external *national_bibliography_no; /* OPT */
-       ILL_String *iSBN; /* OPT */
-       ILL_String *iSSN; /* OPT */
-       Odr_external *system_no; /* OPT */
-       ILL_String *additional_no_letters; /* OPT */
-       ILL_String *verification_reference_source; /* OPT */
-};
-
-struct ILL_Location_Info {
-       ILL_System_Id *location_id;
-       ILL_System_Address *location_address; /* OPT */
-       ILL_String *location_note; /* OPT */
-};
-
-struct ILL_Locations_Results {
-       ILL_Reason_Locs_Provided *reason_locs_provided; /* OPT */
-       int num_locations;
-       ILL_Location_Info **locations;
-};
-
-#define ILL_Medium_Type_printed 1
-#define ILL_Medium_Type_microform 3
-#define ILL_Medium_Type_film_or_video_recording 4
-#define ILL_Medium_Type_audio_recording 5
-#define ILL_Medium_Type_machine_readable 6
-#define ILL_Medium_Type_other 7
-
-struct ILL_Name_Of_Person_Or_Institution {
-       int which;
-       union {
-               ILL_String *name_of_person;
-               ILL_String *name_of_institution;
-#define ILL_Name_Of_Person_Or_Institution_name_of_person 1
-#define ILL_Name_Of_Person_Or_Institution_name_of_institution 2
-       } u;
-};
-
-struct ILL_Person_Or_Institution_Symbol {
-       int which;
-       union {
-               ILL_String *person_symbol;
-               ILL_String *institution_symbol;
-#define ILL_Person_Or_Institution_Symbol_person_symbol 1
-#define ILL_Person_Or_Institution_Symbol_institution_symbol 2
-       } u;
-};
-
-#define ILL_Place_On_Hold_Type_yes 1
-#define ILL_Place_On_Hold_Type_no 2
-#define ILL_Place_On_Hold_Type_according_to_responder_policy 3
-
-struct ILL_Postal_Address {
-       ILL_Name_Of_Person_Or_Institution *name_of_person_or_institution; /* OPT */
-       ILL_String *extended_postal_delivery_address; /* OPT */
-       ILL_String *street_and_number; /* OPT */
-       ILL_String *post_office_box; /* OPT */
-       ILL_String *city; /* OPT */
-       ILL_String *region; /* OPT */
-       ILL_String *country; /* OPT */
-       ILL_String *postal_code; /* OPT */
-};
-
-struct ILL_Provider_Error_Report {
-       int which;
-       union {
-               ILL_General_Problem *general_problem;
-               ILL_Transaction_Id_Problem *transaction_id_problem;
-               ILL_State_Transition_Prohibited *state_transition_prohibited;
-#define ILL_Provider_Error_Report_general_problem 1
-#define ILL_Provider_Error_Report_transaction_id_problem 2
-#define ILL_Provider_Error_Report_state_transition_prohibited 3
-       } u;
-};
-
-#define ILL_Reason_Locs_Provided_in_use_on_loan 1
-#define ILL_Reason_Locs_Provided_in_process 2
-#define ILL_Reason_Locs_Provided_lost 3
-#define ILL_Reason_Locs_Provided_non_circulating 4
-#define ILL_Reason_Locs_Provided_not_owned 5
-#define ILL_Reason_Locs_Provided_on_order 6
-#define ILL_Reason_Locs_Provided_volume_issue_not_yet_available 7
-#define ILL_Reason_Locs_Provided_at_bindery 8
-#define ILL_Reason_Locs_Provided_lacking 9
-#define ILL_Reason_Locs_Provided_not_on_shelf 10
-#define ILL_Reason_Locs_Provided_on_reserve 11
-#define ILL_Reason_Locs_Provided_poor_condition 12
-#define ILL_Reason_Locs_Provided_cost_exceeds_limit 13
-#define ILL_Reason_Locs_Provided_on_hold 19
-#define ILL_Reason_Locs_Provided_other 27
-#define ILL_Reason_Locs_Provided_responder_specific 28
-
-#define ILL_Reason_No_Report_temporary 1
-#define ILL_Reason_No_Report_permanent 2
-
-#define ILL_Reason_Unfilled_in_use_on_loan 1
-#define ILL_Reason_Unfilled_in_process 2
-#define ILL_Reason_Unfilled_lost 3
-#define ILL_Reason_Unfilled_non_circulating 4
-#define ILL_Reason_Unfilled_not_owned 5
-#define ILL_Reason_Unfilled_on_order 6
-#define ILL_Reason_Unfilled_volume_issue_not_yet_available 7
-#define ILL_Reason_Unfilled_at_bindery 8
-#define ILL_Reason_Unfilled_lacking 9
-#define ILL_Reason_Unfilled_not_on_shelf 10
-#define ILL_Reason_Unfilled_on_reserve 11
-#define ILL_Reason_Unfilled_poor_condition 12
-#define ILL_Reason_Unfilled_cost_exceeds_limit 13
-#define ILL_Reason_Unfilled_charges 14
-#define ILL_Reason_Unfilled_prepayment_required 15
-#define ILL_Reason_Unfilled_lacks_copyright_compliance 16
-#define ILL_Reason_Unfilled_not_found_as_cited 17
-#define ILL_Reason_Unfilled_locations_not_found 18
-#define ILL_Reason_Unfilled_on_hold 19
-#define ILL_Reason_Unfilled_policy_problem 20
-#define ILL_Reason_Unfilled_mandatory_messaging_not_supported 21
-#define ILL_Reason_Unfilled_expiry_not_supported 22
-#define ILL_Reason_Unfilled_requested_delivery_services_not_supported 23
-#define ILL_Reason_Unfilled_preferred_delivery_time_not_possible 24
-#define ILL_Reason_Unfilled_other 27
-#define ILL_Reason_Unfilled_responder_specific 28
-
-#define ILL_Report_Source_user 1
-#define ILL_Report_Source_provider 2
-
-struct ILL_Requester_Optional_Messages_Type {
-       bool_t *can_send_RECEIVED;
-       bool_t *can_send_RETURNED;
-#define ILL_Requester_Optional_Messages_Type_requires 1
-#define ILL_Requester_Optional_Messages_Type_desires 2
-#define ILL_Requester_Optional_Messages_Type_neither 3
-       int *requester_SHIPPED;
-#define ILL_Requester_Optional_Messages_Type_requires 1
-#define ILL_Requester_Optional_Messages_Type_desires 2
-#define ILL_Requester_Optional_Messages_Type_neither 3
-       int *requester_CHECKED_IN;
-};
-
-struct ILL_Responder_Optional_Messages_Type {
-       bool_t *can_send_SHIPPED;
-       bool_t *can_send_CHECKED_IN;
-#define ILL_Responder_Optional_Messages_Type_requires 1
-#define ILL_Responder_Optional_Messages_Type_desires 2
-#define ILL_Responder_Optional_Messages_Type_neither 3
-       int *responder_RECEIVED;
-#define ILL_Responder_Optional_Messages_Type_requires 1
-#define ILL_Responder_Optional_Messages_Type_desires 2
-#define ILL_Responder_Optional_Messages_Type_neither 3
-       int *responder_RETURNED;
-};
-
-struct ILL_Retry_Results {
-#define ILL_Retry_Results_in_use_on_loan 1
-#define ILL_Retry_Results_in_process 2
-#define ILL_Retry_Results_on_order 6
-#define ILL_Retry_Results_volume_issue_not_yet_available 7
-#define ILL_Retry_Results_at_bindery 8
-#define ILL_Retry_Results_cost_exceeds_limit 13
-#define ILL_Retry_Results_charges 14
-#define ILL_Retry_Results_prepayment_required 15
-#define ILL_Retry_Results_lacks_copyright_compliance 16
-#define ILL_Retry_Results_not_found_as_cited 17
-#define ILL_Retry_Results_on_hold 19
-#define ILL_Retry_Results_other 27
-#define ILL_Retry_Results_responder_specific 28
-       int *reason_not_available; /* OPT */
-       ILL_ISO_Date *retry_date; /* OPT */
-       int num_locations;
-       ILL_Location_Info **locations; /* OPT */
-};
-
-struct ILL_Search_Type {
-       ILL_String *level_of_service; /* OPT */
-       ILL_ISO_Date *need_before_date; /* OPT */
-#define ILL_Search_Type_need_Before_Date 1
-#define ILL_Search_Type_other_Date 2
-#define ILL_Search_Type_no_Expiry 3
-       int *expiry_flag;
-       ILL_ISO_Date *expiry_date; /* OPT */
-};
-
-
-
-struct ILL_Send_To_List_Type_s {
-       ILL_System_Id *system_id;
-       ILL_Account_Number *account_number; /* OPT */
-       ILL_System_Address *system_address; /* OPT */
-};
-
-struct ILL_Send_To_List_Type {
-       int num;
-       ILL_Send_To_List_Type_s **elements;
-};
-
-struct ILL_Service_Date_this {
-       ILL_ISO_Date *date;
-       ILL_ISO_Time *time; /* OPT */
-};
-
-struct ILL_Service_Date_original {
-       ILL_ISO_Date *date;
-       ILL_ISO_Time *time; /* OPT */
-};
-
-struct ILL_Service_Date_Time {
-       ILL_Service_Date_this *date_time_of_this_service;
-       ILL_Service_Date_original *date_time_of_original_service; /* OPT */
-};
-
-
-
-struct ILL_State_Transition_Prohibited {
-       ILL_APDU_Type *aPDU_type;
-       ILL_Current_State *current_state;
-};
-
-struct ILL_Status_Report {
-       ILL_History_Report *user_status_report;
-       ILL_Current_State *provider_status_report;
-};
-
-struct ILL_Supplemental_Item_Description {
-       int num;
-       Odr_external **elements;
-};
-
-struct ILL_Supply_Details {
-       ILL_ISO_Date *date_shipped; /* OPT */
-       ILL_Date_Due *date_due; /* OPT */
-       int *chargeable_units; /* OPT */
-       ILL_Amount *cost; /* OPT */
-#define ILL_Supply_Details_library_use_only 22
-#define ILL_Supply_Details_no_reproduction 23
-#define ILL_Supply_Details_client_signature_required 24
-#define ILL_Supply_Details_special_collections_supervision_required 25
-#define ILL_Supply_Details_other 27
-       int *shipped_conditions; /* OPT */
-       int which;
-       union {
-               ILL_Transportation_Mode *physical_delivery;
-               ILL_Electronic_Delivery_Service *electronic_delivery;
-#define ILL_Supply_Details_physical_delivery 1
-#define ILL_Supply_Details_electronic_delivery 2
-       } u; /* OPT */
-       ILL_Amount *insured_for; /* OPT */
-       ILL_Amount *return_insurance_require; /* OPT */
-       int num_no_of_units_per_medium;
-       ILL_Units_Per_Medium_Type **no_of_units_per_medium; /* OPT */
-};
-
-struct ILL_Supply_Medium_Info_Type {
-       ILL_Supply_Medium_Type *supply_medium_type;
-       ILL_String *medium_characteristics; /* OPT */
-};
-
-#define ILL_Supply_Medium_Type_printed 1
-#define ILL_Supply_Medium_Type_photocopy 2
-#define ILL_Supply_Medium_Type_microform 3
-#define ILL_Supply_Medium_Type_film_or_video_recording 4
-#define ILL_Supply_Medium_Type_audio_recording 5
-#define ILL_Supply_Medium_Type_machine_readable 6
-#define ILL_Supply_Medium_Type_other 7
-
-struct ILL_System_Address {
-       ILL_String *telecom_service_identifier; /* OPT */
-       ILL_String *telecom_service_address; /* OPT */
-};
-
-struct ILL_System_Id {
-       ILL_Person_Or_Institution_Symbol *person_or_institution_symbol; /* OPT */
-       ILL_Name_Of_Person_Or_Institution *name_of_person_or_institution; /* OPT */
-};
-
-struct ILL_Third_Party_Info_Type {
-       bool_t *permission_to_forward;
-       bool_t *permission_to_chain;
-       bool_t *permission_to_partition;
-       bool_t *permission_to_change_send_to_list;
-       ILL_System_Address *initial_requester_address; /* OPT */
-#define ILL_Third_Party_Info_Type_ordered 1
-#define ILL_Third_Party_Info_Type_unordered 2
-       int *preference;
-       ILL_Send_To_List_Type *send_to_list; /* OPT */
-       ILL_Already_Tried_List_Type *already_tried_list; /* OPT */
-};
-
-struct ILL_Transaction_Id {
-       ILL_System_Id *initial_requester_id; /* OPT */
-       ILL_String *transaction_group_qualifier;
-       ILL_String *transaction_qualifier;
-       ILL_String *sub_transaction_qualifier; /* OPT */
-};
-
-#define ILL_Transaction_Id_Problem_duplicate_transaction_id 1
-#define ILL_Transaction_Id_Problem_invalid_transaction_id 2
-#define ILL_Transaction_Id_Problem_unknown_transaction_id 3
-
-#define ILL_Transaction_Results_conditional 1
-#define ILL_Transaction_Results_retry 2
-#define ILL_Transaction_Results_unfilled 3
-#define ILL_Transaction_Results_locations_provided 4
-#define ILL_Transaction_Results_will_supply 5
-#define ILL_Transaction_Results_hold_placed 6
-#define ILL_Transaction_Results_estimate 7
-
-#define ILL_Transaction_Type_simple 1
-#define ILL_Transaction_Type_chained 2
-#define ILL_Transaction_Type_partitioned 3
-
-
-
-#define ILL_Unable_To_Perform_not_available 1
-#define ILL_Unable_To_Perform_resource_limitation 2
-#define ILL_Unable_To_Perform_other 3
-
-struct ILL_Unfilled_Results {
-       ILL_Reason_Unfilled *reason_unfilled;
-       int num_locations;
-       ILL_Location_Info **locations; /* OPT */
-};
-
-struct ILL_Units_Per_Medium_Type {
-       ILL_Supply_Medium_Type *medium;
-       int *no_of_units;
-};
-
-struct ILL_User_Error_Report {
-       int which;
-       union {
-               ILL_Already_Forwarded *already_forwarded;
-               ILL_Intermediary_Problem *intermediary_problem;
-               ILL_Security_Problem *security_problem;
-               ILL_Unable_To_Perform *unable_to_perform;
-#define ILL_User_Error_Report_already_forwarded 1
-#define ILL_User_Error_Report_intermediary_problem 2
-#define ILL_User_Error_Report_security_problem 3
-#define ILL_User_Error_Report_unable_to_perform 4
-       } u;
-};
-
-struct ILL_Will_Supply_Results {
-#define ILL_Will_Supply_Results_in_use_on_loan 1
-#define ILL_Will_Supply_Results_in_process 2
-#define ILL_Will_Supply_Results_on_order 6
-#define ILL_Will_Supply_Results_at_bindery 8
-#define ILL_Will_Supply_Results_on_hold 19
-#define ILL_Will_Supply_Results_being_processed_for_supply 26
-#define ILL_Will_Supply_Results_other 27
-#define ILL_Will_Supply_Results_responder_specific 28
-#define ILL_Will_Supply_Results_electronic_delivery 30
-       int *reason_will_supply;
-       ILL_ISO_Date *supply_date; /* OPT */
-       ILL_Postal_Address *return_to_address; /* OPT */
-       int num_locations;
-       ILL_Location_Info **locations; /* OPT */
-       ILL_Electronic_Delivery_Service *electronic_delivery_service; /* OPT */
-};
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/item-req.h b/include/yaz/item-req.h
deleted file mode 100644 (file)
index bd849cc..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H Z39.50-extendedService-ItemOrder-ItemRequest-1 */
-
-#ifndef item_req_H
-#define item_req_H
-
-#include <yaz/odr.h>
-#include <yaz/ill-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ILL_ItemRequest ILL_ItemRequest;
-YAZ_EXPORT int ill_ItemRequest (ODR o, ILL_ItemRequest **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct ILL_ItemRequest {
-#define ILL_ItemRequest_version_1 1
-#define ILL_ItemRequest_version_2 2
-       int *protocol_version_num;
-       ILL_Transaction_Id *transaction_id; /* OPT */
-       ILL_Service_Date_Time *service_date_time; /* OPT */
-       ILL_System_Id *requester_id; /* OPT */
-       ILL_System_Id *responder_id; /* OPT */
-       ILL_Transaction_Type *transaction_type;
-       ILL_Delivery_Address *delivery_address; /* OPT */
-       ILL_Delivery_Service *delivery_service; /* OPT */
-       ILL_Delivery_Address *billing_address; /* OPT */
-       int num_iLL_service_type;
-       ILL_Service_Type **iLL_service_type; /* OPT */
-       Odr_external *responder_specific_service; /* OPT */
-       ILL_Requester_Optional_Messages_Type *requester_optional_messages; /* OPT */
-       ILL_Search_Type *search_type; /* OPT */
-       int num_supply_medium_info_type;
-       ILL_Supply_Medium_Info_Type **supply_medium_info_type; /* OPT */
-       ILL_Place_On_Hold_Type *place_on_hold;
-       ILL_Client_Id *client_id; /* OPT */
-       ILL_Item_Id *item_id; /* OPT */
-       ILL_Supplemental_Item_Description *supplemental_item_description; /* OPT */
-       ILL_Cost_Info_Type *cost_info_type; /* OPT */
-       ILL_String *copyright_compliance; /* OPT */
-       ILL_Third_Party_Info_Type *third_party_info_type; /* OPT */
-       bool_t *retry_flag;
-       bool_t *forward_flag;
-       ILL_String *requester_note; /* OPT */
-       ILL_String *forward_note; /* OPT */
-       int num_iLL_request_extensions;
-       ILL_Extension **iLL_request_extensions; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/prt-acc.h b/include/yaz/prt-acc.h
deleted file mode 100644 (file)
index 6e500a4..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 1995, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The name of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- * $Log: prt-acc.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.9  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.8  1997/09/01 08:49:51  adam
- * New windows NT/95 port using MSV5.0. To export DLL functions the
- * YAZ_EXPORT modifier was added. Defined in yconfig.h.
- *
- * Revision 1.7  1997/05/14 06:53:46  adam
- * C++ support.
- *
- * Revision 1.6  1996/01/02 08:57:35  quinn
- * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
- *
- * Revision 1.5  1995/09/29  17:12:09  quinn
- * Smallish
- *
- * Revision 1.4  1995/09/27  15:02:49  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.3  1995/08/17  12:45:16  quinn
- * Fixed minor problems with GRS-1. Added support in c&s.
- *
- * Revision 1.2  1995/08/15  12:00:13  quinn
- * Updated External
- *
- * Revision 1.1  1995/06/02  09:49:49  quinn
- * Add access control
- *
- *
- */
-
-#ifndef PRT_ACC_H
-#define PRT_ACC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_Encryption1
-{
-    Odr_oct *cryptType;       /* OPTIONAL */
-    Odr_oct *credential;      /* OPTIONAL */
-    Odr_oct *data;
-} Z_Encryption1;
-
-typedef struct Z_EnumeratedPrompt1
-{
-    int *type;
-#define Z_Prompt1_groupId        0
-#define Z_Prompt1_userId         1
-#define Z_Prompt1_password       2
-#define Z_Prompt1_newPassword    3
-#define Z_Prompt1_copyright      4
-    char *suggestedString;       /* OPTIONAL */
-} Z_EnumeratedPrompt1;
-
-typedef struct Z_PromptId1
-{
-    int which;
-#define Z_PromptId1_enumeratedPrompt 0
-#define Z_PromptId1_nonEnumeratedPrompt 1
-    union
-    {
-       Z_EnumeratedPrompt1 *enumeratedPrompt;
-       char *nonEnumeratedPrompt;
-    } u;
-} Z_PromptId1;
-
-typedef struct Z_PromptInfo1
-{
-    int which;
-#define Z_Challenge1_character 0
-#define Z_Challenge1_encrypted 1
-    union
-    {
-       char *character;
-       Z_Encryption1 *encrypted;
-    } u;
-} Z_PromptInfo1;
-
-typedef struct Z_ChallengeUnit1
-{
-    Z_PromptId1 *promptId;
-    char *defaultResponse;           /* OPTIONAL */
-    Z_PromptInfo1 *promptInfo;       /* OPTIONAL */
-    char *regExpr;                   /* OPTIONAL */
-    Odr_null *responseRequired;      /* OPTIONAL */
-    int num_values;
-    char **allowedValues;            /* OPTIONAL */
-    Odr_null *shouldSave;            /* OPTIONAL */
-    int *dataType;                   /* OPTIONAL */
-#define Z_ChalDataType_integer       1
-#define Z_ChalDataType_date          2
-#define Z_ChalDataType_float         3
-#define Z_ChalDataType_alphaNumeric  4
-#define Z_ChalDataType_urlUrn        5
-#define Z_ChalDataType_boolean       6
-    Z_External *diagnostic;        /* OPTIONAL */
-} Z_ChallengeUnit1;
-
-typedef struct Z_Challenge1
-{
-    int num_challenges;
-    Z_ChallengeUnit1 **list;
-} Z_Challenge1;
-
-typedef struct Z_ResponseUnit1
-{
-    Z_PromptId1 *promptId;
-    int which;
-#define Z_Response1_string 0
-#define Z_Response1_accept 1
-#define Z_Response1_acknowledge 2
-#define Z_Response1_diagnostic 3
-#define Z_Response1_encrypted 4
-    union
-    {
-       char *string;
-       bool_t *accept;
-       Odr_null *acknowledge;
-       Z_DiagRec *diagnostic;
-       Z_Encryption1 *encrypted;
-    } u;
-} Z_ResponseUnit1;
-
-typedef struct Z_Response1
-{
-    int num_responses;
-    Z_ResponseUnit1 **list;
-} Z_Response1;
-
-typedef struct Z_PromptObject1
-{
-    int which;
-#define Z_PromptObject1_challenge 0
-#define Z_PromptObject1_response 1
-    union
-    {
-       Z_Challenge1 *challenge;
-       Z_Response1 *response;
-    } u;
-} Z_PromptObject1;
-
-YAZ_EXPORT int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt,
-                              const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-add.h b/include/yaz/prt-add.h
deleted file mode 100644 (file)
index 2e31638..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1995, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The name of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- * $Log: prt-add.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.4  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.3  1997/05/14 06:53:46  adam
- * C++ support.
- *
- * Revision 1.2  1997/04/30 08:52:09  quinn
- * Null
- *
- * Revision 1.1  1996/10/10  11:51:58  quinn
- * Added SerchResult additional info
- *
- *
- */
-
-#ifndef PRT_ADD_H
-#define PRT_ADD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_QueryExpressionTerm
-{
-    Z_Term *queryTerm;
-    char *termComment;              /* OPTIONAL */
-} Z_QueryExpressionTerm;
-
-typedef struct Z_QueryExpression
-{
-    int which;
-#define Z_QueryExpression_term 1
-#define Z_QueryExpression_query 2
-    union {
-       Z_QueryExpressionTerm *term;
-       Z_Query *query;
-    } u;
-} Z_QueryExpression;
-
-typedef struct Z_ResultsByDBList
-{
-    int num;
-    Z_DatabaseName **elements;
-} Z_ResultsByDBList;
-
-typedef struct Z_ResultsByDB_elem
-{
-    int which;
-#define Z_ResultsByDB_all 1
-#define Z_ResultsByDB_list 2
-    union {
-        Odr_null *all;
-        Z_ResultsByDBList *list;
-    } u;
-    int *count;                           /* OPTIONAL */
-    char *resultSetName; /* OPTIONAL */
-} Z_ResultsByDB_elem;
-
-typedef struct Z_ResultsByDB
-{
-    int num;
-    Z_ResultsByDB_elem **elements;
-} Z_ResultsByDB;
-
-typedef struct Z_SearchInfoReport_elem
-{
-    char *subqueryId;                          /* OPTIONAL */
-    bool_t *fullQuery;
-    Z_QueryExpression *subqueryExpression;     /* OPTIONAL */
-    Z_QueryExpression *subqueryInterpretation; /* OPTIONAL */
-    Z_QueryExpression *subqueryRecommendation; /* OPTIONAL */
-    int *subqueryCount;                        /* OPTIONAL */
-    Z_IntUnit *subqueryWeight;                 /* OPTIONAL */
-    Z_ResultsByDB *resultsByDB;                /* OPTIONAL */
-} Z_SearchInfoReport_elem;
-
-typedef struct Z_SearchInfoReport
-{
-    int num;
-    Z_SearchInfoReport_elem **elements;
-} Z_SearchInfoReport;
-
-int z_SearchInfoReport (ODR o, Z_SearchInfoReport **p, int opt,
-                       const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-arc.h b/include/yaz/prt-arc.h
deleted file mode 100644 (file)
index df159c7..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1995,1996 Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_ARC_H
-#define PRT_ARC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------- Summary Record --------------------- */
-
-typedef struct Z_FormatSpec
-{
-    char *type;
-    int *size;                    /* OPTIONAL */
-    int *bestPosn;                /* OPTIONAL */
-} Z_FormatSpec;
-
-typedef struct Z_BriefBib
-{
-    char *title;
-    char *author;                  /* OPTIONAL */
-    char *callNumber;              /* OPTIONAL */
-    char *recordType;              /* OPTIONAL */
-    char *bibliographicLevel;      /* OPTIONAL */
-    int num_format;
-    Z_FormatSpec **format;         /* OPTIONAL */
-    char *publicationPlace;        /* OPTIONAL */
-    char *publicationDate;         /* OPTIONAL */
-    char *targetSystemKey;         /* OPTIONAL */
-    char *satisfyingElement;       /* OPTIONAL */
-    int *rank;                     /* OPTIONAL */
-    char *documentId;              /* OPTIONAL */
-    char *abstract;                /* OPTIONAL */
-    Z_OtherInformation *otherInfo; /* OPTIONAL */
-} Z_BriefBib;
-
-/* ------------------- OPAC Record --------------------- */
-
-typedef struct Z_CircRecord
-{
-    bool_t *availableNow;
-    char *availabilityDate;        /* OPTIONAL */
-    char *availableThru;           /* OPTIONAL */
-    char *restrictions;            /* OPTIONAL */
-    char *itemId;                  /* OPTIONAL */
-    bool_t *renewable;
-    bool_t *onHold;
-    char *enumAndChron;            /* OPTIONAL */
-    char *midspine;                /* OPTIONAL */
-    char *temporaryLocation;       /* OPTIONAL */
-} Z_CircRecord;
-
-typedef struct Z_Volume
-{
-    char *enumeration;             /* OPTIONAL */
-    char *chronology;              /* OPTIONAL */
-    char *enumAndChron;            /* OPTIONAL */
-} Z_Volume;
-
-typedef struct Z_HoldingsAndCircData
-{
-    char *typeOfRecord;            /* OPTIONAL */
-    char *encodingLevel;           /* OPTIONAL */
-    char *format;                  /* OPTIONAL */
-    char *receiptAcqStatus;        /* OPTIONAL */
-    char *generalRetention;        /* OPTIONAL */
-    char *completeness;            /* OPTIONAL */
-    char *dateOfReport;            /* OPTIONAL */
-    char *nucCode;                 /* OPTIONAL */
-    char *localLocation;           /* OPTIONAL */
-    char *shelvingLocation;        /* OPTIONAL */
-    char *callNumber;              /* OPTIONAL */
-    char *shelvingData;            /* OPTIONAL */
-    char *copyNumber;              /* OPTIONAL */
-    char *publicNote;              /* OPTIONAL */
-    char *reproductionNote;        /* OPTIONAL */
-    char *termsUseRepro;           /* OPTIONAL */
-    char *enumAndChron;            /* OPTIONAL */
-    int num_volumes;
-    Z_Volume **volumes;            /* OPTIONAL */
-    int num_circulationData;
-    Z_CircRecord **circulationData;/* OPTIONAL */
-} Z_HoldingsAndCircData;
-
-typedef struct Z_HoldingsRecord
-{
-    int which;
-#define Z_HoldingsRecord_marcHoldingsRecord    0
-#define Z_HoldingsRecord_holdingsAndCirc       1
-    union
-    {
-       Z_External *marcHoldingsRecord;
-       Z_HoldingsAndCircData *holdingsAndCirc;
-    } u;
-} Z_HoldingsRecord;
-
-typedef struct Z_OPACRecord
-{
-    Z_External *bibliographicRecord;   /* OPTIONAL */
-    int num_holdingsData;
-    Z_HoldingsRecord **holdingsData;   /* OPTIONAL */
-} Z_OPACRecord;
-
-YAZ_EXPORT int z_BriefBib(ODR o, Z_BriefBib **p, int opt, const char *name);
-YAZ_EXPORT int z_OPACRecord(ODR o, Z_OPACRecord **p, int opt,
-                           const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-dat.h b/include/yaz/prt-dat.h
deleted file mode 100644 (file)
index a336ed1..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This file is part of the YAZ toolkit:
- * Copyright (c) 1998, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * Contribution by Ronald van Der Meer (RVDM):
- *  Databasix Information Systems B.V., Utrecht, The Netherlands.
- *
- * $Log: prt-dat.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.2  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.1  1998/02/10 15:31:52  adam
- * Implemented date and time structure. Changed the Update Extended
- * Service.
- *
- */
-
-#ifndef __PRT_DAT_H
-#define __PRT_DAT_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_MonthAndDay
-{
-    int *month;
-    int *day;                               /* OPTIONAL */
-} Z_MonthAndDay;
-
-typedef struct Z_Quarter
-{
-    int which;
-#define Z_Quarter_first                0
-#define Z_Quarter_second       1
-#define Z_Quarter_third                2
-#define Z_Quarter_fourth       3
-    union
-    {
-       Odr_null *first;
-       Odr_null *second;
-       Odr_null *third;
-       Odr_null *fourth;
-    } u;
-} Z_Quarter;
-
-typedef struct Z_Season
-{
-    int which;
-#define Z_Season_winter                0
-#define Z_Season_spring                1
-#define Z_Season_summer                2
-#define Z_Season_autumn                3
-    union
-    {
-       Odr_null *winter;
-       Odr_null *spring;
-       Odr_null *summer;
-       Odr_null *autumn;
-    } u;
-} Z_Season;
-
-typedef struct Z_PartOfYear
-{
-    int which;
-#define Z_PartOfYear_monthAndDay       0
-#define Z_PartOfYear_julianDay         1
-#define Z_PartOfYear_weekNumber                2
-#define Z_PartOfYear_quarter           3
-#define Z_PartOfYear_season            4
-    union
-    {
-       Z_MonthAndDay *monthAndDay;
-       int *julianDay; 
-       int *weekNumber; 
-       Z_Quarter *quarter;
-       Z_Season *season;
-    } u;
-} Z_PartOfYear;
-
-typedef struct Z_Era
-{
-    int which;
-#define Z_Era_decade           0
-#define Z_Era_century          1
-#define Z_Era_millennium       2
-    union
-    {
-       Odr_null *decade;
-       Odr_null *century;
-       Odr_null *millennium;
-    } u;
-} Z_Era;
-
-typedef struct Z_DateFlags
-{
-    Odr_null *circa;                        /* OPTIONAL */
-    Z_Era *era;                             /* OPTIONAL */
-} Z_DateFlags;
-
-typedef struct Z_Date
-{
-    int *year;
-    Z_PartOfYear *partOfYear;               /* OPTIONAL */
-    Z_DateFlags *flags;                     /* OPTIONAL */
-} Z_Date;
-
-typedef struct Z_Zone
-{
-    int which;
-#define Z_Zone_local           0
-#define Z_Zone_utc             1
-#define Z_Zone_utcOffset       2
-    union
-    {
-       Odr_null *local;
-       Odr_null *utc;
-       int *utcOffset;
-    } u;
-} Z_Zone;
-
-typedef struct Z_Time
-{
-    int *hour;
-    int *minute;                            /* OPTIONAL */
-    int *second;                            /* OPTIONAL */
-    Z_IntUnit *partOfSecond;                /* OPTIONAL */
-    Z_Zone *zone;                           /* OPTIONAL */
-} Z_Time;
-
-typedef struct Z_DateTime
-{
-    Z_Date *z3950Date;                      /* OPTIONAL */
-    Z_Time *z3950Time;                      /* OPTIONAL */
-} Z_DateTime;
-
-YAZ_EXPORT int z_DateTime(ODR o, Z_DateTime **p, int opt, const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-dia.h b/include/yaz/prt-dia.h
deleted file mode 100644 (file)
index 88dc8a0..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 1995-1998, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_DIA_H
-#define PRT_DIA_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_TooMany
-{
-    int *tooManyWhat;
-#define Z_TooMany_argumentWords        1
-#define Z_TooMany_truncatedWords       2
-#define Z_TooMany_booleanOperators     3
-#define Z_TooMany_incompleteSubfields  4
-#define Z_TooMany_characters           5
-#define Z_TooMany_recordsRetrieved     6
-#define Z_TooMany_databasesSpecified   7
-#define Z_TooMany_resultSetsCreated    8
-#define Z_TooMany_indexTermsProcessed  9
-    int *max;                    /* OPTIONAL */
-} Z_TooMany;
-
-typedef struct Z_BadSpec
-{
-    Z_Specification *spec;
-    char *db;                    /* OPTIONAL */
-    int num_goodOnes;
-    Z_Specification **goodOnes;  /* OPTIONAL */
-} Z_BadSpec;
-
-typedef struct Z_DbUnavailWhy
-{
-    int *reasonCode;             /* OPTIONAL */
-#define Z_DbUnavail_doesNotExist         0
-#define Z_DbUnavail_existsButUnavail     1
-#define Z_DbUnavail_locked               2
-#define Z_DbUnavail_accessDenied         3
-    char *message;               /* OPTIONAL */
-} Z_DbUnavailWhy;
-
-typedef struct Z_DbUnavail
-{
-    char *db;
-    Z_DbUnavailWhy *why;         /* OPTIONAL */
-} Z_DbUnavail;
-
-typedef struct Z_Attribute
-{
-    Odr_oid *id;
-    int *type;                   /* OPTIONAL */
-    int *value;                  /* OPTIONAL */
-    Z_Term *term;                /* OPTIONAL */
-} Z_Attribute;
-
-typedef struct Z_AttCombo
-{
-    Z_AttributeList *unsupportedCombination;
-    int num_alternatives;
-    Z_AttributeList **alternatives;    /* OPTIONAL */
-} Z_AttCombo;
-
-typedef struct Z_DiagTerm 
-{
-    int *problem;                /* OPTIONAL */
-#define Z_DiagtermProb_codedValue     1
-#define Z_DiagtermProb_unparsable     2
-#define Z_DiagtermProb_tooShort       3
-#define Z_DiagtermProb_type           4
-    Z_Term *term;
-} Z_DiagTerm;
-
-typedef struct Z_Proximity
-{
-    int which;
-#define Z_Proximity_resultSets 0
-#define Z_Proximity_badSet 1
-#define Z_Proximity_relation 2
-#define Z_Proximity_unit 3
-#define Z_Proximity_distance 4
-#define Z_Proximity_attributes 5
-#define Z_Proximity_ordered 6
-#define Z_Proximity_exclusion 7
-    union
-    {
-       Odr_null *resultSets;
-       char *badSet;
-       int *relation;
-       int *unit;
-       int *distance;
-       Z_AttributeList *attributes;
-       Odr_null *ordered;
-       Odr_null *exclusion;
-    } u;
-} Z_Proximity;
-
-typedef struct Z_AttrListList
-{
-    int num_lists;
-    Z_AttributeList *lists;
-} Z_AttrListList;
-
-typedef struct Z_Scan
-{
-    int which;
-#define Z_ScanD_nonZeroStepSize 0
-#define Z_ScanD_specifiedStepSize 1
-#define Z_ScanD_termList1 2
-#define Z_ScanD_termList2 3
-#define Z_ScanD_posInResponse 4
-#define Z_ScanD_resources 5
-#define Z_ScanD_endOfList 6
-    union
-    {
-       Odr_null *nonZeroStepSize;
-       Odr_null *specifiedStepSize;
-       Odr_null *termList1;
-       Z_AttrListList *termList2;
-       int *posInResponse;
-#define Z_ScanPosInRsp_mustBeOne         1
-#define Z_ScanPosInRsp_mustBePositive    2
-#define Z_ScanPosInRsp_mustBeNonNegative 3
-#define Z_ScanPosInRsp_other             4
-       Odr_null *resources;
-       Odr_null *endOfList;
-    } u;
-} Z_Scan;
-
-typedef struct Z_Sort
-{
-    int which;
-#define Z_SortD_sequence 0
-#define Z_SortD_noRsName 1
-#define Z_SortD_tooMany 2
-#define Z_SortD_incompatible 3
-#define Z_SortD_generic 4
-#define Z_SortD_dbSpecific 5
-#define Z_SortD_sortElement 6
-#define Z_SortD_key 7
-#define Z_SortD_action 8
-#define Z_SortD_illegal 9
-#define Z_SortD_inputTooLarge 10
-#define Z_SortD_aggregateTooLarge 11
-    union
-    {
-       Odr_null *sequence;
-       Odr_null *noRsName;
-       int *tooMany;
-       Odr_null *incompatible;
-       Odr_null *generic;
-       Odr_null *dbSpecific;
-       int *key;
-#define Z_SortKey_tooMany       1
-#define Z_SortKey_duplicate     2
-       Odr_null *action;
-       int *illegal;
-#define Z_SortIllegal_relation  1
-#define Z_SortIllegal_case      2
-#define Z_SortIllegal_action    3
-#define Z_SortIllegal_sort      4
-       Z_StringList *inputTooLarge;
-       Odr_null *aggregateTooLarge;
-    } u;
-} Z_Sort;
-
-typedef struct Z_Segmentation
-{
-    int which;
-#define Z_SegmentationD_segments 0
-    union
-    {
-       Odr_null *segments;
-    } u;
-} Z_Segmentation;
-
-typedef struct Z_ExtServices
-{
-    int which;
-#define Z_ExtServicesD_req 0
-#define Z_ExtServicesD_permission 1
-#define Z_ExtServicesD_immediate 2
-    union
-    {
-       int *req;
-#define Z_ExtSrvReq_nameInUse           1
-#define Z_ExtSrvReq_noSuchname          2
-#define Z_ExtSrvReq_quota               3
-#define Z_ExtSrvReq_type                4
-       int *permission;
-#define Z_ExtSrvPerm_id                 1
-#define Z_ExtSrvPerm_modifyDelete       2
-       int *immediate;
-#define Z_ExtSrvImm_failed              1
-#define Z_ExtSrvImm_service             2
-#define Z_ExtSrvImm_parameters          3
-    } u;
-} Z_ExtServices;
-
-typedef struct Z_OidList
-{
-    int num_oids;
-    Odr_oid **oids;
-} Z_OidList;
-
-typedef struct Z_AccessCtrl
-{
-    int which;
-#define Z_AccessCtrlD_noUser 0
-#define Z_AccessCtrlD_refused 1
-#define Z_AccessCtrlD_simple 2
-#define Z_AccessCtrlD_oid 3
-#define Z_AccessCtrlD_alternative 4
-#define Z_AccessCtrlD_pwdInv 5
-#define Z_AccessCtrlD_pwdExp 6
-    union
-    {
-       Odr_null *noUser;
-       Odr_null *refused;
-       Odr_null *simple;
-       Z_OidList *oid;
-       Z_OidList *alternative;
-       Odr_null *pwdInv;
-       Odr_null *pwdExp;
-    } u;
-} Z_AccessCtrl;
-
-typedef struct Z_RecordSyntax
-{
-    Odr_oid *unsupportedSyntax;
-    int num_suggestedAlternatives;           /* OPTIONAL */
-    Odr_oid **suggestedAlternatives;           /* OPTIONAL */
-} Z_RecordSyntax;
-
-typedef struct Z_DiagFormat
-{
-    int which;
-#define Z_DiagFormat_tooMany 0
-#define Z_DiagFormat_badSpec 1
-#define Z_DiagFormat_dbUnavail 2
-#define Z_DiagFormat_unSupOp 3
-#define Z_DiagFormat_attribute 4
-#define Z_DiagFormat_attCombo 5
-#define Z_DiagFormat_term 6
-#define Z_DiagFormat_proximity 7
-#define Z_DiagFormat_scan 8
-#define Z_DiagFormat_sort 9
-#define Z_DiagFormat_segmentation 10
-#define Z_DiagFormat_extServices 11
-#define Z_DiagFormat_accessCtrl 12
-#define Z_DiagFormat_recordSyntax 13
-    union
-    {
-       Z_TooMany *tooMany;
-       Z_BadSpec *badSpec;
-       Z_DbUnavail *dbUnavail;
-       int *unSupOp;
-#define Z_UnSupOp_and             0
-#define Z_UnSupOp_or              1
-#define Z_UnSupOp_and_not         2
-#define Z_UnSupOp_prox            3
-       Z_Attribute *attribute;
-       Z_AttributeList *attCombo;
-       Z_DiagTerm *term;
-       Z_Proximity *proximity;
-       Z_Scan *scan;
-       Z_Sort *sort;
-       Z_Segmentation *segmentation;
-       Z_ExtServices *extServices;
-       Z_AccessCtrl *accessCtrl;
-       Z_RecordSyntax *recordSyntax;
-    } u;
-} Z_DiagFormat;
-
-typedef struct Z_Diagnostic
-{
-    int which;
-#define Z_Diagnostic_defaultDiagRec 0
-#define Z_Diagnostic_explicitDiagnostic 1
-    union 
-    {
-       Z_DefaultDiagFormat *defaultDiagRec;
-       Z_DiagFormat *explicitDiagnostic;
-    } u;
-} Z_Diagnostic;
-
-typedef struct Z_DiagnosticUnit
-{
-    Z_Diagnostic *diagnostic;                    /* OPTIONAL */
-    char *message;                               /* OPTIONAL */
-} Z_DiagnosticUnit;
-
-typedef struct Z_DiagnosticFormat
-{
-    int num_diagnostics;
-    Z_DiagnosticUnit **diagnostics;
-} Z_DiagnosticFormat;
-
-YAZ_EXPORT int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt,
-                                 const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-esp.h b/include/yaz/prt-esp.h
deleted file mode 100644 (file)
index 86bf403..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 1995, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_ESP_H
-#define PRT_ESP_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_OccurValues
-{
-    int *start;
-    int *howMany;                     /* OPTIONAL */
-} Z_OccurValues;
-
-typedef struct Z_Occurrences
-{
-    int which;
-#define Z_Occurrences_all 0
-#define Z_Occurrences_last 1
-#define Z_Occurrences_values 2
-    union
-    {
-       Odr_null *all;
-       Odr_null *last;
-       Z_OccurValues *values;
-    } u;
-} Z_Occurrences;
-
-typedef struct Z_SpecificTag
-{
-    Odr_oid *schemaId;                      /* OPTIONAL */
-    int *tagType;                           /* OPTIONAL */
-    Z_StringOrNumeric *tagValue;
-    Z_Occurrences *occurrences;             /* OPTIONAL */
-} Z_SpecificTag;
-
-typedef struct Z_ETagUnit
-{
-    int which;
-#define Z_ETagUnit_specificTag 0
-#define Z_ETagUnit_wildThing 1
-#define Z_ETagUnit_wildPath 2
-    union
-    {
-       Z_SpecificTag *specificTag;
-       Z_Occurrences *wildThing;
-       Odr_null *wildPath;
-    } u;
-} Z_ETagUnit;
-
-typedef struct Z_ETagPath
-{
-    int num_tags;
-    Z_ETagUnit **tags;
-} Z_ETagPath;
-
-typedef struct Z_SimpleElement
-{
-    Z_ETagPath *path;
-    Z_Variant *variantRequest;           /* OPTIONAL */
-} Z_SimpleElement;
-
-typedef struct Z_CompoPrimitives
-{
-    int num_primitives;
-    char **primitives;
-} Z_CompoPrimitives;
-
-typedef struct Z_CompoSpecs
-{
-    int num_specs;
-    Z_SimpleElement **specs;
-} Z_CompoSpecs;
-
-typedef struct Z_CompositeElement
-{
-    int which;
-#define Z_CompoElement_primitives 0
-#define Z_CompoElement_specs 1
-    union
-    {
-       Z_CompoPrimitives *primitives;
-       Z_CompoSpecs *specs;
-    } elementList;
-    Z_ETagPath *deliveryTag;
-    Z_Variant *variantRequest;
-} Z_CompositeElement;
-
-typedef struct Z_ElementRequest
-{
-    int which;
-#define Z_ERequest_simpleElement 0
-#define Z_ERequest_compositeElement 1
-    union
-    {
-       Z_SimpleElement *simpleElement;
-       Z_CompositeElement *compositeElement;
-    } u;
-} Z_ElementRequest;
-
-typedef struct Z_Espec1
-{
-    int num_elementSetNames;
-    char **elementSetNames;               /* OPTIONAL */
-    Odr_oid *defaultVariantSetId;         /* OPTIONAL */
-    Z_Variant *defaultVariantRequest;     /* OPTIONAL */
-    int *defaultTagType;                  /* OPTIONAL */
-    int num_elements;
-    Z_ElementRequest **elements;           /* OPTIONAL */
-} Z_Espec1;
-
-YAZ_EXPORT int z_Espec1(ODR o, Z_Espec1 **p, int opt, const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-exd.h b/include/yaz/prt-exd.h
deleted file mode 100644 (file)
index d5b1a2a..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 1995-1998, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_EXD_H
-#define PRT_EXD_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_TaskPackage
-{
-    Odr_oid *packageType;                 
-    char *packageName;                      /* OPTIONAL */
-    char *userId;                           /* OPTIONAL */
-    Z_IntUnit *retentionTime;               /* OPTIONAL */
-    Z_Permissions *permissions;             /* OPTIONAL */
-    char *description;                      /* OPTIONAL */
-    Odr_oct *targetReference;             
-    char *creationDateTime;    /* OPTIONAL */
-    int *taskStatus;                      
-#define Z_TaskPackage_pending             0
-#define Z_TaskPackage_active              1
-#define Z_TaskPackage_complete            2
-#define Z_TaskPackage_aborted             3
-    int num_packageDiagnostics;
-    Z_DiagRec **packageDiagnostics;         /* OPTIONAL */
-    Z_External *taskSpecificParameters;   
-} Z_TaskPackage;
-
-int z_TaskPackage(ODR o, Z_TaskPackage **p, int opt, const char *name);
-
-/* ----------------------- ITEM ORDER ------------------------- */
-
-typedef struct Z_IOTargetPart
-{
-    Z_External *itemRequest;                   /* OPTIONAL */
-    Z_External *statusOrErrorReport;
-    int *auxiliaryStatus;                      /* OPTIONAL */
-#define Z_IOTargetPart_notReceived        1
-#define Z_IOTargetPart_loanQueue          2
-#define Z_IOTargetPart_forwarded          3
-#define Z_IOTargetPart_unfilledCopyright  4
-#define Z_IOTargetPart_filledCopyright    1
-} Z_IOTargetPart;
-
-typedef struct Z_IOResultSetItem
-{
-    char *resultSetId;
-    int *item;
-} Z_IOResultSetItem;
-
-typedef struct Z_IOOriginPartNotToKeep
-{
-    Z_IOResultSetItem *resultSetItem;          /* OPTIONAL */
-    Z_External *itemRequest;                   /* OPTIONAL */
-} Z_IOOriginPartNotToKeep;
-
-typedef struct Z_IOContact
-{
-    char *name;                                /* OPTIONAL */
-    char *phone;                               /* OPTIONAL */
-    char *email;                               /* OPTIONAL */
-} Z_IOContact;
-
-typedef struct Z_IOCreditCardInfo
-{
-    char *nameOnCard;
-    char *expirationDate;
-    char *cardNumber;
-} Z_IOCreditCardInfo;
-
-typedef struct Z_IOBilling
-{
-    int which;
-#define Z_IOBilling_billInvoice 0
-#define Z_IOBilling_prepay 1
-#define Z_IOBilling_depositAccount 2
-#define Z_IOBilling_creditCard 3
-#define Z_IOBilling_cardInfoPreviouslySupplied 4
-#define Z_IOBilling_privateKnown 5
-#define Z_IOBilling_privateNotKnown 6
-    union
-    {
-       Odr_null *noinfo;
-       Z_IOCreditCardInfo *creditCard;
-       Z_External *privateNotKnown;
-    } paymentMethod;
-    char *customerReference;                        /* OPTIONAL */
-    char *customerPONumber;                         /* OPTIONAL */
-} Z_IOBilling;
-
-typedef struct Z_IOOriginPartToKeep
-{
-    Z_External *supplDescription;              /* OPTIONAL */
-    Z_IOContact *contact;                      /* OPTIONAL */
-    Z_IOBilling *addlBilling;                  /* OPTIONAL */
-} Z_IOOriginPartToKeep;
-
-typedef struct Z_IORequest
-{
-    Z_IOOriginPartToKeep *toKeep;              /* OPTIONAL */
-    Z_IOOriginPartNotToKeep *notToKeep;
-} Z_IORequest;
-
-typedef struct Z_IOTaskPackage
-{
-    Z_IOOriginPartToKeep *originPart;          /* OPTIONAL */
-    Z_IOTargetPart *targetPart;
-} Z_IOTaskPackage;
-
-typedef struct Z_ItemOrder
-{
-    int which;
-#define Z_ItemOrder_esRequest 0
-#define Z_ItemOrder_taskPackage 1
-    union
-    {
-       Z_IORequest *esRequest;
-       Z_IOTaskPackage *taskPackage;
-    } u;
-} Z_ItemOrder;
-
-int z_ItemOrder(ODR o, Z_ItemOrder **p, int opt, const char *name);
-
-/* ----------------------- ITEM UPDATE ------------------------ */
-
-typedef struct Z_IUSuppliedRecordsId
-{
-    int which;
-#define Z_IUSuppliedRecordsId_timeStamp 1
-#define Z_IUSuppliedRecordsId_versionNumber 2
-#define Z_IUSuppliedRecordsId_previousVersion 3
-    union {
-        char *timeStamp;
-        char *versionNumber;
-        Odr_external *previousVersion;
-    } u;
-} Z_IUSuppliedRecordsId;
-
-typedef struct Z_IUCorrelationInfo
-{
-    char *note; /* OPTIONAL */
-    int *id; /* OPTIONAL */
-} Z_IUCorrelationInfo;
-
-typedef struct Z_IUSuppliedRecords_elem
-{
-    int which;
-#define Z_IUSuppliedRecords_number 1
-#define Z_IUSuppliedRecords_string 2
-#define Z_IUSuppliedRecords_opaque 3
-    union {
-        int *number;
-        char *string;
-        Odr_oct *opaque;
-    } u; /* OPTIONAL */
-    Z_IUSuppliedRecordsId *supplementalId; /* OPTIONAL */
-    Z_IUCorrelationInfo *correlationInfo;    /* OPTIONAL */
-    Z_External *record;
-} Z_IUSuppliedRecords_elem;
-
-typedef struct Z_IUSuppliedRecords
-{
-    int num;
-    Z_IUSuppliedRecords_elem **elements;
-} Z_IUSuppliedRecords;
-
-typedef struct Z_IUOriginPartToKeep
-{
-    int *action;
-#define Z_IUOriginPartToKeep_recordInsert 1
-#define Z_IUOriginPartToKeep_recordReplace 2
-#define Z_IUOriginPartToKeep_recordDelete 3
-#define Z_IUOriginPartToKeep_elementUpdate 4
-#define Z_IUOriginPartToKeep_specialUpdate 5
-    char *databaseName;
-    Odr_oid *schema;               /* OPTIONAL */
-    char *elementSetName;          /* OPTIONAL */
-    Odr_external *actionQualifier; /* OPTIONAL */
-} Z_IUOriginPartToKeep;
-
-typedef struct Z_IUTaskPackageRecordStructure
-{
-    int which;
-#define Z_IUTaskPackageRecordStructure_record 1
-#define Z_IUTaskPackageRecordStructure_surrogateDiagnostics 2
-    union {
-        Odr_external *record;
-        Z_DiagRecs *surrogateDiagnostics;
-    } u; /* OPTIONAL */
-    Z_IUCorrelationInfo *correlationInfo; /* OPTIONAL */
-    int *recordStatus;
-#define Z_IUTaskPackageRecordStructureS_success 1
-#define Z_IUTaskPackageRecordStructureS_queued 2
-#define Z_IUTaskPackageRecordStructureS_inProcess 3
-#define Z_IUTaskPackageRecordStructureS_failure 4
-    Z_DiagRecs *supplementalDiagnostics;  /* OPTIONAL */
-} Z_IUTaskPackageRecordStructure;
-
-typedef struct Z_IUTargetPart
-{
-    int *updateStatus;
-#define Z_IUTargetPart_success 1
-#define Z_IUTargetPart_partial 2
-#define Z_IUTargetPart_failure 3
-    int num_globalDiagnostics;
-    Z_DiagRec **globalDiagnostics; /* OPTIONAL */
-    int num_taskPackageRecords;
-    Z_IUTaskPackageRecordStructure **taskPackageRecords;
-} Z_IUTargetPart;
-
-typedef struct Z_IUUpdateEsRequest
-{
-    Z_IUOriginPartToKeep *toKeep;
-    Z_IUSuppliedRecords *notToKeep;
-} Z_IUUpdateEsRequest;
-
-typedef struct Z_IUUpdateTaskPackage
-{
-    Z_IUOriginPartToKeep *originPart;
-    Z_IUTargetPart *targetPart;
-} Z_IUUpdateTaskPackage;
-
-typedef struct Z_IUUpdate
-{
-    int which;
-#define Z_IUUpdate_esRequest 1
-#define Z_IUUpdate_taskPackage 2
-    union {
-        Z_IUUpdateEsRequest *esRequest;
-        Z_IUUpdateTaskPackage *taskPackage;
-    } u;
-} Z_IUUpdate;
-
-YAZ_EXPORT int z_IUUpdate(ODR o, Z_IUUpdate **p, int opt, const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-exp.h b/include/yaz/prt-exp.h
deleted file mode 100644 (file)
index 14240a0..0000000
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
- * Copyright (c) 1995-1998, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_EXP_H
-#define PRT_EXP_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_CommonInfo
-{
-    char *dateAdded;           /* OPTIONAL */
-    char *dateChanged;         /* OPTIONAL */
-    char *expiry;              /* OPTIONAL */
-    char *humanStringLanguage;    /* OPTIONAL */
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_CommonInfo;
-
-typedef struct Z_HumanStringUnit
-{
-    char *language;               /* OPTIONAL */
-    char *text;
-} Z_HumanStringUnit;
-
-typedef struct Z_HumanString
-{
-    int num_strings;
-    Z_HumanStringUnit **strings;
-} Z_HumanString;
-
-typedef struct Z_IconObjectUnit
-{
-    int which;
-#define Z_IconObjectUnit_ianaType 0
-#define Z_IconObjectUnit_z3950type 1
-#define Z_IconObjectUnit_otherType 2
-    char *bodyType;
-    Odr_oct *content;
-} Z_IconObjectUnit;
-
-typedef struct Z_IconObject
-{
-    int num;
-    Z_IconObjectUnit **elements;
-} Z_IconObject;
-
-typedef struct Z_ContactInfo
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_HumanString *address;                 /* OPTIONAL */
-    char *email;                            /* OPTIONAL */
-    char *phone;                            /* OPTIONAL */
-} Z_ContactInfo;
-
-typedef struct Z_NetworkAddressIA
-{
-    char *hostAddress;
-    int *port;
-} Z_NetworkAddressIA;
-
-typedef struct Z_NetworkAddressOPA
-{
-    char *pSel;
-    char *sSel;                  /* OPTIONAL */
-    char *tSel;                  /* OPTIONAL */
-    char *nSap;
-} Z_NetworkAddressOPA;
-
-typedef struct Z_NetworkAddressOther
-{
-    char *type;
-    char *address;
-} Z_NetworkAddressOther;
-
-typedef struct Z_NetworkAddress
-{
-    int which;
-#define Z_NetworkAddress_iA 0
-#define Z_NetworkAddress_oPA 1
-#define Z_NetworkAddress_other 2
-    union
-    {
-       Z_NetworkAddressIA *internetAddress;
-       Z_NetworkAddressOPA *osiPresentationAddress;
-       Z_NetworkAddressOther *other;
-    } u;
-} Z_NetworkAddress;
-
-typedef struct Z_PrivateCapOperator
-{
-    char *roperator;
-    Z_HumanString *description;             /* OPTIONAL */
-} Z_PrivateCapOperator;
-    
-typedef struct Z_SearchKey
-{
-    char *searchKey;
-    Z_HumanString *description;             /* OPTIONAL */
-} Z_SearchKey;
-
-typedef struct Z_PrivateCapabilities
-{
-    int num_operators;
-    Z_PrivateCapOperator **operators;      /* OPTIONAL */
-    int num_searchKeys;
-    Z_SearchKey **searchKeys;               /* OPTIONAL */
-    int num_description;
-    Z_HumanString **description;            /* OPTIONAL */
-} Z_PrivateCapabilities;
-
-typedef struct Z_ProxSupportPrivate
-{
-    int *unit;
-    Z_HumanString *description;             /* OPTIONAL */
-} Z_ProxSupportPrivate;
-
-typedef struct Z_ProxSupportUnit
-{
-    int which;
-#define Z_ProxSupportUnit_known 0
-#define Z_ProxSupportUnit_private 1
-    union
-    {
-       int *known;
-       Z_ProxSupportPrivate *zprivate;
-    } u;
-} Z_ProxSupportUnit;
-
-typedef struct Z_ProximitySupport
-{
-    bool_t *anySupport;
-    int num_unitsSupported;
-    Z_ProxSupportUnit **unitsSupported;     /* OPTIONAL */
-} Z_ProximitySupport;
-
-typedef struct Z_RpnCapabilities
-{
-    int num_operators;
-    int **operators;                        /* OPTIONAL */
-    bool_t *resultSetAsOperandSupported;
-    bool_t *restrictionOperandSupported;
-    Z_ProximitySupport *proximity;          /* OPTIONAL */
-} Z_RpnCapabilities;
-
-typedef struct Z_Iso8777Capabilities
-{
-    int num_searchKeys;
-    Z_SearchKey **searchKeys;
-    Z_HumanString *restrictions;            /* OPTIONAL */
-} Z_Iso8777Capabilities;
-
-typedef struct Z_QueryTypeDetails
-{
-    int which;
-#define Z_QueryTypeDetails_private 0
-#define Z_QueryTypeDetails_rpn 1
-#define Z_QueryTypeDetails_iso8777 2
-#define Z_QueryTypeDetails_z39_58 3
-#define Z_QueryTypeDetails_erpn 4
-#define Z_QueryTypeDetails_rankedList 5
-    union
-    {
-       Z_PrivateCapabilities *zprivate;
-       Z_RpnCapabilities *rpn;
-       Z_Iso8777Capabilities *iso8777;
-       Z_HumanString *z3958;
-       Z_RpnCapabilities *erpn;
-       Z_HumanString *rankedList;
-    } u;
-} Z_QueryTypeDetails;
-
-typedef struct Z_AccessRestrictionsUnit
-{
-    int *accessType;
-#define Z_AccessRestrictionsUnit_any                 0
-#define Z_AccessRestrictionsUnit_search              1
-#define Z_AccessRestrictionsUnit_present             2
-#define Z_AccessRestrictionsUnit_specific_elements   3
-#define Z_AccessRestrictionsUnit_extended_services   4
-#define Z_AccessRestrictionsUnit_by_database         5
-    Z_HumanString *accessText;              /* OPTIONAL */
-    int num_accessChallenges;
-    Odr_oid **accessChallenges;             /* OPTIONAL */
-} Z_AccessRestrictionsUnit;
-
-typedef struct Z_AccessRestrictions
-{
-    int num;
-    Z_AccessRestrictionsUnit **elements;
-} Z_AccessRestrictions;
-
-typedef struct Z_Charge
-{
-    Z_IntUnit *cost;
-    Z_Unit *perWhat;                        /* OPTIONAL */
-    Z_HumanString *text;                    /* OPTIONAL */
-} Z_Charge;
-
-typedef struct Z_CostsOtherCharge
-{
-    Z_HumanString *forWhat;
-    Z_Charge *charge;
-} Z_CostsOtherCharge;
-
-typedef struct Z_Costs
-{
-    Z_Charge *connectCharge;                /* OPTIONAL */
-    Z_Charge *connectTime;                  /* OPTIONAL */
-    Z_Charge *displayCharge;                /* OPTIONAL */
-    Z_Charge *searchCharge;                 /* OPTIONAL */
-    Z_Charge *subscriptCharge;              /* OPTIONAL */
-    int num_otherCharges;
-    Z_CostsOtherCharge **otherCharges;      /* OPTIONAL */
-} Z_Costs;
-
-typedef struct Z_AccessInfo
-{
-    int num_queryTypesSupported;
-    Z_QueryTypeDetails **queryTypesSupported;  /* OPTIONAL */
-    int num_diagnosticsSets;
-    Odr_oid **diagnosticsSets;              /* OPTIONAL */
-    int num_attributeSetIds;
-    Odr_oid **attributeSetIds;     /* OPTIONAL */
-    int num_schemas;
-    Odr_oid **schemas;                      /* OPTIONAL */
-    int num_recordSyntaxes;
-    Odr_oid **recordSyntaxes;               /* OPTIONAL */
-    int num_resourceChallenges;
-    Odr_oid **resourceChallenges;           /* OPTIONAL */
-    Z_AccessRestrictions *restrictedAccess;  /* OPTIONAL */
-    Z_Costs *costInfo;                      /* OPTIONAL */
-    int num_variantSets;
-    Odr_oid **variantSets;                  /* OPTIONAL */
-    int num_elementSetNames;
-    char **elementSetNames;     /* OPTIONAL */
-    int num_unitSystems;
-    char **unitSystems;                     /* OPTIONAL */
-} Z_AccessInfo;
-
-typedef struct Z_DatabaseList
-{
-    int num_databases;
-    Z_DatabaseName **databases;
-} Z_DatabaseList;
-
-typedef struct Z_AttributeValueList
-{
-    int num_attributes;
-    Z_StringOrNumeric **attributes;
-} Z_AttributeValueList;
-
-typedef struct Z_AttributeOccurrence
-{
-    Odr_oid *attributeSet;         /* OPTIONAL */
-    int *attributeType;
-    Odr_null *mustBeSupplied;               /* OPTIONAL */
-    int which;
-#define Z_AttributeOcc_any_or_none 0
-#define Z_AttributeOcc_specific 1
-    union
-    {
-       Odr_null *any_or_none;
-       Z_AttributeValueList *specific;
-    } attributeValues;
-} Z_AttributeOccurrence;
-
-typedef struct Z_AttributeCombination
-{
-    int num_occurrences;
-    Z_AttributeOccurrence **occurrences;
-} Z_AttributeCombination;
-
-typedef struct Z_AttributeCombinations
-{
-    Odr_oid *defaultAttributeSet;
-    int num_legalCombinations;
-    Z_AttributeCombination **legalCombinations;
-} Z_AttributeCombinations;
-
-typedef struct Z_AttributeValue
-{
-    Z_StringOrNumeric *value;
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_subAttributes;
-    Z_StringOrNumeric **subAttributes;      /* OPTIONAL */
-    int num_superAttributes;
-    Z_StringOrNumeric **superAttributes;    /* OPTIONAL */
-    Odr_null *partialSupport;               /* OPTIONAL */
-} Z_AttributeValue;
-
-typedef struct Z_TargetInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * key elements
-     */
-    char *name;
-    /*
-     * non-key brief elements
-     */
-    Z_HumanString *recentNews;             /* OPTIONAL */
-    Z_IconObject *icon;                     /* OPTIONAL */
-    bool_t *namedResultSets;
-    bool_t *multipleDBsearch;
-    int *maxResultSets;                     /* OPTIONAL */
-    int *maxResultSize;                     /* OPTIONAL */
-    int *maxTerms;                          /* OPTIONAL */
-    Z_IntUnit *timeoutInterval;             /* OPTIONAL */
-    Z_HumanString *welcomeMessage;          /* OPTIONAL */
-    /*
-     * non-brief elements
-     */
-    Z_ContactInfo *contactInfo;             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_nicknames;
-    char **nicknames;
-    Z_HumanString *usageRest;              /* OPTIONAL */
-    Z_HumanString *paymentAddr;             /* OPTIONAL */
-    Z_HumanString *hours;                   /* OPTIONAL */
-    int num_dbCombinations;
-    Z_DatabaseList **dbCombinations;        /* OPTIONAL */
-    int num_addresses;
-    Z_NetworkAddress **addresses;           /* OPTIONAL */
-    int num_languages;
-    char **languages;                       /* OPTIONAL */
-
-    Z_AccessInfo *commonAccessInfo;         /* OPTIONAL */
-} Z_TargetInfo;
-
-typedef struct Z_DatabaseInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Z_DatabaseName *name;
-    /* 
-     * Non-key elements.
-     */
-    Odr_null *explainDatabase;              /* OPTIONAL */
-    int num_nicknames;
-    Z_DatabaseName **nicknames;             /* OPTIONAL */
-    Z_IconObject *icon;                     /* OPTIONAL */
-    bool_t *userFee;
-    bool_t *available;
-    Z_HumanString *titleString;             /* OPTIONAL */
-    /*
-     * Non-brief elements.
-     */
-    int num_keywords;
-    Z_HumanString **keywords;               /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_DatabaseList *associatedDbs;          /* OPTIONAL */
-    Z_DatabaseList *subDbs;                 /* OPTIONAL */
-    Z_HumanString *disclaimers;             /* OPTIONAL */
-    Z_HumanString *news;                    /* OPTIONAL */
-
-#if 1
-    int which;
-    union {
-       int *actualNumber;
-       int *approxNumber;
-#define Z_DatabaseInfo_actualNumber 1
-#define Z_DatabaseInfo_approxNumber 2
-    } u; /* OPT */
-
-#else
-    int recordCount_which;
-#define Z_DatabaseInfo_actualNumber 0
-#define Z_DatabaseInfo_approxNumber 1
-    int *recordCount;                       /* OPTIONAL */
-#endif
-    Z_HumanString *defaultOrder;            /* OPTIONAL */
-    int *avRecordSize;                      /* OPTIONAL */
-    int *maxRecordSize;                     /* OPTIONAL */
-    Z_HumanString *hours;                   /* OPTIONAL */
-    Z_HumanString *bestTime;                /* OPTIONAL */
-    char *lastUpdate;          /* OPTIONAL */
-    Z_IntUnit *updateInterval;              /* OPTIONAL */
-    Z_HumanString *coverage;                /* OPTIONAL */
-    bool_t *proprietary;                    /* OPTIONAL */
-    Z_HumanString *copyrightText;           /* OPTIONAL */
-    Z_HumanString *copyrightNotice;         /* OPTIONAL */
-    Z_ContactInfo *producerContactInfo;     /* OPTIONAL */
-    Z_ContactInfo *supplierContactInfo;     /* OPTIONAL */
-    Z_ContactInfo *submissionContactInfo;   /* OPTIONAL */
-    Z_AccessInfo *accessInfo;               /* OPTIONAL */
-} Z_DatabaseInfo;
-
-typedef struct Z_TagTypeMapping
-{
-    int *tagType;
-    Odr_oid *tagSet;                        /* OPTIONAL */
-    Odr_null *defaultTagType;               /* OPTIONAL */
-} Z_TagTypeMapping;
-
-typedef struct Z_PathUnit
-{
-    int *tagType;
-    Z_StringOrNumeric *tagValue;
-} Z_PathUnit;
-
-typedef struct Z_Path
-{
-    int num;
-    Z_PathUnit **list;
-} Z_Path;
-
-struct Z_ElementDataType;
-typedef struct Z_ElementDataType Z_ElementDataType;
-
-typedef struct Z_ElementInfo
-{
-    char *elementName;
-    Z_Path *elementTagPath;
-    Z_ElementDataType *dataType;            /* OPTIONAL */
-    bool_t *required;
-    bool_t *repeatable;
-    Z_HumanString *description;             /* OPTIONAL */
-} Z_ElementInfo;
-
-typedef struct Z_ElementInfoList
-{
-    int num;
-    Z_ElementInfo **list;
-} Z_ElementInfoList;
-
-struct Z_ElementDataType
-{
-    int which;
-#define Z_ElementDataType_primitive 0
-#define Z_ElementDataType_structured 1
-    union
-    {
-       int *primitive;
-#define Z_PrimitiveDataType_octetString         0
-#define Z_PrimitiveDataType_numeric             1
-#define Z_PrimitiveDataType_date                2
-#define Z_PrimitiveDataType_external            3
-#define Z_PrimitiveDataType_string              4
-#define Z_PrimitiveDataType_trueOrFalse         5
-#define Z_PrimitiveDataType_oid                 6
-#define Z_PrimitiveDataType_intUnit             7
-#define Z_PrimitiveDataType_empty               8
-#define Z_PrimitiveDataType_noneOfTheAbove      100
-       Z_ElementInfoList *structured;
-    } u;
-};
-
-typedef struct Z_TagSetInfoElements
-{
-    char *elementname;
-    int num_nicknames;
-    char **nicknames;                       /* OPTIONAL */
-    Z_StringOrNumeric *elementTag;
-    Z_HumanString *description;             /* OPTIONAL */
-    int *dataType;                          /* OPTIONAL */
-    /* (value as in Z_PrimitiveElement) */
-    Z_OtherInformation *otherTagInfo;       /* OPTIONAL */
-} Z_TagSetInfoElements;
-
-typedef struct Z_SchemaInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Odr_oid *schema;
-    /*
-     * Non-key elements
-     */
-    char *name;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_tagTypeMapping;
-    Z_TagTypeMapping **tagTypeMapping;      /* OPTIONAL */
-    int num_recordStructure;
-    Z_ElementInfo **recordStructure;        /* OPTIONAL */
-} Z_SchemaInfo;
-
-
-typedef struct Z_TagSetInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Odr_oid *tagSet;
-    /*
-     * Non-key elements
-     */
-    char *name;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_elements;
-    Z_TagSetInfoElements **elements;        /* OPTIONAL */
-} Z_TagSetInfo;
-
-typedef struct Z_RecordSyntaxInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Odr_oid *recordSyntax;
-    /*
-     * Non-key elements
-     */
-    char *name;
-    /*
-     * Non-brief elements
-     */
-    int num_transferSyntaxes;
-    Odr_oid **transferSyntaxes;             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    char *asn1Module;                       /* OPTIONAL */
-    int num_abstractStructure;
-    Z_ElementInfo **abstractStructure;      /* OPTIONAL */
-} Z_RecordSyntaxInfo;
-
-typedef struct Z_AttributeDescription
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_StringOrNumeric *attributeValue;
-    int num_equivalentAttributes;
-    Z_StringOrNumeric **equivalentAttributes; /* OPTIONAL */
-} Z_AttributeDescription;
-
-typedef struct Z_AttributeType
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    int *attributeType;
-    int num_attributeValues;
-    Z_AttributeDescription **attributeValues;
-} Z_AttributeType;
-
-typedef struct Z_AttributeSetInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Odr_oid *attributeSet;
-    /*
-     * Non-key elements
-     */
-    char *name;
-    /*
-     * Non-brief elements
-     */
-    int num_attributes;
-    Z_AttributeType **attributes;           /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-} Z_AttributeSetInfo;
-
-typedef struct Z_TermListElement
-{
-    char *name;
-    Z_HumanString *title;                   /* OPTIONAL */
-    int *searchCost;                        /* OPTIONAL */
-#define Z_TermListElement_optimized           0
-#define Z_TermListElement_normal              1
-#define Z_TermListElement_expensive           2
-#define Z_TermListElement_filter              3
-    bool_t *scanable;
-    int num_broader;
-    char **broader;                         /* OPTIONAL */
-    int num_narrower;
-    char **narrower;                        /* OPTIONAL */
-} Z_TermListElement;
-
-typedef struct Z_TermListInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Z_DatabaseName *databaseName;
-    /*
-     * Non-key elements
-     */
-    int num_termLists;
-    Z_TermListElement **termLists;
-} Z_TermListInfo;
-
-typedef struct Z_ExtendedServicesInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Odr_oid *type;
-    /*
-     * Non-key elements
-     */
-    char *name;                             /* OPTIONAL */
-    bool_t *privateType;
-    bool_t *restrictionsApply;
-    bool_t *feeApply;
-    bool_t *available;
-    bool_t *retentionSupported;
-    int *waitAction;
-#define Z_ExtendedServicesInfo_waitSupported       1
-#define Z_ExtendedServicesInfo_waitAlways          2
-#define Z_ExtendedServicesInfo_waitNotSupported    3
-#define Z_ExtendedServicesInfo_depends             4
-#define Z_ExtendedServicesInfo_notSaying           5
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_External *specificExplain;          /* OPTIONAL */
-    char *esASN;                            /* OPTIONAL */
-} Z_ExtendedServicesInfo;
-
-typedef struct Z_OmittedAttributeInterpretation
-{
-    Z_StringOrNumeric *defaultValue;        /* OPTIONAL */
-    Z_HumanString *defaultDescription;      /* OPTIONAL */
-} Z_OmittedAttributeInterpretation;
-
-typedef struct Z_AttributeTypeDetails
-{
-    int *attributeType;
-    Z_OmittedAttributeInterpretation *defaultIfOmitted;  /* OPTIONAL */
-    int num_attributeValues;
-    Z_AttributeValue **attributeValues;     /* OPTIONAL */
-} Z_AttributeTypeDetails;
-
-typedef struct Z_AttributeSetDetails
-{
-    Odr_oid *attributeSet;
-    int num_attributesByType;
-    Z_AttributeTypeDetails **attributesByType;
-} Z_AttributeSetDetails;
-
-typedef struct Z_AttributeDetails
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key details
-     */
-    Z_DatabaseName *databaseName;
-    /*
-     * Non-brief elements
-     */
-    int num_attributesBySet;
-    Z_AttributeSetDetails **attributesBySet;  /* OPTIONAL */
-    Z_AttributeCombinations *attributeCombinations;  /* OPTIONAL */
-} Z_AttributeDetails;
-
-typedef struct Z_EScanInfo
-{
-    int *maxStepSize;                       /* OPTIONAL */
-    Z_HumanString *collatingSequence;       /* OPTIONAL */
-    bool_t *increasing;                     /* OPTIONAL */
-} Z_EScanInfo;
-
-typedef struct Z_TermListDetails
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    char *termListName;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_AttributeCombinations *attributes;    /* OPTIONAL */
-    Z_EScanInfo *scanInfo;                  /* OPTIONAL */
-    int *estNumberTerms;                    /* OPTIONAL */
-    int num_sampleTerms;
-    Z_Term **sampleTerms;                   /* OPTIONAL */
-} Z_TermListDetails;
-
-typedef struct Z_RecordTag
-{
-    Z_StringOrNumeric *qualifier;           /* OPTIONAL */
-    Z_StringOrNumeric *tagValue;
-} Z_RecordTag;
-
-typedef struct Z_PerElementDetails
-{
-    char *name;                             /* OPTIONAL */
-    Z_RecordTag *recordTag;                 /* OPTIONAL */
-    int num_schemaTags;
-    Z_Path **schemaTags;                    /* OPTIONAL */
-    int *maxSize;                           /* OPTIONAL */
-    int *minSize;                           /* OPTIONAL */
-    int *avgSize;                           /* OPTIONAL */
-    int *fixedSize;                         /* OPTIONAL */
-    bool_t *repeatable;
-    bool_t *required;
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_HumanString *contents;                /* OPTIONAL */
-    Z_HumanString *billingInfo;             /* OPTIONAL */
-    Z_HumanString *restrictions;            /* OPTIONAL */
-    int num_alternateNames;
-    char **alternateNames;                  /* OPTIONAL */
-    int num_genericNames;
-    char **genericNames;                    /* OPTIONAL */
-    Z_AttributeCombinations *searchAccess;  /* OPTIONAL */
-} Z_PerElementDetails;
-
-typedef struct Z_ElementSetDetails
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Z_DatabaseName *databaseName;
-    char *elementSetName;
-    Odr_oid *recordSyntax;
-    /*
-     * Brief elements
-     */
-    Odr_oid *schema;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_detailsPerElement;
-    Z_PerElementDetails **detailsPerElement;  /* OPTIONAL */
-} Z_ElementSetDetails;
-
-typedef struct Z_RetrievalRecordDetails
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Z_DatabaseName *databaseName;
-    Odr_oid *schema;
-    Odr_oid *recordSyntax;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_detailsPerElement;
-    Z_PerElementDetails **detailsPerElement;  /* OPTIONAL */
-} Z_RetrievalRecordDetails;
-
-typedef struct Z_SortKeyDetails
-{
-    Z_HumanString *description;                        /* OPTIONAL */
-    int num_elementSpecifications;
-    Z_Specification **elementSpecifications;           /* OPTIONAL */
-    Z_AttributeCombinations *attributeSpecifications;  /* OPTIONAL */
-    int which;
-#define Z_SortKeyDetails_character 0
-#define Z_SortKeyDetails_numeric 1
-#define Z_SortKeyDetails_structured 2
-    union
-    {
-       Odr_null *character;
-       Odr_null *numeric;
-       Z_HumanString *structured;
-    } u;
-    int *caseSensitivity;                              /* OPTIONAL */
-#define Z_SortKeyDetails_always              0
-#define Z_SortKeyDetails_never               1
-#define Z_SortKeyDetails_default_yes         2
-#define Z_SortKeyDetails_default_no          3
-} Z_SortKeyDetails;
-
-typedef struct Z_SortDetails
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Z_DatabaseName *databaseName;
-    /* 
-     * Non-brief elements
-     */
-    int num_sortKeys;
-    Z_SortKeyDetails **sortKeys;            /* OPTIONAL */
-} Z_SortDetails;
-
-typedef struct Z_ProcessingInformation
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Z_DatabaseName *databaseName;
-    int *processingContext;
-#define Z_ProcessingInformation_access               0
-#define Z_ProcessingInformation_search               1
-#define Z_ProcessingInformation_retrieval            2
-#define Z_ProcessingInformation_record_presentation  3
-#define Z_ProcessingInformation_record_handling      4
-    char *name;
-    Odr_oid *oid;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_External *instructions;             /* OPTIONAL */
-} Z_ProcessingInformation;
-
-typedef struct Z_ValueDescription
-{
-    int which;
-#define Z_ValueDescription_integer 0
-#define Z_ValueDescription_string 1
-#define Z_ValueDescription_octets 2
-#define Z_ValueDescription_oid 3
-#define Z_ValueDescription_unit 4
-#define Z_ValueDescription_valueAndUnit 5
-    union
-    {
-       int *integer;
-       char *string;
-       Odr_oct *octets;
-       Odr_oid *oid;
-       Z_Unit *unit;
-       Z_IntUnit *valueAndUnit;
-    } u;
-} Z_ValueDescription;
-
-typedef struct Z_ValueRange
-{
-    Z_ValueDescription *lower;              /* OPTIONAL */
-    Z_ValueDescription *upper;              /* OPTIONAL */
-} Z_ValueRange;
-
-typedef struct Z_ValueSetEnumerated
-{
-    int num;
-    Z_ValueDescription **elements;
-} Z_ValueSetEnumerated;
-
-typedef struct Z_ValueSet
-{
-    int which;
-#define Z_ValueSet_range 0
-#define Z_ValueSet_enumerated 1
-    union
-    {
-       Z_ValueRange *range;
-       Z_ValueSetEnumerated *enumerated;
-    } u;
-} Z_ValueSet;
-
-typedef struct Z_VariantValue
-{
-    int *dataType;
-    Z_ValueSet *values;                     /* OPTIONAL */
-} Z_VariantValue;
-
-typedef struct Z_VariantType
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    int *variantType;
-    Z_VariantValue *variantValue;           /* OPTIONAL */
-} Z_VariantType;
-
-typedef struct Z_VariantClass
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    int *variantClass;
-    int num_variantTypes;
-    Z_VariantType **variantTypes;
-} Z_VariantClass;
-
-typedef struct Z_VariantSetInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    Odr_oid *variantSet;
-    /*
-     * Brief elements
-     */
-    char *name;
-    /*
-     * Non-brief elements
-     */
-    int num_variants;
-    Z_VariantClass **variants;              /* OPTIONAL */
-} Z_VariantSetInfo;
-
-typedef struct Z_Units
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_StringOrNumeric *unit;
-} Z_Units;
-
-typedef struct Z_UnitType
-{
-    char *name;                             /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    Z_StringOrNumeric *unitType;
-    int num_units;
-    Z_Units **units;
-} Z_UnitType;
-
-typedef struct Z_UnitInfo
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    /*
-     * Key elements
-     */
-    char *unitSystem;
-    /*
-     * Non-brief elements
-     */
-    Z_HumanString *description;             /* OPTIONAL */
-    int num_units;
-    Z_UnitType **units;                     /* OPTIONAL */
-} Z_UnitInfo;
-
-typedef struct Z_CategoryInfo
-{
-    char *category;
-    char *originalCategory;                 /* OPTIONAL */
-    Z_HumanString *description;             /* OPTIONAL */
-    char *asn1Module;                       /* OPTIONAL */
-} Z_CategoryInfo;
-
-typedef struct Z_CategoryList
-{
-    Z_CommonInfo *commonInfo;               /* OPTIONAL */
-    int num_categories;
-    Z_CategoryInfo **categories;
-} Z_CategoryList;
-
-typedef struct Z_ExplainRecord
-{
-    int which;
-#define Z_Explain_targetInfo 0
-#define Z_Explain_databaseInfo 1
-#define Z_Explain_schemaInfo 2
-#define Z_Explain_tagSetInfo 3
-#define Z_Explain_recordSyntaxInfo 4
-#define Z_Explain_attributeSetInfo 5
-#define Z_Explain_termListInfo 6
-#define Z_Explain_extendedServicesInfo 7
-#define Z_Explain_attributeDetails 8
-#define Z_Explain_termListDetails 9
-#define Z_Explain_elementSetDetails 10
-#define Z_Explain_retrievalRecordDetails 11
-#define Z_Explain_sortDetails 12
-#define Z_Explain_processing 13
-#define Z_Explain_variants 14
-#define Z_Explain_units 15
-#define Z_Explain_categoryList 16
-    union
-    {
-       Z_TargetInfo *targetInfo;
-       Z_DatabaseInfo *databaseInfo;
-       Z_SchemaInfo *schemaInfo;
-       Z_TagSetInfo *tagSetInfo;
-       Z_RecordSyntaxInfo *recordSyntaxInfo;
-       Z_AttributeSetInfo *attributeSetInfo;
-       Z_TermListInfo *termListInfo;
-       Z_ExtendedServicesInfo *extendedServicesInfo;
-       Z_AttributeDetails *attributeDetails;
-       Z_TermListDetails *termListDetails;
-       Z_ElementSetDetails *elementSetDetails;
-       Z_RetrievalRecordDetails *retrievalRecordDetails;
-       Z_SortDetails *sortDetails;
-       Z_ProcessingInformation *processing;
-       Z_VariantSetInfo *variants;
-       Z_UnitInfo *units;
-       Z_CategoryList *categoryList;
-    } u;
-} Z_ExplainRecord;
-
-YAZ_EXPORT int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt,
-                              const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-grs.h b/include/yaz/prt-grs.h
deleted file mode 100644 (file)
index c7f5f07..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1995-1998, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_GRS_H
-#define PRT_GRS_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct Z_GenericRecord;
-typedef struct Z_GenericRecord Z_GenericRecord;
-
-typedef struct Z_ElementData
-{
-    int which;
-#define Z_ElementData_octets 0
-#define Z_ElementData_numeric 1
-#define Z_ElementData_date 2
-#define Z_ElementData_ext 3
-#define Z_ElementData_string 4
-#define Z_ElementData_trueOrFalse 5
-#define Z_ElementData_oid 6
-#define Z_ElementData_intUnit 7
-#define Z_ElementData_elementNotThere 8
-#define Z_ElementData_elementEmpty 9
-#define Z_ElementData_noDataRequested 10
-#define Z_ElementData_diagnostic 11
-#define Z_ElementData_subtree 12
-    union
-    {
-       Odr_oct *octets;                      
-       int *numeric;                         
-       char *date;             
-       Z_External *ext;                     
-       char *string;                         
-       bool_t *trueOrFalse;                  
-       Odr_oid *oid;                         
-       Z_IntUnit *intUnit;                  
-       Odr_null *elementNotThere;            
-       Odr_null *elementEmpty;               
-       Odr_null *noDataRequested;            
-       Z_External *diagnostic;              
-       Z_GenericRecord *subtree;            
-    } u;
-} Z_ElementData;
-
-typedef struct Z_Order
-{
-    bool_t *ascending;                    
-    int *order;                           
-} Z_Order;
-
-typedef struct Z_Usage
-{
-    int *type;                            
-#define Z_Usage_redistributable     1
-#define Z_Usage_restricted          2
-#define Z_Usage_licensePointer      3
-    char *restriction;                      /* OPTIONAL */
-} Z_Usage;
-
-typedef struct Z_HitVector
-{
-    Z_Term *satisfier;                      /* OPTIONAL */
-    Z_IntUnit *offsetIntoElement;           /* OPTIONAL */
-    Z_IntUnit *length;                      /* OPTIONAL */
-    int *hitRank;                           /* OPTIONAL */
-    Odr_oct *targetToken;                   /* OPTIONAL */
-} Z_HitVector;
-
-typedef struct Z_Triple
-{
-    Odr_oid *variantSetId;                  /* OPTIONAL */
-    int *zclass;
-    int *type;
-    int which;
-#define Z_Triple_integer 0
-#define Z_Triple_internationalString 1
-#define Z_Triple_octetString 2
-#define Z_Triple_oid 3
-#define Z_Triple_boolean 4
-#define Z_Triple_null 5
-#define Z_Triple_unit 6
-#define Z_Triple_valueAndUnit 7
-    union
-    {
-       int *integer;
-       char *internationalString;
-       Odr_oct *octetString;
-       Odr_oid *oid;
-       bool_t *zboolean;
-       Odr_null *null;
-       Z_Unit *unit;
-       Z_IntUnit *valueAndUnit;
-    } value;
-} Z_Triple;
-
-typedef struct Z_Variant
-{
-    Odr_oid *globalVariantSetId;            /* OPTIONAL */
-    int num_triples;
-    Z_Triple **triples;
-} Z_Variant;
-
-typedef struct Z_TagUnit
-{
-    int *tagType;                           /* OPTIONAL */
-    Z_StringOrNumeric *tagValue;         
-    int *tagOccurrence;                     /* OPTIONAL */
-} Z_TagUnit;
-
-typedef struct Z_TagPath
-{
-    int num_tags;
-    Z_TagUnit **tags;
-} Z_TagPath;
-
-typedef struct Z_ElementMetaData
-{
-    Z_Order *seriesOrder;                   /* OPTIONAL */
-    Z_Usage *usageRight;                    /* OPTIONAL */
-    int num_hits;
-    Z_HitVector **hits;                     /* OPTIONAL */
-    char *displayName;                      /* OPTIONAL */
-    int num_supportedVariants;
-    Z_Variant **supportedVariants;          /* OPTIONAL */
-    char *message;                          /* OPTIONAL */
-    Odr_oct *elementDescriptor;             /* OPTIONAL */
-    Z_TagPath *surrogateFor;                /* OPTIONAL */
-    Z_TagPath *surrogateElement;            /* OPTIONAL */
-    Z_External *other;                      /* OPTIONAL */
-} Z_ElementMetaData;
-
-typedef struct Z_TaggedElement
-{
-    int *tagType;                           /* OPTIONAL */
-    Z_StringOrNumeric *tagValue;         
-    int *tagOccurrence;                     /* OPTIONAL */
-    Z_ElementData *content;              
-    Z_ElementMetaData *metaData;            /* OPTIONAL */
-    Z_Variant *appliedVariant;              /* OPTIONAL */
-} Z_TaggedElement;
-
-struct Z_GenericRecord
-{
-    int num_elements;
-    Z_TaggedElement **elements;
-};
-
-YAZ_EXPORT int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt,
-                              const char *name);
-YAZ_EXPORT int z_Variant(ODR o, Z_Variant **p, int opt,
-                        const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-proto.h b/include/yaz/prt-proto.h
deleted file mode 100644 (file)
index 08c47d6..0000000
+++ /dev/null
@@ -1,1164 +0,0 @@
-/*
- * Copyright (c) 1995-2000, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The name of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- * $Id: prt-proto.h,v 1.2 2000-02-28 11:20:06 adam Exp $
- */
-
-#ifndef PRT_PROTO_H
-#define PRT_PROTO_H
-
-#include <yaz/yconfig.h>
-#include <yaz/odr.h>
-#include <yaz/oid.h>
-#include <yaz/yaz-version.h>
-
-YAZ_BEGIN_CDECL
-
-/* ----------------- GLOBAL AUXILIARY DEFS ----------------*/
-
-struct Z_External;
-typedef struct Z_External Z_External;
-
-typedef Odr_oct Z_ReferenceId;
-typedef char Z_DatabaseName;
-typedef char Z_ResultSetId;
-typedef Odr_oct Z_ResultsetId;
-
-typedef struct Z_InfoCategory
-{
-    Odr_oid *categoryTypeId;         /* OPTIONAL */
-    int *categoryValue;
-} Z_InfoCategory;
-
-typedef struct Z_OtherInformationUnit
-{
-    Z_InfoCategory *category;        /* OPTIONAL */
-    int which;
-#define Z_OtherInfo_characterInfo 0
-#define Z_OtherInfo_binaryInfo 1
-#define Z_OtherInfo_externallyDefinedInfo 2
-#define Z_OtherInfo_oid 3
-    union
-    {
-       char *characterInfo; 
-       Odr_oct *binaryInfo;
-       Z_External *externallyDefinedInfo;
-       Odr_oid *oid;
-    } information;
-} Z_OtherInformationUnit;
-
-typedef struct Z_OtherInformation
-{
-    int num_elements;
-    Z_OtherInformationUnit **list;
-} Z_OtherInformation;
-
-typedef struct Z_StringOrNumeric
-{
-    int which;
-#define Z_StringOrNumeric_string 0
-#define Z_StringOrNumeric_numeric 1
-    union
-    {
-       char *string;
-       int *numeric;
-    } u;
-} Z_StringOrNumeric;
-
-typedef struct Z_Unit
-{
-    char *unitSystem;               /* OPTIONAL */
-    Z_StringOrNumeric *unitType;    /* OPTIONAL */
-    Z_StringOrNumeric *unit;        /* OPTIONAL */
-    int *scaleFactor;               /* OPTIONAL */
-} Z_Unit;
-
-typedef struct Z_IntUnit
-{
-    int *value;
-    Z_Unit *unitUsed;
-} Z_IntUnit;
-
-typedef Odr_oct Z_SUTRS;
-
-typedef struct Z_StringList
-{
-    int num_strings;
-    char **strings;
-} Z_StringList;
-
-/* ----------------- INIT SERVICE  ----------------*/
-
-typedef struct
-{
-    char *groupId;       /* OPTIONAL */
-    char *userId;         /* OPTIONAL */
-    char *password;      /* OPTIONAL */
-} Z_IdPass;
-
-typedef struct Z_IdAuthentication
-{
-    int which;
-#define Z_IdAuthentication_open 0
-#define Z_IdAuthentication_idPass 1
-#define Z_IdAuthentication_anonymous 2
-#define Z_IdAuthentication_other 3
-    union
-    {
-       char *open;
-       Z_IdPass *idPass;
-       Odr_null *anonymous;
-       Z_External *other;
-    } u;
-} Z_IdAuthentication;
-
-#define Z_ProtocolVersion_1               0
-#define Z_ProtocolVersion_2               1
-#define Z_ProtocolVersion_3               2
-
-#define Z_Options_search                  0
-#define Z_Options_present                 1
-#define Z_Options_delSet                  2
-#define Z_Options_resourceReport          3
-#define Z_Options_triggerResourceCtrl     4
-#define Z_Options_resourceCtrl            5
-#define Z_Options_accessCtrl              6
-#define Z_Options_scan                    7
-#define Z_Options_sort                    8
-#define Z_Options_reserved                9
-#define Z_Options_extendedServices       10
-#define Z_Options_level_1Segmentation    11
-#define Z_Options_level_2Segmentation    12
-#define Z_Options_concurrentOperations   13
-#define Z_Options_namedResultSets        14
-
-typedef struct Z_InitRequest
-{
-    Z_ReferenceId *referenceId;                   /* OPTIONAL */
-    Odr_bitmask *protocolVersion;
-    Odr_bitmask *options;
-    int *preferredMessageSize;
-    int *maximumRecordSize;
-    Z_IdAuthentication* idAuthentication;        /* OPTIONAL */
-    char *implementationId;                      /* OPTIONAL */
-    char *implementationName;                    /* OPTIONAL */
-    char *implementationVersion;                 /* OPTIONAL */
-    Z_External *userInformationField;            /* OPTIONAL */
-    Z_OtherInformation *otherInfo;               /* OPTIONAL */
-} Z_InitRequest;
-
-typedef struct Z_InitResponse
-{
-    Z_ReferenceId *referenceId;    /* OPTIONAL */
-    Odr_bitmask *protocolVersion;
-    Odr_bitmask *options;
-    int *preferredMessageSize;
-    int *maximumRecordSize;
-    bool_t *result;
-    char *implementationId;      /* OPTIONAL */
-    char *implementationName;    /* OPTIONAL */
-    char *implementationVersion; /* OPTIONAL */
-    Z_External *userInformationField; /* OPTIONAL */
-    Z_OtherInformation *otherInfo;    /* OPTIONAL */
-} Z_InitResponse;
-
-typedef struct Z_NSRAuthentication
-{
-    char *user;
-    char *password;
-    char *account;
-} Z_NSRAuthentication;
-
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt,
-                       const char *name);
-
-int z_StrAuthentication(ODR o, char **p, int opt, const char *name);
-
-/* ------------------ SEARCH SERVICE ----------------*/
-
-typedef struct Z_DatabaseSpecificUnit
-{
-    char *databaseName;
-    char *elementSetName;
-} Z_DatabaseSpecificUnit;
-
-typedef struct Z_DatabaseSpecific
-{
-    int num_elements;
-    Z_DatabaseSpecificUnit **elements;
-} Z_DatabaseSpecific;
-
-typedef struct Z_ElementSetNames
-{
-    int which;
-#define Z_ElementSetNames_generic 0
-#define Z_ElementSetNames_databaseSpecific 1
-    union
-    {
-        char *generic;
-        Z_DatabaseSpecific *databaseSpecific;
-    } u;
-} Z_ElementSetNames;
-
-/* ---------------------- RPN QUERY --------------------------- */
-
-typedef struct Z_ComplexAttribute
-{
-    int num_list;
-    Z_StringOrNumeric **list;
-    int num_semanticAction;
-    int **semanticAction;           /* OPTIONAL */
-} Z_ComplexAttribute;
-
-typedef struct Z_AttributeElement
-{
-    Odr_oid *attributeSet;           /* OPTIONAL - v3 only */
-    int *attributeType;
-    int which;
-#define Z_AttributeValue_numeric 0
-#define Z_AttributeValue_complex 1
-    union
-    {
-       int *numeric;
-       Z_ComplexAttribute *complex;
-    } value;
-} Z_AttributeElement;
-
-typedef struct Z_Term 
-{
-    int which;
-#define Z_Term_general 0
-#define Z_Term_numeric 1
-#define Z_Term_characterString 2
-#define Z_Term_oid 3
-#define Z_Term_dateTime 4
-#define Z_Term_external 5
-#define Z_Term_integerAndUnit 6
-#define Z_Term_null 7
-    union
-    {
-       Odr_oct *general; /* this is required for v2 */
-       int *numeric;
-       char *characterString;
-       Odr_oid *oid;
-       char *dateTime;
-       Z_External *external;
-       /* Z_IntUnit *integerAndUnit; */
-       Odr_null *null;
-    } u;
-} Z_Term;
-
-typedef struct Z_AttributesPlusTerm
-{
-    int num_attributes;
-    Z_AttributeElement **attributeList;
-    Z_Term *term;
-} Z_AttributesPlusTerm;
-
-typedef struct Z_ResultSetPlusAttributes
-{
-    char *resultSet;
-    int num_attributes;
-    Z_AttributeElement **attributeList;
-} Z_ResultSetPlusAttributes;
-
-typedef struct Z_ProximityOperator
-{
-    bool_t *exclusion;          /* OPTIONAL */
-    int *distance;
-    bool_t *ordered;
-    int *relationType;
-#define Z_Prox_lessThan           1
-#define Z_Prox_lessThanOrEqual    2
-#define Z_Prox_equal              3
-#define Z_Prox_greaterThanOrEqual 4
-#define Z_Prox_greaterThan        5
-#define Z_Prox_notEqual           6
-    int which;
-#define Z_ProxCode_known 0
-#define Z_ProxCode_private 1
-    int *proximityUnitCode;
-#define Z_ProxUnit_character       1
-#define Z_ProxUnit_word            2
-#define Z_ProxUnit_sentence        3
-#define Z_ProxUnit_paragraph       4
-#define Z_ProxUnit_section         5
-#define Z_ProxUnit_chapter         6
-#define Z_ProxUnit_document        7
-#define Z_ProxUnit_element         8
-#define Z_ProxUnit_subelement      9
-#define Z_ProxUnit_elementType    10
-#define Z_ProxUnit_byte           11   /* v3 only */
-} Z_ProximityOperator;
-
-typedef struct Z_Operator
-{
-    int which;
-#define Z_Operator_and 0
-#define Z_Operator_or 1
-#define Z_Operator_and_not 2
-#define Z_Operator_prox 3
-    union
-    {
-       Odr_null *and;          /* these guys are nulls. */
-       Odr_null *or;
-       Odr_null *and_not;
-       Z_ProximityOperator *prox;
-    } u;
-} Z_Operator;
-
-typedef struct Z_Operand
-{
-    int which;
-#define Z_Operand_APT 0
-#define Z_Operand_resultSetId 1
-#define Z_Operand_resultAttr             /* v3 only */ 2
-    union
-    {
-       Z_AttributesPlusTerm *attributesPlusTerm;
-       Z_ResultSetId *resultSetId;
-       Z_ResultSetPlusAttributes *resultAttr;
-    } u;
-} Z_Operand;
-
-typedef struct Z_Complex
-{
-    struct Z_RPNStructure *s1;
-    struct Z_RPNStructure *s2;
-    Z_Operator *roperator;
-} Z_Complex;
-
-typedef struct Z_RPNStructure
-{
-    int which;
-#define Z_RPNStructure_simple 0
-#define Z_RPNStructure_complex 1
-    union
-    {
-       Z_Operand *simple;
-       Z_Complex *complex;
-    } u;
-} Z_RPNStructure;
-
-typedef struct Z_RPNQuery
-{
-    Odr_oid *attributeSetId;
-    Z_RPNStructure *RPNStructure;
-} Z_RPNQuery;
-
-/* -------------------------- SEARCHREQUEST -------------------------- */
-
-typedef struct Z_Query
-{
-    int which;
-#define Z_Query_type_1 1
-#define Z_Query_type_2 2
-#define Z_Query_type_101 3
-    union
-    {
-       Z_RPNQuery *type_1;
-       Odr_oct *type_2;
-       Z_RPNQuery *type_101;
-    } u;
-} Z_Query;
-
-typedef struct Z_SearchRequest
-{
-    Z_ReferenceId *referenceId;   /* OPTIONAL */
-    int *smallSetUpperBound;
-    int *largeSetLowerBound;
-    int *mediumSetPresentNumber;
-    bool_t *replaceIndicator;
-    char *resultSetName;
-    int num_databaseNames;
-    char **databaseNames;
-    Z_ElementSetNames *smallSetElementSetNames;    /* OPTIONAL */
-    Z_ElementSetNames *mediumSetElementSetNames;    /* OPTIONAL */
-    Odr_oid *preferredRecordSyntax;  /* OPTIONAL */
-    Z_Query *query;
-    Z_OtherInformation *additionalSearchInfo;       /* OPTIONAL */
-    Z_OtherInformation *otherInfo;                  /* OPTIONAL */
-} Z_SearchRequest;
-
-/* ------------------------ RECORD -------------------------- */
-
-typedef Z_External Z_DatabaseRecord;
-
-typedef struct Z_DefaultDiagFormat
-{
-    Odr_oid *diagnosticSetId; /* This is opt'l to interwork with bad targets */
-    int *condition;
-    /* until the whole character set issue becomes more definite,
-     * you can probably ignore this on input. */
-    int which;
-#define Z_DiagForm_v2AddInfo 0
-#define Z_DiagForm_v3AddInfo 1
-    char *addinfo;
-} Z_DefaultDiagFormat;
-
-typedef struct Z_DiagRec
-{
-    int which;
-#define Z_DiagRec_defaultFormat 0
-#define Z_DiagRec_externallyDefined 1
-    union
-    {
-       Z_DefaultDiagFormat *defaultFormat;
-       Z_External *externallyDefined;
-    } u;
-} Z_DiagRec;
-
-typedef struct Z_DiagRecs
-{
-    int num_diagRecs;
-    Z_DiagRec **diagRecs;
-} Z_DiagRecs;
-
-typedef struct Z_NamePlusRecord
-{
-    char *databaseName;      /* OPTIONAL */
-    int which;
-#define Z_NamePlusRecord_databaseRecord 0
-#define Z_NamePlusRecord_surrogateDiagnostic 1
-    union
-    {
-       Z_DatabaseRecord *databaseRecord;
-       Z_DiagRec *surrogateDiagnostic;
-    } u;
-} Z_NamePlusRecord;
-
-typedef struct Z_NamePlusRecordList
-{
-    int num_records;
-    Z_NamePlusRecord **records;
-} Z_NamePlusRecordList;
-
-typedef struct Z_Records
-{
-    int which;
-#define Z_Records_DBOSD 0
-#define Z_Records_NSD 1
-#define Z_Records_multipleNSD 2
-    union
-    {
-       Z_NamePlusRecordList *databaseOrSurDiagnostics;
-       Z_DiagRec *nonSurrogateDiagnostic;
-       Z_DiagRecs *multipleNonSurDiagnostics;
-    } u;
-} Z_Records;
-
-/* ------------------------ SEARCHRESPONSE ------------------ */
-
-typedef struct Z_SearchResponse
-{
-    Z_ReferenceId *referenceId;       /* OPTIONAL */
-    int *resultCount;
-    int *numberOfRecordsReturned;
-    int *nextResultSetPosition;
-    bool_t *searchStatus;
-    int *resultSetStatus;              /* OPTIONAL */
-#define Z_RES_SUBSET        1
-#define Z_RES_INTERIM       2
-#define Z_RES_NONE          3
-    int *presentStatus;                /* OPTIONAL */
-#define Z_PRES_SUCCESS      0
-#define Z_PRES_PARTIAL_1    1
-#define Z_PRES_PARTIAL_2    2
-#define Z_PRES_PARTIAL_3    3
-#define Z_PRES_PARTIAL_4    4
-#define Z_PRES_FAILURE      5
-    Z_Records *records;                  /* OPTIONAL */
-    Z_OtherInformation *additionalSearchInfo;
-    Z_OtherInformation *otherInfo;
-} Z_SearchResponse;
-
-/* ------------------------- PRESENT SERVICE -----------------*/
-
-typedef struct Z_ElementSpec
-{
-    int which;
-#define Z_ElementSpec_elementSetName 0
-#define Z_ElementSpec_externalSpec 1
-    union
-    {
-       char *elementSetName;
-       Z_External *externalSpec;
-    } u;
-} Z_ElementSpec;
-
-typedef struct Z_Specification
-{
-    Odr_oid *schema;                  /* OPTIONAL */
-    Z_ElementSpec *elementSpec;       /* OPTIONAL */
-} Z_Specification;
-
-typedef struct Z_DbSpecific
-{
-    char *databaseName;
-    Z_Specification *spec;
-} Z_DbSpecific;
-
-typedef struct Z_CompSpec
-{
-    bool_t *selectAlternativeSyntax;
-    Z_Specification *generic;            /* OPTIONAL */
-    int num_dbSpecific;
-    Z_DbSpecific **dbSpecific;           /* OPTIONAL */
-    int num_recordSyntax;
-    Odr_oid **recordSyntax;              /* OPTIONAL */
-} Z_CompSpec;
-
-typedef struct Z_RecordComposition
-{
-    int which;
-#define Z_RecordComp_simple 0
-#define Z_RecordComp_complex 1
-    union
-    {
-       Z_ElementSetNames *simple;
-       Z_CompSpec *complex;
-    } u;
-} Z_RecordComposition;
-
-typedef struct Z_Range
-{
-    int *startingPosition;
-    int *numberOfRecords;
-} Z_Range;
-
-typedef struct Z_PresentRequest
-{
-    Z_ReferenceId *referenceId;              /* OPTIONAL */
-    Z_ResultSetId *resultSetId;
-    int *resultSetStartPoint;
-    int *numberOfRecordsRequested;
-    int num_ranges;
-    Z_Range **additionalRanges;              /* OPTIONAL */
-    Z_RecordComposition *recordComposition;  /* OPTIONAL */
-    Odr_oid *preferredRecordSyntax;  /* OPTIONAL */
-    int *maxSegmentCount;                 /* OPTIONAL */
-    int *maxRecordSize;                   /* OPTIONAL */
-    int *maxSegmentSize;                  /* OPTIONAL */
-    Z_OtherInformation *otherInfo;        /* OPTIONAL */
-} Z_PresentRequest;
-
-typedef struct Z_PresentResponse
-{
-    Z_ReferenceId *referenceId;        /* OPTIONAL */
-    int *numberOfRecordsReturned;
-    int *nextResultSetPosition;
-    int *presentStatus;
-    Z_Records *records;
-    Z_OtherInformation *otherInfo;     /* OPTIONAL */
-} Z_PresentResponse;
-
-/* ------------------ RESOURCE CONTROL ----------------*/
-
-typedef struct Z_TriggerResourceControlRequest
-{
-    Z_ReferenceId *referenceId;    /* OPTIONAL */
-    int *requestedAction;
-#define Z_TriggerResourceCtrl_resourceReport  1
-#define Z_TriggerResourceCtrl_resourceControl 2
-#define Z_TriggerResourceCtrl_cancel          3
-    Odr_oid *prefResourceReportFormat;  /* OPTIONAL */
-    bool_t *resultSetWanted;            /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_TriggerResourceControlRequest;
-
-typedef struct Z_ResourceControlRequest
-{
-    Z_ReferenceId *referenceId;    /* OPTIONAL */
-    bool_t *suspendedFlag;         /* OPTIONAL */
-    Z_External *resourceReport; /* OPTIONAL */
-    int *partialResultsAvailable;  /* OPTIONAL */
-#define Z_ResourceControlRequest_subset    1
-#define Z_ResourceControlRequest_interim   2
-#define Z_ResourceControlRequest_none      3
-    bool_t *responseRequired;
-    bool_t *triggeredRequestFlag;  /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_ResourceControlRequest;
-
-typedef struct Z_ResourceControlResponse
-{
-    Z_ReferenceId *referenceId;    /* OPTIONAL */
-    bool_t *continueFlag;
-    bool_t *resultSetWanted;       /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_ResourceControlResponse;
-
-
-/* ------------------ ACCESS CTRL SERVICE ----------------*/
-
-typedef struct Z_AccessControlRequest
-{
-    Z_ReferenceId *referenceId;           /* OPTIONAL */
-    int which;
-#define Z_AccessRequest_simpleForm 0
-#define Z_AccessRequest_externallyDefined 1
-    union
-    {
-       Odr_oct *simpleForm;
-       Z_External *externallyDefined;
-    } u;
-    Z_OtherInformation *otherInfo;           /* OPTIONAL */
-} Z_AccessControlRequest;
-
-typedef struct Z_AccessControlResponse
-{
-    Z_ReferenceId *referenceId;              /* OPTIONAL */
-    int which;
-#define Z_AccessResponse_simpleForm 0
-#define Z_AccessResponse_externallyDefined 1
-    union
-    {
-       Odr_oct *simpleForm;
-       Z_External *externallyDefined;
-    } u;
-    Z_DiagRec *diagnostic;                   /* OPTIONAL */
-    Z_OtherInformation *otherInfo;           /* OPTIONAL */
-} Z_AccessControlResponse;
-
-/* ------------------------ SCAN SERVICE -------------------- */
-
-typedef struct Z_AttributeList
-{
-    int num_attributes;
-    Z_AttributeElement **attributes;
-} Z_AttributeList;
-
-typedef struct Z_AlternativeTerm
-{
-    int num_terms;
-    Z_AttributesPlusTerm **terms;
-} Z_AlternativeTerm;
-
-typedef struct Z_ByDatabase
-{
-    char *db;
-    int *num;                           /* OPTIONAL */
-    Z_OtherInformation *otherDbInfo;    /* OPTIONAL */
-} Z_ByDatabase;
-
-typedef struct Z_ByDatabaseList
-{
-    int num_elements;
-    Z_ByDatabase **elements;
-} Z_ByDatabaseList;
-
-typedef struct Z_ScanOccurrences
-{
-    int which;
-#define Z_ScanOccurrences_global         0
-#define Z_ScanOccurrences_byDatabase     1
-    union
-    {
-       int *global;
-       Z_ByDatabaseList *byDatabase;
-    } u;
-
-} Z_ScanOccurrences;
-
-typedef struct Z_OccurrenceByAttributesElem
-{
-    Z_AttributeList *attributes;
-    Z_ScanOccurrences *occurrences;         /* OPTIONAL */
-    Z_OtherInformation *otherOccurInfo;      /* OPTIONAL */
-} Z_OccurrenceByAttributesElem;
-
-typedef struct Z_OccurrenceByAttributes
-{
-    int num_elements;
-    Z_OccurrenceByAttributesElem **elements;
-} Z_OccurrenceByAttributes;
-
-typedef struct Z_TermInfo
-{
-    Z_Term *term;
-    char *displayTerm;                     /* OPTIONAL */
-    Z_AttributeList *suggestedAttributes;  /* OPTIONAL */
-    Z_AlternativeTerm *alternativeTerm;    /* OPTIONAL */
-    int *globalOccurrences;                /* OPTIONAL */
-    Z_OccurrenceByAttributes *byAttributes; /* OPTIONAL */
-    Z_OtherInformation *otherTermInfo;      /* OPTIONAL */
-} Z_TermInfo;
-
-typedef struct Z_Entry
-{
-    int which;
-#define Z_Entry_termInfo 0
-#define Z_Entry_surrogateDiagnostic 1
-    union
-    {
-       Z_TermInfo *termInfo;
-       Z_DiagRec *surrogateDiagnostic;
-    } u;
-} Z_Entry;
-
-#ifdef BUGGY_LISTENTRIES
-
-typedef struct Z_Entries
-{
-    int num_entries;
-    Z_Entry **entries;
-} Z_Entries;
-
-typedef struct Z_ListEntries
-{
-    int which;
-#define Z_ListEntries_entries 0
-#define Z_ListEntries_nonSurrogateDiagnostics 1
-    union
-    {
-       Z_Entries *entries;
-       Z_DiagRecs *nonSurrogateDiagnostics;
-    } u;
-} Z_ListEntries;
-
-#endif
-
-typedef struct Z_ListEntries {
-       int num_entries;
-       Z_Entry **entries; /* OPT */
-       int num_nonsurrogateDiagnostics;
-       Z_DiagRec **nonsurrogateDiagnostics; /* OPT */
-} Z_ListEntries;
-
-typedef struct Z_ScanRequest
-{
-    Z_ReferenceId *referenceId;       /* OPTIONAL */
-    int num_databaseNames;
-    char **databaseNames;
-    Odr_oid *attributeSet;          /* OPTIONAL */
-    Z_AttributesPlusTerm *termListAndStartPoint;
-    int *stepSize;                    /* OPTIONAL */
-    int *numberOfTermsRequested;
-    int *preferredPositionInResponse;   /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_ScanRequest;
-
-typedef struct Z_ScanResponse
-{
-    Z_ReferenceId *referenceId;       /* OPTIONAL */
-    int *stepSize;                    /* OPTIONAL */
-    int *scanStatus;
-#define Z_Scan_success      0
-#define Z_Scan_partial_1    1
-#define Z_Scan_partial_2    2
-#define Z_Scan_partial_3    3
-#define Z_Scan_partial_4    4
-#define Z_Scan_partial_5    5
-#define Z_Scan_failure      6
-    int *numberOfEntriesReturned;
-    int *positionOfTerm;              /* OPTIONAL */
-    Z_ListEntries *entries;           /* OPTIONAL */
-    Odr_oid *attributeSet;            /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_ScanResponse; 
-
-
-/* ------------------------ DELETE -------------------------- */
-
-#define Z_DeleteStatus_success                          0
-#define Z_DeleteStatus_resultSetDidNotExist             1
-#define Z_DeleteStatus_previouslyDeletedByTarget        2
-#define Z_DeleteStatus_systemProblemAtTarget            3
-#define Z_DeleteStatus_accessNotAllowed                 4
-#define Z_DeleteStatus_resourceControlAtOrigin          5
-#define Z_DeleteStatus_resourceControlAtTarget          6
-#define Z_DeleteStatus_bulkDeleteNotSupported           7
-#define Z_DeleteStatus_notAllRsltSetsDeletedOnBulkDlte  8
-#define Z_DeleteStatus_notAllRequestedResultSetsDeleted 9
-#define Z_DeleteStatus_resultSetInUse                  10
-
-typedef struct Z_ListStatus
-{
-    Z_ResultSetId *id;
-    int *status;
-} Z_ListStatus;
-
-typedef struct Z_DeleteResultSetRequest
-{
-    Z_ReferenceId *referenceId;        /* OPTIONAL */
-    int *deleteFunction;
-#define Z_DeleteRequest_list    0
-#define Z_DeleteRequest_all     1
-    int num_resultSetList;
-    Z_ResultSetId **resultSetList;      /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_DeleteResultSetRequest;
-
-typedef struct Z_ListStatuses {
-    int num;
-    Z_ListStatus **elements;
-} Z_ListStatuses;
-
-typedef struct Z_DeleteResultSetResponse
-{
-    Z_ReferenceId *referenceId;        /* OPTIONAL */
-    int *deleteOperationStatus;
-    Z_ListStatuses *deleteListStatuses;/* OPTIONAL */
-    int *numberNotDeleted;             /* OPTIONAL */
-    Z_ListStatuses *bulkStatuses;      /* OPTIONAL */
-    char *deleteMessage;               /* OPTIONAL */
-    Z_OtherInformation *otherInfo;
-} Z_DeleteResultSetResponse;
-
-/* ------------------------ CLOSE SERVICE ------------------- */
-
-typedef struct Z_Close
-{
-    Z_ReferenceId *referenceId;         /* OPTIONAL */
-    int *closeReason;
-#define Z_Close_finished           0
-#define Z_Close_shutdown           1
-#define Z_Close_systemProblem      2
-#define Z_Close_costLimit          3
-#define Z_Close_resources          4
-#define Z_Close_securityViolation  5
-#define Z_Close_protocolError      6
-#define Z_Close_lackOfActivity     7
-#define Z_Close_peerAbort          8
-#define Z_Close_unspecified        9
-    char *diagnosticInformation;          /* OPTIONAL */
-    Odr_oid *resourceReportFormat;        /* OPTIONAL */
-    Z_External *resourceReport;         /* OPTIONAL */
-    Z_OtherInformation *otherInfo;        /* OPTIONAL */
-} Z_Close;
-
-/* ------------------------ SEGMENTATION -------------------- */
-
-typedef struct Z_Segment
-{
-    Z_ReferenceId *referenceId;   /* OPTIONAL */
-    int *numberOfRecordsReturned;
-    int num_segmentRecords;
-    Z_NamePlusRecord **segmentRecords;
-    Z_OtherInformation *otherInfo;  /* OPTIONAL */
-} Z_Segment;
-
-/* ----------------------- Extended Services ---------------- */
-
-typedef struct Z_Permissions
-{
-    char *userId;                         
-    int num_allowableFunctions;
-    int **allowableFunctions;             
-#define Z_Permissions_delete              1
-#define Z_Permissions_modifyContents      2
-#define Z_Permissions_modifyPermissions   3
-#define Z_Permissions_present             4
-#define Z_Permissions_invoke              5
-} Z_Permissions;
-
-typedef struct Z_ExtendedServicesRequest
-{
-    Z_ReferenceId *referenceId;             /* OPTIONAL */
-    int *function;                        
-#define Z_ExtendedServicesRequest_create              1
-#define Z_ExtendedServicesRequest_delete              2
-#define Z_ExtendedServicesRequest_modify              3
-    Odr_oid *packageType;                 
-    char *packageName;                      /* OPTIONAL */
-    char *userId;                           /* OPTIONAL */
-    Z_IntUnit *retentionTime;               /* OPTIONAL */
-    Z_Permissions *permissions;             /* OPTIONAL */
-    char *description;                      /* OPTIONAL */
-    Z_External *taskSpecificParameters;     /* OPTIONAL */
-    int *waitAction;                      
-#define Z_ExtendedServicesRequest_wait                1
-#define Z_ExtendedServicesRequest_waitIfPossible      2
-#define Z_ExtendedServicesRequest_dontWait            3
-#define Z_ExtendedServicesRequest_dontReturnPackage   4
-    char *elements;             /* OPTIONAL */
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_ExtendedServicesRequest;
-
-typedef struct Z_ExtendedServicesResponse
-{
-    Z_ReferenceId *referenceId;             /* OPTIONAL */
-    int *operationStatus;                 
-#define Z_ExtendedServicesResponse_done                1
-#define Z_ExtendedServicesResponse_accepted            2
-#define Z_ExtendedServicesResponse_failure             3
-    int num_diagnostics;
-    Z_DiagRec **diagnostics;                /* OPTIONAL */
-    Z_External *taskPackage;                /* OPTIONAL */
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_ExtendedServicesResponse;
-
-/* ------------------------ Sort --------------------------- */
-
-typedef struct Z_SortAttributes
-{
-    Odr_oid *id;
-    Z_AttributeList *list;
-} Z_SortAttributes;
-
-typedef struct Z_SortKey
-{
-    int which;
-#define Z_SortKey_sortField             0
-#define Z_SortKey_elementSpec           1
-#define Z_SortKey_sortAttributes        2
-    union
-    {
-       char *sortField;
-       Z_Specification *elementSpec;
-       Z_SortAttributes *sortAttributes;
-    } u;
-} Z_SortKey;
-
-typedef struct Z_SortDbSpecific
-{
-    char *databaseName;
-    Z_SortKey *dbSort;
-} Z_SortDbSpecific;
-
-typedef struct Z_SortDbSpecificList
-{
-    int num_dbSpecific;
-    Z_SortDbSpecific **dbSpecific;
-} Z_SortDbSpecificList;
-
-typedef struct Z_SortElement
-{
-    int which;
-#define Z_SortElement_generic               0
-#define Z_SortElement_databaseSpecific      1
-    union
-    {
-       Z_SortKey *generic;
-       Z_SortDbSpecificList *databaseSpecific;
-    } u;
-} Z_SortElement;
-
-typedef struct Z_SortMissingValueAction
-{
-    int which;
-#define Z_SortMissingValAct_abort           0
-#define Z_SortMissingValAct_null            1
-#define Z_SortMissingValAct_valData         2
-    union
-    {
-       Odr_null *abort;
-       Odr_null *null;
-       Odr_oct *valData;
-    } u;
-} Z_SortMissingValueAction;
-
-typedef struct Z_SortKeySpec
-{
-    Z_SortElement *sortElement;
-    int *sortRelation;
-#define Z_SortRelation_ascending            0
-#define Z_SortRelation_descending           1
-#define Z_SortRelation_ascendingByFreq      3
-#define Z_SortRelation_descendingByFreq     4
-    int *caseSensitivity;
-#define Z_SortCase_caseSensitive            0
-#define Z_SortCase_caseInsensitive          1
-    Z_SortMissingValueAction *missingValueAction;  /* OPTIONAL */
-} Z_SortKeySpec;
-
-typedef struct Z_SortResponse
-{
-    Z_ReferenceId *referenceId;             /* OPTIONAL */
-    int *sortStatus;
-#define Z_SortStatus_success              0
-#define Z_SortStatus_partial_1            1
-#define Z_SortStatus_failure              2
-    int *resultSetStatus;                   /* OPTIONAL */
-#define Z_SortResultSetStatus_empty       1
-#define Z_SortResultSetStatus_interim     2
-#define Z_SortResultSetStatus_unchanged   3
-#define Z_SortResultSetStatus_none        4
-    Z_DiagRecs *diagnostics;                /* OPTIONAL */
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_SortResponse;
-
-typedef struct Z_SortKeySpecList
-{
-    int num_specs;
-    Z_SortKeySpec **specs;
-} Z_SortKeySpecList;
-
-typedef struct Z_SortRequest
-{
-    Z_ReferenceId *referenceId;             /* OPTIONAL */
-    Z_StringList *inputResultSetNames;
-    char *sortedResultSetName;
-    Z_SortKeySpecList *sortSequence;
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_SortRequest;
-
-/* ----------------------- Resource Report ------------------ */
-
-typedef struct Z_ResourceReportRequest
-{
-    Z_ReferenceId *referenceId;             /* OPTIONAL */
-    Z_ReferenceId *opId;                    /* OPTIONAL */
-    Odr_oid *prefResourceReportFormat;      /* OPTIONAL */
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_ResourceReportRequest;
-
-typedef struct Z_ResourceReportResponse
-{
-    Z_ReferenceId *referenceId;             /* OPTIONAL */
-    int *resourceReportStatus;
-#define Z_ResourceReportStatus_success   0
-#define Z_ResourceReportStatus_partial   1
-#define Z_ResourceReportStatus_failure_1 2
-#define Z_ResourceReportStatus_failure_2 3
-#define Z_ResourceReportStatus_failure_3 4
-#define Z_ResourceReportStatus_failure_4 5
-#define Z_ResourceReportStatus_failure_5 6
-#define Z_ResourceReportStatus_failure_6 7
-    Z_External *resourceReport;             /* OPTIONAL */
-    Z_OtherInformation *otherInfo;          /* OPTIONAL */
-} Z_ResourceReportResponse;
-
-/* ------------------------ APDU ---------------------------- */
-
-typedef struct Z_APDU
-{    
-    int which;
-#define Z_APDU_initRequest 0
-#define Z_APDU_initResponse 1
-#define Z_APDU_searchRequest 2
-#define Z_APDU_searchResponse 3
-#define Z_APDU_presentRequest 4
-#define Z_APDU_presentResponse 5
-#define Z_APDU_deleteResultSetRequest 6
-#define Z_APDU_deleteResultSetResponse 7
-#define Z_APDU_resourceControlRequest 8
-#define Z_APDU_resourceControlResponse 9
-#define Z_APDU_triggerResourceControlRequest 10
-#define Z_APDU_scanRequest 11
-#define Z_APDU_scanResponse 12
-#define Z_APDU_segmentRequest 13
-#define Z_APDU_extendedServicesRequest 14
-#define Z_APDU_extendedServicesResponse 15
-#define Z_APDU_close 16
-#define Z_APDU_accessControlRequest 17
-#define Z_APDU_accessControlResponse 18
-#define Z_APDU_sortRequest 20
-#define Z_APDU_sortResponse 21
-#define Z_APDU_resourceReportRequest 22
-#define Z_APDU_resourceReportResponse 23
-    union
-    {
-       Z_InitRequest  *initRequest;
-       Z_InitResponse *initResponse;
-       Z_SearchRequest *searchRequest;
-       Z_SearchResponse *searchResponse;
-       Z_PresentRequest *presentRequest;
-       Z_PresentResponse *presentResponse;
-       Z_DeleteResultSetRequest *deleteResultSetRequest;
-       Z_DeleteResultSetResponse *deleteResultSetResponse;
-       Z_AccessControlRequest *accessControlRequest;
-       Z_AccessControlResponse *accessControlResponse;
-       Z_ResourceControlRequest *resourceControlRequest;
-       Z_ResourceControlResponse *resourceControlResponse;
-       Z_TriggerResourceControlRequest *triggerResourceControlRequest;
-       Z_ResourceReportRequest *resourceReportRequest;
-       Z_ResourceReportResponse *resourceReportResponse;
-       Z_ScanRequest *scanRequest;
-       Z_ScanResponse *scanResponse;
-       Z_SortRequest *sortRequest;
-       Z_SortResponse *sortResponse;
-       Z_Segment *segmentRequest;
-       Z_ExtendedServicesRequest *extendedServicesRequest;
-       Z_ExtendedServicesResponse *extendedServicesResponse;
-       Z_Close *close;
-    } u;
-} Z_APDU;
-
-#define z_APDU z_APDU_old
-
-YAZ_EXPORT int z_APDU(ODR o, Z_APDU **p, int opt, const char *name);
-YAZ_EXPORT int z_SUTRS(ODR o, Odr_oct **p, int opt, const char *name);
-
-YAZ_EXPORT Z_InitRequest *zget_InitRequest(ODR o);
-YAZ_EXPORT Z_InitResponse *zget_InitResponse(ODR o);
-YAZ_EXPORT Z_SearchRequest *zget_SearchRequest(ODR o);
-YAZ_EXPORT Z_SearchResponse *zget_SearchResponse(ODR o);
-YAZ_EXPORT Z_PresentRequest *zget_PresentRequest(ODR o);
-YAZ_EXPORT Z_PresentResponse *zget_PresentResponse(ODR o);
-YAZ_EXPORT Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o);
-YAZ_EXPORT Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o);
-YAZ_EXPORT Z_ScanRequest *zget_ScanRequest(ODR o);
-YAZ_EXPORT Z_ScanResponse *zget_ScanResponse(ODR o);
-YAZ_EXPORT Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o);
-YAZ_EXPORT Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
-YAZ_EXPORT Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
-YAZ_EXPORT Z_Close *zget_Close(ODR o);
-YAZ_EXPORT int z_StringList(ODR o, Z_StringList **p, int opt,
-                           const char *name);
-YAZ_EXPORT int z_InternationalString(ODR o, char **p, int opt,
-                                    const char *name);
-YAZ_EXPORT int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt,
-                                 const char *naem);
-YAZ_EXPORT int z_ElementSetName(ODR o, char **p, int opt, const char *name);
-YAZ_EXPORT int z_IntUnit(ODR o, Z_IntUnit **p, int opt, const char *name);
-YAZ_EXPORT int z_Unit(ODR o, Z_Unit **p, int opt, const char *name);
-YAZ_EXPORT int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt,
-                             const char *name);
-YAZ_EXPORT int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt,
-                                const char *name);
-YAZ_EXPORT int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p,
-                                     int opt, const char *name);
-YAZ_EXPORT int z_Term(ODR o, Z_Term **p, int opt, const char *name);
-YAZ_EXPORT int z_Specification(ODR o, Z_Specification **p, int opt,
-                              const char *name);
-YAZ_EXPORT int z_Permissions(ODR o, Z_Permissions **p, int opt,
-                            const char *name);
-YAZ_EXPORT int z_DiagRec(ODR o, Z_DiagRec **p, int opt, const char *name);
-YAZ_EXPORT int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt, const char *name);
-YAZ_EXPORT int z_AttributeList(ODR o, Z_AttributeList **p, int opt,
-                              const char *name);
-YAZ_EXPORT int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt,
-                                  const char *name);
-YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which);
-YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt, const char *name);
-
-YAZ_END_CDECL
-
-#include <yaz/prt-rsc.h>
-#include <yaz/prt-acc.h>
-#include <yaz/prt-exp.h>
-#include <yaz/prt-grs.h>
-#include <yaz/prt-arc.h>
-#include <yaz/prt-exd.h>
-#include <yaz/prt-dia.h>
-#include <yaz/prt-esp.h>
-#include <yaz/prt-add.h>
-
-#include <yaz/prt-dat.h>
-#include <yaz/prt-univ.h>
-#include <yaz/prt-ext.h>
-
-#endif
diff --git a/include/yaz/prt-rsc.h b/include/yaz/prt-rsc.h
deleted file mode 100644 (file)
index 3018388..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1995, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The name of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- * $Log: prt-rsc.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.7  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.6  1997/05/14 06:53:50  adam
- * C++ support.
- *
- * Revision 1.5  1995/09/29 17:12:11  quinn
- * Smallish
- *
- * Revision 1.4  1995/09/27  15:02:52  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.3  1995/08/17  12:45:17  quinn
- * Fixed minor problems with GRS-1. Added support in c&s.
- *
- * Revision 1.2  1995/06/02  09:49:50  quinn
- * Add access control
- *
- * Revision 1.1  1995/06/01  11:24:52  quinn
- * Resource Control
- *
- *
- */
-
-#ifndef PRT_RSC_H
-#define PRT_RSC_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* -------------------- Resource-1 -------------------- */
-
-#define Z_EstimateType_currentSearchRecords           1
-#define Z_EstimateType_finalSearchRecords             2
-#define Z_EstimateType_currentPresentRecords          3
-#define Z_EstimateType_finalPresentRecords            4
-#define Z_EstimateType_currentOpTimeProcessing        5
-#define Z_EstimateType_finalOpTimeProcessing          6
-#define Z_EstimateType_currentAssocTime               7
-#define Z_EstimateType_currentOperationCost           8
-#define Z_EstimateType_finalOperationCost             9
-#define Z_EstimateType_currentAssocCost              10
-#define Z_EstimateType_finalOpTimeElapsed            11
-#define Z_EstimateType_percentComplete               12
-#define Z_EstimateType_currentSearchAssCost          13
-#define Z_EstimateType_currentPresentAssCost         14
-#define Z_EstimateType_currentConnectAssCost         15
-#define Z_EstimateType_currentOtherAssCost           16
-
-typedef struct Z_Estimate1
-{
-    int *type;
-    int *value;
-    int *currencyCode;             /* OPTIONAL */
-} Z_Estimate1;
-
-typedef struct Z_ResourceReport1
-{
-    int num_estimates;
-    Z_Estimate1 **estimates;
-    char *message;
-} Z_ResourceReport1;
-
-int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt, const char *name);
-
-/* -------------------- Resource-2 -------------------- */
-
-typedef struct Z_Estimate2
-{
-    Z_StringOrNumeric *type;      /* same as in estimate1, if numeric */
-    Z_IntUnit *value;
-} Z_Estimate2;
-
-typedef struct Z_ResourceReport2
-{
-    int num_estimates;
-    Z_Estimate2 **estimates;             /* OPTIONAL */
-    char *message;                       /* OPTIONAL */
-} Z_ResourceReport2;
-
-int z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt, const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/prt-univ.h b/include/yaz/prt-univ.h
deleted file mode 100644 (file)
index d431f50..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1998
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-
-#ifndef PRT_UNIV_H
-#define PRT_UNIV_H
-
-#include <yaz/yconfig.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* YC 0.1: Fri Mar 20 14:28:54 CET 1998 */
-/* Module-H ResourceReport-Format-Universe-1 */
-
-typedef struct Z_UniverseReportHits Z_UniverseReportHits;
-int z_UniverseReportHits (ODR o, Z_UniverseReportHits **p, int opt,
-                         const char *name);
-
-typedef struct Z_UniverseReportDuplicate Z_UniverseReportDuplicate;
-int z_UniverseReportDuplicate (ODR o, Z_UniverseReportDuplicate **p, int opt,
-                              const char *name);
-
-typedef struct Z_UniverseReport Z_UniverseReport;
-int z_UniverseReport (ODR o, Z_UniverseReport **p, int opt,
-                     const char *name);
-
-struct Z_UniverseReportHits {
-       Z_StringOrNumeric *database;
-       Z_StringOrNumeric *hits;
-};
-
-struct Z_UniverseReportDuplicate {
-       Z_StringOrNumeric *hitno;
-};
-
-struct Z_UniverseReport {
-       int *totalHits;
-       int which;
-       union {
-               Z_UniverseReportHits *databaseHits;
-               Z_UniverseReportDuplicate *duplicate;
-#define Z_UniverseReport_databaseHits 1
-#define Z_UniverseReport_duplicate 2
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/z-accdes1.h b/include/yaz/z-accdes1.h
deleted file mode 100644 (file)
index bd82431..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H AccessControlFormat-des-1 */
-
-#ifndef z_accdes1_H
-#define z_accdes1_H
-
-#include <yaz/odr.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_DES_RN_Object Z_DES_RN_Object;
-YAZ_EXPORT int z_DES_RN_Object (ODR o, Z_DES_RN_Object **p, int opt, const char *name);
-
-typedef struct Z_DRNType Z_DRNType;
-YAZ_EXPORT int z_DRNType (ODR o, Z_DRNType **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_DES_RN_Object {
-       int which;
-       union {
-               Z_DRNType *challenge;
-               Z_DRNType *response;
-#define Z_DES_RN_Object_challenge 1
-#define Z_DES_RN_Object_response 2
-       } u;
-};
-
-struct Z_DRNType {
-       Odr_oct *userId; /* OPT */
-       Odr_oct *salt; /* OPT */
-       Odr_oct *randomNumber;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-accform1.h b/include/yaz/z-accform1.h
deleted file mode 100644 (file)
index 2367e9c..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H AccessControlFormat-prompt-1 */
-
-#ifndef z_accform1_H
-#define z_accform1_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_PromptObject1 Z_PromptObject1;
-YAZ_EXPORT int z_PromptObject1 (ODR o, Z_PromptObject1 **p, int opt, const char *name);
-
-typedef struct Z_ChallengeUnit1 Z_ChallengeUnit1;
-YAZ_EXPORT int z_ChallengeUnit1 (ODR o, Z_ChallengeUnit1 **p, int opt, const char *name);
-
-typedef struct Z_Challenge1 Z_Challenge1;
-YAZ_EXPORT int z_Challenge1 (ODR o, Z_Challenge1 **p, int opt, const char *name);
-
-typedef struct Z_ResponseUnit1 Z_ResponseUnit1;
-YAZ_EXPORT int z_ResponseUnit1 (ODR o, Z_ResponseUnit1 **p, int opt, const char *name);
-
-typedef struct Z_Response1 Z_Response1;
-YAZ_EXPORT int z_Response1 (ODR o, Z_Response1 **p, int opt, const char *name);
-
-typedef struct Z_PromptIdEnumeratedPrompt Z_PromptIdEnumeratedPrompt;
-YAZ_EXPORT int z_PromptIdEnumeratedPrompt (ODR o, Z_PromptIdEnumeratedPrompt **p, int opt, const char *name);
-
-typedef struct Z_PromptId Z_PromptId;
-YAZ_EXPORT int z_PromptId (ODR o, Z_PromptId **p, int opt, const char *name);
-
-typedef struct Z_Encryption Z_Encryption;
-YAZ_EXPORT int z_Encryption (ODR o, Z_Encryption **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_PromptObject1 {
-       int which;
-       union {
-               Z_Challenge1 *challenge;
-               Z_Response1 *response;
-#define Z_PromptObject1_challenge 1
-#define Z_PromptObject1_response 2
-       } u;
-};
-
-struct Z_ChallengeUnit1 {
-       Z_PromptId *promptId;
-       Z_InternationalString *defaultResponse; /* OPT */
-       int which;
-       union {
-               Z_InternationalString *character;
-               Z_Encryption *encrypted;
-#define Z_ChallengeUnit1_character 1
-#define Z_ChallengeUnit1_encrypted 2
-       } u; /* OPT */
-       Z_InternationalString *regExpr; /* OPT */
-       Odr_null *responseRequired; /* OPT */
-       int num_allowedValues;
-       Z_InternationalString **allowedValues; /* OPT */
-       Odr_null *shouldSave; /* OPT */
-#define Z_ChallengeUnit1_integer 1
-#define Z_ChallengeUnit1_date 2
-#define Z_ChallengeUnit1_float 3
-#define Z_ChallengeUnit1_alphaNumeric 4
-#define Z_ChallengeUnit1_url_urn 5
-#define Z_ChallengeUnit1_boolean 6
-       int *dataType; /* OPT */
-       Z_External *diagnostic; /* OPT */
-};
-
-struct Z_Challenge1 {
-       int num;
-       Z_ChallengeUnit1 **elements;
-};
-
-struct Z_ResponseUnit1 {
-       Z_PromptId *promptId;
-       int which;
-       union {
-               Z_InternationalString *string;
-               bool_t *accept;
-               Odr_null *acknowledge;
-               Z_DiagRec *diagnostic;
-               Z_Encryption *encrypted;
-#define Z_ResponseUnit1_string 1
-#define Z_ResponseUnit1_accept 2
-#define Z_ResponseUnit1_acknowledge 3
-#define Z_ResponseUnit1_diagnostic 4
-#define Z_ResponseUnit1_encrypted 5
-       } u;
-};
-
-struct Z_Response1 {
-       int num;
-       Z_ResponseUnit1 **elements;
-};
-
-struct Z_PromptIdEnumeratedPrompt {
-#define Z_PromptIdEnumeratedPrompt_groupId 0
-#define Z_PromptIdEnumeratedPrompt_userId 1
-#define Z_PromptIdEnumeratedPrompt_password 2
-#define Z_PromptIdEnumeratedPrompt_newPassword 3
-#define Z_PromptIdEnumeratedPrompt_copyright 4
-#define Z_PromptIdEnumeratedPrompt_sessionId 5
-       int *type;
-       Z_InternationalString *suggestedString; /* OPT */
-};
-
-struct Z_PromptId {
-       int which;
-       union {
-               Z_PromptIdEnumeratedPrompt *enumeratedPrompt;
-               Z_InternationalString *nonEnumeratedPrompt;
-#define Z_PromptId_enumeratedPrompt 1
-#define Z_PromptId_nonEnumeratedPrompt 2
-       } u;
-};
-
-struct Z_Encryption {
-       Odr_oct *cryptType; /* OPT */
-       Odr_oct *credential; /* OPT */
-       Odr_oct *data;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-acckrb1.h b/include/yaz/z-acckrb1.h
deleted file mode 100644 (file)
index cef0a29..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H AccessControlFormat-krb-1 */
-
-#ifndef z_acckrb1_H
-#define z_acckrb1_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_KRBObject Z_KRBObject;
-YAZ_EXPORT int z_KRBObject (ODR o, Z_KRBObject **p, int opt, const char *name);
-
-typedef struct Z_KRBRequest Z_KRBRequest;
-YAZ_EXPORT int z_KRBRequest (ODR o, Z_KRBRequest **p, int opt, const char *name);
-
-typedef struct Z_KRBResponse Z_KRBResponse;
-YAZ_EXPORT int z_KRBResponse (ODR o, Z_KRBResponse **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_KRBObject {
-       int which;
-       union {
-               Z_KRBRequest *challenge;
-               Z_KRBResponse *response;
-#define Z_KRBObject_challenge 1
-#define Z_KRBObject_response 2
-       } u;
-};
-
-struct Z_KRBRequest {
-       Z_InternationalString *service;
-       Z_InternationalString *instance; /* OPT */
-       Z_InternationalString *realm; /* OPT */
-};
-
-struct Z_KRBResponse {
-       Z_InternationalString *userid; /* OPT */
-       Odr_oct *ticket;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-core.h b/include/yaz/z-core.h
deleted file mode 100644 (file)
index dcbf273..0000000
+++ /dev/null
@@ -1,1220 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H Z39-50-APDU-1995 */
-
-#ifndef z_core_H
-#define z_core_H
-
-#include <yaz/odr.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_External Z_External;
-YAZ_EXPORT int z_External(ODR o, Z_External **p, int opt, const char *name);
-
-
-typedef struct Z_APDU Z_APDU;
-YAZ_EXPORT int z_APDU (ODR o, Z_APDU **p, int opt, const char *name);
-
-typedef struct Z_InitRequest Z_InitRequest;
-YAZ_EXPORT int z_InitRequest (ODR o, Z_InitRequest **p, int opt, const char *name);
-
-typedef struct Z_IdPass Z_IdPass;
-YAZ_EXPORT int z_IdPass (ODR o, Z_IdPass **p, int opt, const char *name);
-
-typedef struct Z_IdAuthentication Z_IdAuthentication;
-YAZ_EXPORT int z_IdAuthentication (ODR o, Z_IdAuthentication **p, int opt, const char *name);
-
-typedef struct Z_InitResponse Z_InitResponse;
-YAZ_EXPORT int z_InitResponse (ODR o, Z_InitResponse **p, int opt, const char *name);
-
-typedef Odr_bitmask  Z_ProtocolVersion;
-YAZ_EXPORT int z_ProtocolVersion (ODR o, Z_ProtocolVersion **p, int opt, const char *name);
-
-typedef Odr_bitmask  Z_Options;
-YAZ_EXPORT int z_Options (ODR o, Z_Options **p, int opt, const char *name);
-
-typedef struct Z_SearchRequest Z_SearchRequest;
-YAZ_EXPORT int z_SearchRequest (ODR o, Z_SearchRequest **p, int opt, const char *name);
-
-typedef struct Z_Query Z_Query;
-YAZ_EXPORT int z_Query (ODR o, Z_Query **p, int opt, const char *name);
-
-typedef struct Z_RPNQuery Z_RPNQuery;
-YAZ_EXPORT int z_RPNQuery (ODR o, Z_RPNQuery **p, int opt, const char *name);
-
-typedef struct Z_Complex Z_Complex;
-YAZ_EXPORT int z_Complex (ODR o, Z_Complex **p, int opt, const char *name);
-
-typedef struct Z_RPNStructure Z_RPNStructure;
-YAZ_EXPORT int z_RPNStructure (ODR o, Z_RPNStructure **p, int opt, const char *name);
-
-typedef struct Z_Operand Z_Operand;
-YAZ_EXPORT int z_Operand (ODR o, Z_Operand **p, int opt, const char *name);
-
-typedef struct Z_AttributesPlusTerm Z_AttributesPlusTerm;
-YAZ_EXPORT int z_AttributesPlusTerm (ODR o, Z_AttributesPlusTerm **p, int opt, const char *name);
-
-typedef struct Z_ResultSetPlusAttributes Z_ResultSetPlusAttributes;
-YAZ_EXPORT int z_ResultSetPlusAttributes (ODR o, Z_ResultSetPlusAttributes **p, int opt, const char *name);
-
-typedef struct Z_AttributeList Z_AttributeList;
-YAZ_EXPORT int z_AttributeList (ODR o, Z_AttributeList **p, int opt, const char *name);
-
-typedef struct Z_Term Z_Term;
-YAZ_EXPORT int z_Term (ODR o, Z_Term **p, int opt, const char *name);
-
-typedef struct Z_Operator Z_Operator;
-YAZ_EXPORT int z_Operator (ODR o, Z_Operator **p, int opt, const char *name);
-
-typedef struct Z_ComplexAttribute Z_ComplexAttribute;
-YAZ_EXPORT int z_ComplexAttribute (ODR o, Z_ComplexAttribute **p, int opt, const char *name);
-
-typedef struct Z_AttributeElement Z_AttributeElement;
-YAZ_EXPORT int z_AttributeElement (ODR o, Z_AttributeElement **p, int opt, const char *name);
-
-typedef struct Z_ProximityOperator Z_ProximityOperator;
-YAZ_EXPORT int z_ProximityOperator (ODR o, Z_ProximityOperator **p, int opt, const char *name);
-
-typedef int  Z_ProxUnit;
-YAZ_EXPORT int z_ProxUnit (ODR o, Z_ProxUnit **p, int opt, const char *name);
-
-typedef struct Z_SearchResponse Z_SearchResponse;
-YAZ_EXPORT int z_SearchResponse (ODR o, Z_SearchResponse **p, int opt, const char *name);
-
-typedef struct Z_RecordComposition Z_RecordComposition;
-YAZ_EXPORT int z_RecordComposition (ODR o, Z_RecordComposition **p, int opt, const char *name);
-
-typedef struct Z_PresentRequest Z_PresentRequest;
-YAZ_EXPORT int z_PresentRequest (ODR o, Z_PresentRequest **p, int opt, const char *name);
-
-typedef struct Z_Segment Z_Segment;
-YAZ_EXPORT int z_Segment (ODR o, Z_Segment **p, int opt, const char *name);
-
-typedef struct Z_PresentResponse Z_PresentResponse;
-YAZ_EXPORT int z_PresentResponse (ODR o, Z_PresentResponse **p, int opt, const char *name);
-
-typedef struct Z_NamePlusRecordList Z_NamePlusRecordList;
-YAZ_EXPORT int z_NamePlusRecordList (ODR o, Z_NamePlusRecordList **p, int opt, const char *name);
-
-typedef struct Z_DiagRecs Z_DiagRecs;
-YAZ_EXPORT int z_DiagRecs (ODR o, Z_DiagRecs **p, int opt, const char *name);
-
-typedef struct Z_Records Z_Records;
-YAZ_EXPORT int z_Records (ODR o, Z_Records **p, int opt, const char *name);
-
-typedef struct Z_NamePlusRecord Z_NamePlusRecord;
-YAZ_EXPORT int z_NamePlusRecord (ODR o, Z_NamePlusRecord **p, int opt, const char *name);
-
-typedef struct Z_FragmentSyntax Z_FragmentSyntax;
-YAZ_EXPORT int z_FragmentSyntax (ODR o, Z_FragmentSyntax **p, int opt, const char *name);
-
-typedef struct Z_DiagRec Z_DiagRec;
-YAZ_EXPORT int z_DiagRec (ODR o, Z_DiagRec **p, int opt, const char *name);
-
-typedef struct Z_DefaultDiagFormat Z_DefaultDiagFormat;
-YAZ_EXPORT int z_DefaultDiagFormat (ODR o, Z_DefaultDiagFormat **p, int opt, const char *name);
-
-typedef struct Z_Range Z_Range;
-YAZ_EXPORT int z_Range (ODR o, Z_Range **p, int opt, const char *name);
-
-typedef struct Z_DatabaseSpecificUnit Z_DatabaseSpecificUnit;
-YAZ_EXPORT int z_DatabaseSpecificUnit (ODR o, Z_DatabaseSpecificUnit **p, int opt, const char *name);
-
-typedef struct Z_DatabaseSpecific Z_DatabaseSpecific;
-YAZ_EXPORT int z_DatabaseSpecific (ODR o, Z_DatabaseSpecific **p, int opt, const char *name);
-
-typedef struct Z_ElementSetNames Z_ElementSetNames;
-YAZ_EXPORT int z_ElementSetNames (ODR o, Z_ElementSetNames **p, int opt, const char *name);
-
-typedef int  Z_PresentStatus;
-YAZ_EXPORT int z_PresentStatus (ODR o, Z_PresentStatus **p, int opt, const char *name);
-
-typedef struct Z_DbSpecific Z_DbSpecific;
-YAZ_EXPORT int z_DbSpecific (ODR o, Z_DbSpecific **p, int opt, const char *name);
-
-typedef struct Z_CompSpec Z_CompSpec;
-YAZ_EXPORT int z_CompSpec (ODR o, Z_CompSpec **p, int opt, const char *name);
-
-typedef struct Z_ElementSpec Z_ElementSpec;
-YAZ_EXPORT int z_ElementSpec (ODR o, Z_ElementSpec **p, int opt, const char *name);
-
-typedef struct Z_Specification Z_Specification;
-YAZ_EXPORT int z_Specification (ODR o, Z_Specification **p, int opt, const char *name);
-
-typedef struct Z_DeleteResultSetRequest Z_DeleteResultSetRequest;
-YAZ_EXPORT int z_DeleteResultSetRequest (ODR o, Z_DeleteResultSetRequest **p, int opt, const char *name);
-
-typedef struct Z_DeleteResultSetResponse Z_DeleteResultSetResponse;
-YAZ_EXPORT int z_DeleteResultSetResponse (ODR o, Z_DeleteResultSetResponse **p, int opt, const char *name);
-
-typedef struct Z_ListStatus Z_ListStatus;
-YAZ_EXPORT int z_ListStatus (ODR o, Z_ListStatus **p, int opt, const char *name);
-
-typedef struct Z_ListStatuses Z_ListStatuses;
-YAZ_EXPORT int z_ListStatuses (ODR o, Z_ListStatuses **p, int opt, const char *name);
-
-typedef int  Z_DeleteStatus;
-YAZ_EXPORT int z_DeleteStatus (ODR o, Z_DeleteStatus **p, int opt, const char *name);
-
-typedef struct Z_AccessControlRequest Z_AccessControlRequest;
-YAZ_EXPORT int z_AccessControlRequest (ODR o, Z_AccessControlRequest **p, int opt, const char *name);
-
-typedef struct Z_AccessControlResponse Z_AccessControlResponse;
-YAZ_EXPORT int z_AccessControlResponse (ODR o, Z_AccessControlResponse **p, int opt, const char *name);
-
-typedef struct Z_ResourceControlRequest Z_ResourceControlRequest;
-YAZ_EXPORT int z_ResourceControlRequest (ODR o, Z_ResourceControlRequest **p, int opt, const char *name);
-
-typedef struct Z_ResourceControlResponse Z_ResourceControlResponse;
-YAZ_EXPORT int z_ResourceControlResponse (ODR o, Z_ResourceControlResponse **p, int opt, const char *name);
-
-typedef struct Z_TriggerResourceControlRequest Z_TriggerResourceControlRequest;
-YAZ_EXPORT int z_TriggerResourceControlRequest (ODR o, Z_TriggerResourceControlRequest **p, int opt, const char *name);
-
-typedef struct Z_ResourceReportRequest Z_ResourceReportRequest;
-YAZ_EXPORT int z_ResourceReportRequest (ODR o, Z_ResourceReportRequest **p, int opt, const char *name);
-
-typedef struct Z_ResourceReportResponse Z_ResourceReportResponse;
-YAZ_EXPORT int z_ResourceReportResponse (ODR o, Z_ResourceReportResponse **p, int opt, const char *name);
-
-typedef Z_External  Z_ResourceReport;
-YAZ_EXPORT int z_ResourceReport (ODR o, Z_ResourceReport **p, int opt, const char *name);
-
-typedef Odr_oid  Z_ResourceReportId;
-YAZ_EXPORT int z_ResourceReportId (ODR o, Z_ResourceReportId **p, int opt, const char *name);
-
-typedef struct Z_ScanRequest Z_ScanRequest;
-YAZ_EXPORT int z_ScanRequest (ODR o, Z_ScanRequest **p, int opt, const char *name);
-
-typedef struct Z_ScanResponse Z_ScanResponse;
-YAZ_EXPORT int z_ScanResponse (ODR o, Z_ScanResponse **p, int opt, const char *name);
-
-typedef struct Z_ListEntries Z_ListEntries;
-YAZ_EXPORT int z_ListEntries (ODR o, Z_ListEntries **p, int opt, const char *name);
-
-typedef struct Z_Entry Z_Entry;
-YAZ_EXPORT int z_Entry (ODR o, Z_Entry **p, int opt, const char *name);
-
-typedef struct Z_TermInfo Z_TermInfo;
-YAZ_EXPORT int z_TermInfo (ODR o, Z_TermInfo **p, int opt, const char *name);
-
-typedef struct Z_byDatabaseList_s Z_byDatabaseList_s;
-YAZ_EXPORT int z_byDatabaseList_s (ODR o, Z_byDatabaseList_s **p, int opt, const char *name);
-
-typedef struct Z_byDatabaseList Z_byDatabaseList;
-YAZ_EXPORT int z_byDatabaseList (ODR o, Z_byDatabaseList **p, int opt, const char *name);
-
-typedef struct Z_OccurrenceByAttributesElem Z_OccurrenceByAttributesElem;
-YAZ_EXPORT int z_OccurrenceByAttributesElem (ODR o, Z_OccurrenceByAttributesElem **p, int opt, const char *name);
-
-typedef struct Z_OccurrenceByAttributes Z_OccurrenceByAttributes;
-YAZ_EXPORT int z_OccurrenceByAttributes (ODR o, Z_OccurrenceByAttributes **p, int opt, const char *name);
-
-typedef struct Z_SortKeySpecList Z_SortKeySpecList;
-YAZ_EXPORT int z_SortKeySpecList (ODR o, Z_SortKeySpecList **p, int opt, const char *name);
-
-typedef struct Z_SortRequest Z_SortRequest;
-YAZ_EXPORT int z_SortRequest (ODR o, Z_SortRequest **p, int opt, const char *name);
-
-typedef struct Z_SortResponse Z_SortResponse;
-YAZ_EXPORT int z_SortResponse (ODR o, Z_SortResponse **p, int opt, const char *name);
-
-typedef struct Z_SortKeySpec Z_SortKeySpec;
-YAZ_EXPORT int z_SortKeySpec (ODR o, Z_SortKeySpec **p, int opt, const char *name);
-
-typedef struct Z_SortDbSpecificList_s Z_SortDbSpecificList_s;
-YAZ_EXPORT int z_SortDbSpecificList_s (ODR o, Z_SortDbSpecificList_s **p, int opt, const char *name);
-
-typedef struct Z_SortDbSpecificList Z_SortDbSpecificList;
-YAZ_EXPORT int z_SortDbSpecificList (ODR o, Z_SortDbSpecificList **p, int opt, const char *name);
-
-typedef struct Z_SortElement Z_SortElement;
-YAZ_EXPORT int z_SortElement (ODR o, Z_SortElement **p, int opt, const char *name);
-
-typedef struct Z_SortAttributes Z_SortAttributes;
-YAZ_EXPORT int z_SortAttributes (ODR o, Z_SortAttributes **p, int opt, const char *name);
-
-typedef struct Z_SortKey Z_SortKey;
-YAZ_EXPORT int z_SortKey (ODR o, Z_SortKey **p, int opt, const char *name);
-
-typedef struct Z_ExtendedServicesRequest Z_ExtendedServicesRequest;
-YAZ_EXPORT int z_ExtendedServicesRequest (ODR o, Z_ExtendedServicesRequest **p, int opt, const char *name);
-
-typedef struct Z_ExtendedServicesResponse Z_ExtendedServicesResponse;
-YAZ_EXPORT int z_ExtendedServicesResponse (ODR o, Z_ExtendedServicesResponse **p, int opt, const char *name);
-
-typedef struct Z_Permissions_s Z_Permissions_s;
-YAZ_EXPORT int z_Permissions_s (ODR o, Z_Permissions_s **p, int opt, const char *name);
-
-typedef struct Z_Permissions Z_Permissions;
-YAZ_EXPORT int z_Permissions (ODR o, Z_Permissions **p, int opt, const char *name);
-
-typedef struct Z_Close Z_Close;
-YAZ_EXPORT int z_Close (ODR o, Z_Close **p, int opt, const char *name);
-
-typedef int  Z_CloseReason;
-YAZ_EXPORT int z_CloseReason (ODR o, Z_CloseReason **p, int opt, const char *name);
-
-typedef Odr_oct  Z_ReferenceId;
-YAZ_EXPORT int z_ReferenceId (ODR o, Z_ReferenceId **p, int opt, const char *name);
-
-typedef Odr_oid  Z_AttributeSetId;
-YAZ_EXPORT int z_AttributeSetId (ODR o, Z_AttributeSetId **p, int opt, const char *name);
-
-typedef struct Z_OtherInformationUnit Z_OtherInformationUnit;
-YAZ_EXPORT int z_OtherInformationUnit (ODR o, Z_OtherInformationUnit **p, int opt, const char *name);
-
-typedef struct Z_OtherInformation Z_OtherInformation;
-YAZ_EXPORT int z_OtherInformation (ODR o, Z_OtherInformation **p, int opt, const char *name);
-
-typedef struct Z_InfoCategory Z_InfoCategory;
-YAZ_EXPORT int z_InfoCategory (ODR o, Z_InfoCategory **p, int opt, const char *name);
-
-typedef struct Z_IntUnit Z_IntUnit;
-YAZ_EXPORT int z_IntUnit (ODR o, Z_IntUnit **p, int opt, const char *name);
-
-typedef struct Z_Unit Z_Unit;
-YAZ_EXPORT int z_Unit (ODR o, Z_Unit **p, int opt, const char *name);
-
-typedef char  Z_InternationalString;
-YAZ_EXPORT int z_InternationalString (ODR o, Z_InternationalString **p, int opt, const char *name);
-
-typedef Z_InternationalString  Z_ResultSetId;
-YAZ_EXPORT int z_ResultSetId (ODR o, Z_ResultSetId **p, int opt, const char *name);
-
-typedef Z_InternationalString  Z_ElementSetName;
-YAZ_EXPORT int z_ElementSetName (ODR o, Z_ElementSetName **p, int opt, const char *name);
-
-typedef Z_InternationalString  Z_DatabaseName;
-YAZ_EXPORT int z_DatabaseName (ODR o, Z_DatabaseName **p, int opt, const char *name);
-
-typedef struct Z_StringOrNumeric Z_StringOrNumeric;
-YAZ_EXPORT int z_StringOrNumeric (ODR o, Z_StringOrNumeric **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_APDU {
-       int which;
-       union {
-               Z_InitRequest *initRequest;
-               Z_InitResponse *initResponse;
-               Z_SearchRequest *searchRequest;
-               Z_SearchResponse *searchResponse;
-               Z_PresentRequest *presentRequest;
-               Z_PresentResponse *presentResponse;
-               Z_DeleteResultSetRequest *deleteResultSetRequest;
-               Z_DeleteResultSetResponse *deleteResultSetResponse;
-               Z_AccessControlRequest *accessControlRequest;
-               Z_AccessControlResponse *accessControlResponse;
-               Z_ResourceControlRequest *resourceControlRequest;
-               Z_ResourceControlResponse *resourceControlResponse;
-               Z_TriggerResourceControlRequest *triggerResourceControlRequest;
-               Z_ResourceReportRequest *resourceReportRequest;
-               Z_ResourceReportResponse *resourceReportResponse;
-               Z_ScanRequest *scanRequest;
-               Z_ScanResponse *scanResponse;
-               Z_SortRequest *sortRequest;
-               Z_SortResponse *sortResponse;
-               Z_Segment *segmentRequest;
-               Z_ExtendedServicesRequest *extendedServicesRequest;
-               Z_ExtendedServicesResponse *extendedServicesResponse;
-               Z_Close *close;
-#define Z_APDU_initRequest 1
-#define Z_APDU_initResponse 2
-#define Z_APDU_searchRequest 3
-#define Z_APDU_searchResponse 4
-#define Z_APDU_presentRequest 5
-#define Z_APDU_presentResponse 6
-#define Z_APDU_deleteResultSetRequest 7
-#define Z_APDU_deleteResultSetResponse 8
-#define Z_APDU_accessControlRequest 9
-#define Z_APDU_accessControlResponse 10
-#define Z_APDU_resourceControlRequest 11
-#define Z_APDU_resourceControlResponse 12
-#define Z_APDU_triggerResourceControlRequest 13
-#define Z_APDU_resourceReportRequest 14
-#define Z_APDU_resourceReportResponse 15
-#define Z_APDU_scanRequest 16
-#define Z_APDU_scanResponse 17
-#define Z_APDU_sortRequest 18
-#define Z_APDU_sortResponse 19
-#define Z_APDU_segmentRequest 20
-#define Z_APDU_extendedServicesRequest 21
-#define Z_APDU_extendedServicesResponse 22
-#define Z_APDU_close 23
-       } u;
-};
-
-struct Z_InitRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       Z_ProtocolVersion *protocolVersion;
-       Z_Options *options;
-       int *preferredMessageSize;
-       int *maximumRecordSize;
-       Z_IdAuthentication *idAuthentication; /* OPT */
-       Z_InternationalString *implementationId; /* OPT */
-       Z_InternationalString *implementationName; /* OPT */
-       Z_InternationalString *implementationVersion; /* OPT */
-       Z_External *userInformationField; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_IdPass {
-       Z_InternationalString *groupId; /* OPT */
-       Z_InternationalString *userId; /* OPT */
-       Z_InternationalString *password; /* OPT */
-};
-
-struct Z_IdAuthentication {
-       int which;
-       union {
-               char *open;
-               Z_IdPass *idPass;
-               Odr_null *anonymous;
-               Z_External *other;
-#define Z_IdAuthentication_open 1
-#define Z_IdAuthentication_idPass 2
-#define Z_IdAuthentication_anonymous 3
-#define Z_IdAuthentication_other 4
-       } u;
-};
-
-struct Z_InitResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       Z_ProtocolVersion *protocolVersion;
-       Z_Options *options;
-       int *preferredMessageSize;
-       int *maximumRecordSize;
-       bool_t *result;
-       Z_InternationalString *implementationId; /* OPT */
-       Z_InternationalString *implementationName; /* OPT */
-       Z_InternationalString *implementationVersion; /* OPT */
-       Z_External *userInformationField; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-#define Z_ProtocolVersion_1 0
-#define Z_ProtocolVersion_2 1
-#define Z_ProtocolVersion_3 2
-
-#define Z_Options_search 0
-#define Z_Options_present 1
-#define Z_Options_delSet 2
-#define Z_Options_resourceReport 3
-#define Z_Options_triggerResourceCtrl 4
-#define Z_Options_resourceCtrl 5
-#define Z_Options_accessCtrl 6
-#define Z_Options_scan 7
-#define Z_Options_sort 8
-#define Z_Options_extendedServices 10
-#define Z_Options_level_1Segmentation 11
-#define Z_Options_level_2Segmentation 12
-#define Z_Options_concurrentOperations 13
-#define Z_Options_namedResultSets 14
-
-struct Z_SearchRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       int *smallSetUpperBound;
-       int *largeSetLowerBound;
-       int *mediumSetPresentNumber;
-       bool_t *replaceIndicator;
-       Z_InternationalString *resultSetName;
-       int num_databaseNames;
-       Z_DatabaseName **databaseNames;
-       Z_ElementSetNames *smallSetElementSetNames; /* OPT */
-       Z_ElementSetNames *mediumSetElementSetNames; /* OPT */
-       Odr_oid *preferredRecordSyntax; /* OPT */
-       Z_Query *query;
-       Z_OtherInformation *additionalSearchInfo; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_Query {
-       int which;
-       union {
-               void *type_0;
-               Z_RPNQuery *type_1;
-               Odr_oct *type_2;
-               Odr_oct *type_100;
-               Z_RPNQuery *type_101;
-               Odr_oct *type_102;
-#define Z_Query_type_0 1
-#define Z_Query_type_1 2
-#define Z_Query_type_2 3
-#define Z_Query_type_100 4
-#define Z_Query_type_101 5
-#define Z_Query_type_102 6
-       } u;
-};
-
-struct Z_RPNQuery {
-       Z_AttributeSetId *attributeSetId;
-       Z_RPNStructure *RPNStructure;
-};
-
-struct Z_Complex {
-       Z_RPNStructure *s1;
-       Z_RPNStructure *s2;
-       Z_Operator *roperator;
-};
-
-struct Z_RPNStructure {
-       int which;
-       union {
-               Z_Operand *simple;
-               Z_Complex *complex;
-#define Z_RPNStructure_simple 1
-#define Z_RPNStructure_complex 2
-       } u;
-};
-
-struct Z_Operand {
-       int which;
-       union {
-               Z_AttributesPlusTerm *attributesPlusTerm;
-               Z_ResultSetId *resultSetId;
-               Z_ResultSetPlusAttributes *resultAttr;
-#define Z_Operand_APT 1
-#define Z_Operand_resultSetId 2
-#define Z_Operand_resultAttr 3
-       } u;
-};
-
-struct Z_AttributesPlusTerm {
-       Z_AttributeList *attributes;
-       Z_Term *term;
-};
-
-struct Z_ResultSetPlusAttributes {
-       Z_ResultSetId *resultSet;
-       Z_AttributeList *attributes;
-};
-
-struct Z_AttributeList {
-       int num_attributes;
-       Z_AttributeElement **attributes;
-};
-
-struct Z_Term {
-       int which;
-       union {
-               Odr_oct *general;
-               int *numeric;
-               Z_InternationalString *characterString;
-               Odr_oid *oid;
-               char *dateTime;
-               Z_External *external;
-               Z_IntUnit *integerAndUnit;
-               Odr_null *null;
-#define Z_Term_general 1
-#define Z_Term_numeric 2
-#define Z_Term_characterString 3
-#define Z_Term_oid 4
-#define Z_Term_dateTime 5
-#define Z_Term_external 6
-#define Z_Term_integerAndUnit 7
-#define Z_Term_null 8
-       } u;
-};
-
-struct Z_Operator {
-       int which;
-       union {
-               Odr_null *and;
-               Odr_null *or;
-               Odr_null *and_not;
-               Z_ProximityOperator *prox;
-#define Z_Operator_and 1
-#define Z_Operator_or 2
-#define Z_Operator_and_not 3
-#define Z_Operator_prox 4
-       } u;
-};
-
-struct Z_ComplexAttribute {
-       int num_list;
-       Z_StringOrNumeric **list;
-       int num_semanticAction;
-       int **semanticAction; /* OPT */
-};
-
-struct Z_AttributeElement {
-       Z_AttributeSetId *attributeSet; /* OPT */
-       int *attributeType;
-       int which;
-       union {
-               int *numeric;
-               Z_ComplexAttribute *complex;
-#define Z_AttributeValue_numeric 1
-#define Z_AttributeValue_complex 2
-       } value;
-};
-
-struct Z_ProximityOperator {
-       bool_t *exclusion; /* OPT */
-       int *distance;
-       bool_t *ordered;
-#define Z_ProximityOperator_Prox_lessThan 1
-#define Z_ProximityOperator_Prox_lessThanOrEqual 2
-#define Z_ProximityOperator_Prox_equal 3
-#define Z_ProximityOperator_Prox_greaterThanOrEqual 4
-#define Z_ProximityOperator_Prox_greaterThan 5
-#define Z_ProximityOperator_Prox_notEqual 6
-       int *relationType;
-       int which;
-       union {
-               Z_ProxUnit *known;
-               int *zprivate;
-#define Z_ProximityOperator_known 1
-#define Z_ProximityOperator_private 2
-       } u;
-};
-
-#define Z_ProxUnit_character 1
-#define Z_ProxUnit_word 2
-#define Z_ProxUnit_sentence 3
-#define Z_ProxUnit_paragraph 4
-#define Z_ProxUnit_section 5
-#define Z_ProxUnit_chapter 6
-#define Z_ProxUnit_document 7
-#define Z_ProxUnit_element 8
-#define Z_ProxUnit_subelement 9
-#define Z_ProxUnit_elementType 10
-#define Z_ProxUnit_byte 11
-
-struct Z_SearchResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       int *resultCount;
-       int *numberOfRecordsReturned;
-       int *nextResultSetPosition;
-       bool_t *searchStatus;
-#define Z_SearchResponse_subset 1
-#define Z_SearchResponse_interim 2
-#define Z_SearchResponse_none 3
-       int *resultSetStatus; /* OPT */
-       Z_PresentStatus *presentStatus; /* OPT */
-       Z_Records *records; /* OPT */
-       Z_OtherInformation *additionalSearchInfo; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_RecordComposition {
-       int which;
-       union {
-               Z_ElementSetNames *simple;
-               Z_CompSpec *complex;
-#define Z_RecordComp_simple 1
-#define Z_RecordComp_complex 2
-       } u;
-};
-
-struct Z_PresentRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       Z_ResultSetId *resultSetId;
-       int *resultSetStartPoint;
-       int *numberOfRecordsRequested;
-       int num_ranges;
-       Z_Range **additionalRanges; /* OPT */
-       Z_RecordComposition *recordComposition; /* OPT */
-       Odr_oid *preferredRecordSyntax; /* OPT */
-       int *maxSegmentCount; /* OPT */
-       int *maxRecordSize; /* OPT */
-       int *maxSegmentSize; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_Segment {
-       Z_ReferenceId *referenceId; /* OPT */
-       int *numberOfRecordsReturned;
-       int num_segmentRecords;
-       Z_NamePlusRecord **segmentRecords;
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_PresentResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       int *numberOfRecordsReturned;
-       int *nextResultSetPosition;
-       Z_PresentStatus *presentStatus;
-       Z_Records *records; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_NamePlusRecordList {
-       int num_records;
-       Z_NamePlusRecord **records;
-};
-
-struct Z_DiagRecs {
-       int num_diagRecs;
-       Z_DiagRec **diagRecs;
-};
-
-struct Z_Records {
-       int which;
-       union {
-               Z_NamePlusRecordList *databaseOrSurDiagnostics;
-               Z_DefaultDiagFormat *nonSurrogateDiagnostic;
-               Z_DiagRecs *multipleNonSurDiagnostics;
-#define Z_Records_DBOSD 1
-#define Z_Records_NSD 2
-#define Z_Records_multipleNSD 3
-       } u;
-};
-
-struct Z_NamePlusRecord {
-       Z_DatabaseName *databaseName; /* OPT */
-       int which;
-       union {
-               Z_External *databaseRecord;
-               Z_DiagRec *surrogateDiagnostic;
-               Z_FragmentSyntax *startingFragment;
-               Z_FragmentSyntax *intermediateFragment;
-               Z_FragmentSyntax *finalFragment;
-#define Z_NamePlusRecord_databaseRecord 1
-#define Z_NamePlusRecord_surrogateDiagnostic 2
-#define Z_NamePlusRecord_startingFragment 3
-#define Z_NamePlusRecord_intermediateFragment 4
-#define Z_NamePlusRecord_finalFragment 5
-       } u;
-};
-
-struct Z_FragmentSyntax {
-       int which;
-       union {
-               Z_External *externallyTagged;
-               Odr_oct *notExternallyTagged;
-#define Z_FragmentSyntax_externallyTagged 1
-#define Z_FragmentSyntax_notExternallyTagged 2
-       } u;
-};
-
-struct Z_DiagRec {
-       int which;
-       union {
-               Z_DefaultDiagFormat *defaultFormat;
-               Z_External *externallyDefined;
-#define Z_DiagRec_defaultFormat 1
-#define Z_DiagRec_externallyDefined 2
-       } u;
-};
-
-struct Z_DefaultDiagFormat {
-       Odr_oid *diagnosticSetId;
-       int *condition;
-       int which;
-       union {
-               char *v2Addinfo;
-               Z_InternationalString *v3Addinfo;
-#define Z_DefaultDiagFormat_v2Addinfo 1
-#define Z_DefaultDiagFormat_v3Addinfo 2
-       } u;
-};
-
-struct Z_Range {
-       int *startingPosition;
-       int *numberOfRecords;
-};
-
-struct Z_DatabaseSpecificUnit {
-       Z_DatabaseName *dbName;
-       Z_ElementSetName *esn;
-};
-
-struct Z_DatabaseSpecific {
-       int num;
-       Z_DatabaseSpecificUnit **elements;
-};
-
-struct Z_ElementSetNames {
-       int which;
-       union {
-               Z_InternationalString *generic;
-               Z_DatabaseSpecific *databaseSpecific;
-#define Z_ElementSetNames_generic 1
-#define Z_ElementSetNames_databaseSpecific 2
-       } u;
-};
-
-#define Z_PresentStatus_success 0
-#define Z_PresentStatus_partial_1 1
-#define Z_PresentStatus_partial_2 2
-#define Z_PresentStatus_partial_3 3
-#define Z_PresentStatus_partial_4 4
-#define Z_PresentStatus_failure 5
-
-struct Z_DbSpecific {
-       Z_DatabaseName *db;
-       Z_Specification *spec;
-};
-
-struct Z_CompSpec {
-       bool_t *selectAlternativeSyntax;
-       Z_Specification *generic; /* OPT */
-       int num_dbSpecific;
-       Z_DbSpecific **dbSpecific; /* OPT */
-       int num_recordSyntax;
-       Odr_oid **recordSyntax; /* OPT */
-};
-
-struct Z_ElementSpec {
-       int which;
-       union {
-               Z_InternationalString *elementSetName;
-               Z_External *externalSpec;
-#define Z_ElementSpec_elementSetName 1
-#define Z_ElementSpec_externalSpec 2
-       } u;
-};
-
-struct Z_Specification {
-       Odr_oid *schema; /* OPT */
-       Z_ElementSpec *elementSpec; /* OPT */
-};
-
-struct Z_DeleteResultSetRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-#define Z_DeleteResultSetRequest_list 0
-#define Z_DeleteResultSetRequest_all 1
-       int *deleteFunction;
-       int num_resultSetList;
-       Z_ResultSetId **resultSetList; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_DeleteResultSetResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       Z_DeleteStatus *deleteOperationStatus;
-       Z_ListStatuses *deleteListStatuses; /* OPT */
-       int *numberNotDeleted; /* OPT */
-       Z_ListStatuses *bulkStatuses; /* OPT */
-       Z_InternationalString *deleteMessage; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ListStatus {
-       Z_ResultSetId *id;
-       Z_DeleteStatus *status;
-};
-
-struct Z_ListStatuses {
-       int num;
-       Z_ListStatus **elements;
-};
-
-#define Z_DeleteStatus_success 0
-#define Z_DeleteStatus_resultSetDidNotExist 1
-#define Z_DeleteStatus_previouslyDeletedByTarget 2
-#define Z_DeleteStatus_systemProblemAtTarget 3
-#define Z_DeleteStatus_accessNotAllowed 4
-#define Z_DeleteStatus_resourceControlAtOrigin 5
-#define Z_DeleteStatus_resourceControlAtTarget 6
-#define Z_DeleteStatus_bulkDeleteNotSupported 7
-#define Z_DeleteStatus_notAllRsltSetsDeletedOnBulkDlte 8
-#define Z_DeleteStatus_notAllRequestedResultSetsDeleted 9
-#define Z_DeleteStatus_resultSetInUse 10
-
-struct Z_AccessControlRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       int which;
-       union {
-               Odr_oct *simpleForm;
-               Z_External *externallyDefined;
-#define Z_AccessControlRequest_simpleForm 1
-#define Z_AccessControlRequest_externallyDefined 2
-       } u;
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_AccessControlResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       int which;
-       union {
-               Odr_oct *simpleForm;
-               Z_External *externallyDefined;
-#define Z_AccessControlResponse_simpleForm 1
-#define Z_AccessControlResponse_externallyDefined 2
-       } u; /* OPT */
-       Z_DiagRec *diagnostic; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ResourceControlRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       bool_t *suspendedFlag; /* OPT */
-       Z_ResourceReport *resourceReport; /* OPT */
-#define Z_ResourceControlRequest_subset 1
-#define Z_ResourceControlRequest_interim 2
-#define Z_ResourceControlRequest_none 3
-       int *partialResultsAvailable; /* OPT */
-       bool_t *responseRequired;
-       bool_t *triggeredRequestFlag; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ResourceControlResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       bool_t *continueFlag;
-       bool_t *resultSetWanted; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_TriggerResourceControlRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-#define Z_TriggerResourceControlRequest_resourceReport 1
-#define Z_TriggerResourceControlRequest_resourceControl 2
-#define Z_TriggerResourceControlRequest_cancel 3
-       int *requestedAction;
-       Z_ResourceReportId *prefResourceReportFormat; /* OPT */
-       bool_t *resultSetWanted; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ResourceReportRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       Z_ReferenceId *opId; /* OPT */
-       Z_ResourceReportId *prefResourceReportFormat; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ResourceReportResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-#define Z_ResourceReportResponse_success 0
-#define Z_ResourceReportResponse_partial 1
-#define Z_ResourceReportResponse_failure_1 2
-#define Z_ResourceReportResponse_failure_2 3
-#define Z_ResourceReportResponse_failure_3 4
-#define Z_ResourceReportResponse_failure_4 5
-#define Z_ResourceReportResponse_failure_5 6
-#define Z_ResourceReportResponse_failure_6 7
-       int *resourceReportStatus;
-       Z_ResourceReport *resourceReport; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-
-
-
-
-struct Z_ScanRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       int num_databaseNames;
-       Z_DatabaseName **databaseNames;
-       Z_AttributeSetId *attributeSet; /* OPT */
-       Z_AttributesPlusTerm *termListAndStartPoint;
-       int *stepSize; /* OPT */
-       int *numberOfTermsRequested;
-       int *preferredPositionInResponse; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ScanResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-       int *stepSize; /* OPT */
-#define Z_Scan_success 0
-#define Z_Scan_partial_1 1
-#define Z_Scan_partial_2 2
-#define Z_Scan_partial_3 3
-#define Z_Scan_partial_4 4
-#define Z_Scan_partial_5 5
-#define Z_Scan_failure 6
-       int *scanStatus;
-       int *numberOfEntriesReturned;
-       int *positionOfTerm; /* OPT */
-       Z_ListEntries *entries; /* OPT */
-       Z_AttributeSetId *attributeSet; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ListEntries {
-       int num_entries;
-       Z_Entry **entries; /* OPT */
-       int num_nonsurrogateDiagnostics;
-       Z_DiagRec **nonsurrogateDiagnostics; /* OPT */
-};
-
-struct Z_Entry {
-       int which;
-       union {
-               Z_TermInfo *termInfo;
-               Z_DiagRec *surrogateDiagnostic;
-#define Z_Entry_termInfo 1
-#define Z_Entry_surrogateDiagnostic 2
-       } u;
-};
-
-struct Z_TermInfo {
-       Z_Term *term;
-       Z_InternationalString *displayTerm; /* OPT */
-       Z_AttributeList *suggestedAttributes; /* OPT */
-       int num_alternativeTerm;
-       Z_AttributesPlusTerm **alternativeTerm; /* OPT */
-       int *globalOccurrences; /* OPT */
-       Z_OccurrenceByAttributes *byAttributes; /* OPT */
-       Z_OtherInformation *otherTermInfo; /* OPT */
-};
-
-struct Z_byDatabaseList_s {
-       Z_DatabaseName *db;
-       int *num; /* OPT */
-       Z_OtherInformation *otherDbInfo; /* OPT */
-};
-
-struct Z_byDatabaseList {
-       int num;
-       Z_byDatabaseList_s **elements;
-};
-
-struct Z_OccurrenceByAttributesElem {
-       Z_AttributeList *attributes;
-       int which;
-       union {
-               int *global;
-               Z_byDatabaseList *byDatabase;
-#define Z_OccurrenceByAttributesElem_global 1
-#define Z_OccurrenceByAttributesElem_byDatabase 2
-       } u; /* OPT */
-       Z_OtherInformation *otherOccurInfo; /* OPT */
-};
-
-struct Z_OccurrenceByAttributes {
-       int num;
-       Z_OccurrenceByAttributesElem **elements;
-};
-
-struct Z_SortKeySpecList {
-       int num_specs;
-       Z_SortKeySpec **specs;
-};
-
-struct Z_SortRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-       int num_inputResultSetNames;
-       Z_InternationalString **inputResultSetNames;
-       Z_InternationalString *sortedResultSetName;
-       Z_SortKeySpecList *sortSequence;
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_SortResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-#define Z_SortResponse_success 0
-#define Z_SortResponse_partial_1 1
-#define Z_SortResponse_failure 2
-       int *sortStatus;
-#define Z_SortResponse_empty 1
-#define Z_SortResponse_interim 2
-#define Z_SortResponse_unchanged 3
-#define Z_SortResponse_none 4
-       int *resultSetStatus; /* OPT */
-       int num_diagnostics;
-       Z_DiagRec **diagnostics; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_SortKeySpec {
-       Z_SortElement *sortElement;
-#define Z_SortKeySpec_ascending 0
-#define Z_SortKeySpec_descending 1
-#define Z_SortKeySpec_ascendingByFrequency 3
-#define Z_SortKeySpec_descendingByfrequency 4
-       int *sortRelation;
-#define Z_SortKeySpec_caseSensitive 0
-#define Z_SortKeySpec_caseInsensitive 1
-       int *caseSensitivity;
-       int which;
-       union {
-               Odr_null *abort;
-               Odr_null *null;
-               Odr_oct *missingValueData;
-#define Z_SortKeySpec_abort 1
-#define Z_SortKeySpec_null 2
-#define Z_SortKeySpec_missingValueData 3
-       } u; /* OPT */
-};
-
-struct Z_SortDbSpecificList_s {
-       Z_DatabaseName *databaseName;
-       Z_SortKey *dbSort;
-};
-
-struct Z_SortDbSpecificList {
-       int num;
-       Z_SortDbSpecificList_s **elements;
-};
-
-struct Z_SortElement {
-       int which;
-       union {
-               Z_SortKey *generic;
-               Z_SortDbSpecificList *databaseSpecific;
-#define Z_SortElement_generic 1
-#define Z_SortElement_databaseSpecific 2
-       } u;
-};
-
-struct Z_SortAttributes {
-       Z_AttributeSetId *id;
-       Z_AttributeList *list;
-};
-
-struct Z_SortKey {
-       int which;
-       union {
-               Z_InternationalString *sortField;
-               Z_Specification *elementSpec;
-               Z_SortAttributes *sortAttributes;
-#define Z_SortKey_sortField 1
-#define Z_SortKey_elementSpec 2
-#define Z_SortKey_sortAttributes 3
-       } u;
-};
-
-struct Z_ExtendedServicesRequest {
-       Z_ReferenceId *referenceId; /* OPT */
-#define Z_ExtendedServicesRequest_create 1
-#define Z_ExtendedServicesRequest_delete 2
-#define Z_ExtendedServicesRequest_modify 3
-       int *function;
-       Odr_oid *packageType;
-       Z_InternationalString *packageName; /* OPT */
-       Z_InternationalString *userId; /* OPT */
-       Z_IntUnit *retentionTime; /* OPT */
-       Z_Permissions *permissions; /* OPT */
-       Z_InternationalString *description; /* OPT */
-       Z_External *taskSpecificParameters; /* OPT */
-#define Z_ExtendedServicesRequest_wait 1
-#define Z_ExtendedServicesRequest_waitIfPossible 2
-#define Z_ExtendedServicesRequest_dontWait 3
-#define Z_ExtendedServicesRequest_dontReturnPackage 4
-       int *waitAction;
-       Z_ElementSetName *elements; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_ExtendedServicesResponse {
-       Z_ReferenceId *referenceId; /* OPT */
-#define Z_ExtendedServicesResponse_done 1
-#define Z_ExtendedServicesResponse_accepted 2
-#define Z_ExtendedServicesResponse_failure 3
-       int *operationStatus;
-       int num_diagnostics;
-       Z_DiagRec **diagnostics; /* OPT */
-       Z_External *taskPackage; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_Permissions_s {
-       Z_InternationalString *userId;
-#define Z_Permissions_s_delete 1
-#define Z_Permissions_s_modifyContents 2
-#define Z_Permissions_s_modifyPermissions 3
-#define Z_Permissions_s_present 4
-#define Z_Permissions_s_invoke 5
-       int num_allowableFunctions;
-       int **allowableFunctions;
-};
-
-struct Z_Permissions {
-       int num;
-       Z_Permissions_s **elements;
-};
-
-struct Z_Close {
-       Z_ReferenceId *referenceId; /* OPT */
-       Z_CloseReason *closeReason;
-       Z_InternationalString *diagnosticInformation; /* OPT */
-       Z_ResourceReportId *resourceReportFormat; /* OPT */
-       Z_ResourceReport *resourceReport; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-#define Z_Close_finished 0
-#define Z_Close_shutdown 1
-#define Z_Close_systemProblem 2
-#define Z_Close_costLimit 3
-#define Z_Close_resources 4
-#define Z_Close_securityViolation 5
-#define Z_Close_protocolError 6
-#define Z_Close_lackOfActivity 7
-#define Z_Close_peerAbort 8
-#define Z_Close_unspecified 9
-
-
-
-
-
-
-
-
-
-
-
-struct Z_OtherInformationUnit {
-       Z_InfoCategory *category; /* OPT */
-       int which;
-       union {
-               Z_InternationalString *characterInfo;
-               Odr_oct *binaryInfo;
-               Z_External *externallyDefinedInfo;
-               Odr_oid *oid;
-#define Z_OtherInfo_characterInfo 1
-#define Z_OtherInfo_binaryInfo 2
-#define Z_OtherInfo_externallyDefinedInfo 3
-#define Z_OtherInfo_oid 4
-       } information;
-};
-
-struct Z_OtherInformation {
-       int num_elements;
-       Z_OtherInformationUnit **list;
-};
-
-struct Z_InfoCategory {
-       Odr_oid *categoryTypeId; /* OPT */
-       int *categoryValue;
-};
-
-struct Z_IntUnit {
-       int *value;
-       Z_Unit *unitUsed;
-};
-
-struct Z_Unit {
-       Z_InternationalString *unitSystem; /* OPT */
-       Z_StringOrNumeric *unitType; /* OPT */
-       Z_StringOrNumeric *unit; /* OPT */
-       int *scaleFactor; /* OPT */
-};
-
-
-
-struct Z_StringOrNumeric {
-       int which;
-       union {
-               Z_InternationalString *string;
-               int *numeric;
-#define Z_StringOrNumeric_string 1
-#define Z_StringOrNumeric_numeric 2
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int z_ANY_type_0 (ODR o, void **p, int opt);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/yaz/z-date.h b/include/yaz/z-date.h
deleted file mode 100644 (file)
index 13ee62c..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H UserInfoFormat-dateTime */
-
-#ifndef z_date_H
-#define z_date_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_DateTime Z_DateTime;
-YAZ_EXPORT int z_DateTime (ODR o, Z_DateTime **p, int opt, const char *name);
-
-typedef struct Z_DateMonthAndDay Z_DateMonthAndDay;
-YAZ_EXPORT int z_DateMonthAndDay (ODR o, Z_DateMonthAndDay **p, int opt, const char *name);
-
-typedef struct Z_DateQuarter Z_DateQuarter;
-YAZ_EXPORT int z_DateQuarter (ODR o, Z_DateQuarter **p, int opt, const char *name);
-
-typedef struct Z_DateSeason Z_DateSeason;
-YAZ_EXPORT int z_DateSeason (ODR o, Z_DateSeason **p, int opt, const char *name);
-
-typedef struct Z_Era Z_Era;
-YAZ_EXPORT int z_Era (ODR o, Z_Era **p, int opt, const char *name);
-
-typedef struct Z_DateFlags Z_DateFlags;
-YAZ_EXPORT int z_DateFlags (ODR o, Z_DateFlags **p, int opt, const char *name);
-
-typedef struct Z_Date Z_Date;
-YAZ_EXPORT int z_Date (ODR o, Z_Date **p, int opt, const char *name);
-
-typedef struct Z_Time Z_Time;
-YAZ_EXPORT int z_Time (ODR o, Z_Time **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_DateTime {
-       Z_Date *date; /* OPT */
-       Z_Time *time; /* OPT */
-};
-
-struct Z_DateMonthAndDay {
-       int *month;
-       int *day; /* OPT */
-};
-
-struct Z_DateQuarter {
-       int which;
-       union {
-               Odr_null *first;
-               Odr_null *second;
-               Odr_null *third;
-               Odr_null *fourth;
-#define Z_DateQuarter_first 1
-#define Z_DateQuarter_second 2
-#define Z_DateQuarter_third 3
-#define Z_DateQuarter_fourth 4
-       } u;
-};
-
-struct Z_DateSeason {
-       int which;
-       union {
-               Odr_null *winter;
-               Odr_null *spring;
-               Odr_null *summer;
-               Odr_null *autumn;
-#define Z_DateSeason_winter 1
-#define Z_DateSeason_spring 2
-#define Z_DateSeason_summer 3
-#define Z_DateSeason_autumn 4
-       } u;
-};
-
-struct Z_Era {
-       int which;
-       union {
-               Odr_null *decade;
-               Odr_null *century;
-               Odr_null *millennium;
-#define Z_Era_decade 1
-#define Z_Era_century 2
-#define Z_Era_millennium 3
-       } u;
-};
-
-struct Z_DateFlags {
-       Odr_null *circa; /* OPT */
-       Z_Era *era; /* OPT */
-};
-
-struct Z_Date {
-       int *year;
-       int which;
-       union {
-               Z_DateMonthAndDay *monthAndDay;
-               int *julianDay;
-               int *weekNumber;
-               Z_DateQuarter *quarter;
-               Z_DateSeason *season;
-#define Z_Date_monthAndDay 1
-#define Z_Date_julianDay 2
-#define Z_Date_weekNumber 3
-#define Z_Date_quarter 4
-#define Z_Date_season 5
-       } u; /* OPT */
-       Z_DateFlags *flags; /* OPT */
-};
-
-struct Z_Time {
-       int *hour;
-       int *minute; /* OPT */
-       int *second; /* OPT */
-       Z_IntUnit *partOfSecond; /* OPT */
-       int which;
-       union {
-               Odr_null *local;
-               Odr_null *utc;
-               int *utcOffset;
-#define Z_Time_local 1
-#define Z_Time_utc 2
-#define Z_Time_utcOffset 3
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-diag1.h b/include/yaz/z-diag1.h
deleted file mode 100644 (file)
index 6796220..0000000
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H DiagnosticFormatDiag1 */
-
-#ifndef z_diag1_H
-#define z_diag1_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_DiagnosticFormat_s Z_DiagnosticFormat_s;
-YAZ_EXPORT int z_DiagnosticFormat_s (ODR o, Z_DiagnosticFormat_s **p, int opt, const char *name);
-
-typedef struct Z_DiagnosticFormat Z_DiagnosticFormat;
-YAZ_EXPORT int z_DiagnosticFormat (ODR o, Z_DiagnosticFormat **p, int opt, const char *name);
-
-typedef struct Z_TooMany Z_TooMany;
-YAZ_EXPORT int z_TooMany (ODR o, Z_TooMany **p, int opt, const char *name);
-
-typedef struct Z_BadSpec Z_BadSpec;
-YAZ_EXPORT int z_BadSpec (ODR o, Z_BadSpec **p, int opt, const char *name);
-
-typedef struct Z_DbUnavail_0 Z_DbUnavail_0;
-YAZ_EXPORT int z_DbUnavail_0 (ODR o, Z_DbUnavail_0 **p, int opt, const char *name);
-
-typedef struct Z_DbUnavail Z_DbUnavail;
-YAZ_EXPORT int z_DbUnavail (ODR o, Z_DbUnavail **p, int opt, const char *name);
-
-typedef struct Z_Attribute Z_Attribute;
-YAZ_EXPORT int z_Attribute (ODR o, Z_Attribute **p, int opt, const char *name);
-
-typedef struct Z_AttCombo Z_AttCombo;
-YAZ_EXPORT int z_AttCombo (ODR o, Z_AttCombo **p, int opt, const char *name);
-
-typedef struct Z_DiagTerm Z_DiagTerm;
-YAZ_EXPORT int z_DiagTerm (ODR o, Z_DiagTerm **p, int opt, const char *name);
-
-typedef struct Z_Proximity Z_Proximity;
-YAZ_EXPORT int z_Proximity (ODR o, Z_Proximity **p, int opt, const char *name);
-
-typedef struct Z_AttrListList Z_AttrListList;
-YAZ_EXPORT int z_AttrListList (ODR o, Z_AttrListList **p, int opt, const char *name);
-
-typedef struct Z_Scan Z_Scan;
-YAZ_EXPORT int z_Scan (ODR o, Z_Scan **p, int opt, const char *name);
-
-typedef struct Z_StringList Z_StringList;
-YAZ_EXPORT int z_StringList (ODR o, Z_StringList **p, int opt, const char *name);
-
-typedef struct Z_Sort Z_Sort;
-YAZ_EXPORT int z_Sort (ODR o, Z_Sort **p, int opt, const char *name);
-
-typedef struct Z_Segmentation Z_Segmentation;
-YAZ_EXPORT int z_Segmentation (ODR o, Z_Segmentation **p, int opt, const char *name);
-
-typedef struct Z_ExtServices Z_ExtServices;
-YAZ_EXPORT int z_ExtServices (ODR o, Z_ExtServices **p, int opt, const char *name);
-
-typedef struct Z_OidList Z_OidList;
-YAZ_EXPORT int z_OidList (ODR o, Z_OidList **p, int opt, const char *name);
-
-typedef struct Z_AltOidList Z_AltOidList;
-YAZ_EXPORT int z_AltOidList (ODR o, Z_AltOidList **p, int opt, const char *name);
-
-typedef struct Z_AccessCtrl Z_AccessCtrl;
-YAZ_EXPORT int z_AccessCtrl (ODR o, Z_AccessCtrl **p, int opt, const char *name);
-
-typedef struct Z_RecordSyntax Z_RecordSyntax;
-YAZ_EXPORT int z_RecordSyntax (ODR o, Z_RecordSyntax **p, int opt, const char *name);
-
-typedef struct Z_DiagFormat Z_DiagFormat;
-YAZ_EXPORT int z_DiagFormat (ODR o, Z_DiagFormat **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_DiagnosticFormat_s {
-       int which;
-       union {
-               Z_DefaultDiagFormat *defaultDiagRec;
-               Z_DiagFormat *explicitDiagnostic;
-#define Z_DiagnosticFormat_s_defaultDiagRec 1
-#define Z_DiagnosticFormat_s_explicitDiagnostic 2
-       } u; /* OPT */
-       Z_InternationalString *message; /* OPT */
-};
-
-struct Z_DiagnosticFormat {
-       int num;
-       Z_DiagnosticFormat_s **elements;
-};
-
-struct Z_TooMany {
-#define Z_TooMany_argumentWords 1
-#define Z_TooMany_truncatedWords 2
-#define Z_TooMany_booleanOperators 3
-#define Z_TooMany_incompleteSubfields 4
-#define Z_TooMany_characters 5
-#define Z_TooMany_recordsRetrieved 6
-#define Z_TooMany_dataBasesSpecified 7
-#define Z_TooMany_resultSetsCreated 8
-#define Z_TooMany_indexTermsProcessed 9
-       int *tooManyWhat;
-       int *max; /* OPT */
-};
-
-struct Z_BadSpec {
-       Z_Specification *spec;
-       Z_DatabaseName *db; /* OPT */
-       int num_goodOnes;
-       Z_Specification **goodOnes; /* OPT */
-};
-
-struct Z_DbUnavail_0 {
-#define Z_DbUnavail_0_doesNotExist 0
-#define Z_DbUnavail_0_existsButUnavail 1
-#define Z_DbUnavail_0_locked 2
-#define Z_DbUnavail_0_accessDenied 3
-       int *reasonCode; /* OPT */
-       Z_InternationalString *message; /* OPT */
-};
-
-struct Z_DbUnavail {
-       Z_DatabaseName *db;
-       Z_DbUnavail_0 *why;
-};
-
-struct Z_Attribute {
-       Odr_oid *id;
-       int *type; /* OPT */
-       int *value; /* OPT */
-       Z_Term *term; /* OPT */
-};
-
-struct Z_AttCombo {
-       Z_AttributeList *unsupportedCombination;
-       int num_recommendedAlternatives;
-       Z_AttributeList **recommendedAlternatives; /* OPT */
-};
-
-struct Z_DiagTerm {
-#define Z_DiagTerm_codedValue 1
-#define Z_DiagTerm_unparsable 2
-#define Z_DiagTerm_tooShort 3
-#define Z_DiagTerm_type 4
-       int *problem; /* OPT */
-       Z_Term *term;
-};
-
-struct Z_Proximity {
-       int which;
-       union {
-               Odr_null *resultSets;
-               Z_InternationalString *badSet;
-               int *relation;
-               int *unit;
-               int *distance;
-               Z_AttributeList *attributes;
-               Odr_null *ordered;
-               Odr_null *exclusion;
-#define Z_Proximity_resultSets 1
-#define Z_Proximity_badSet 2
-#define Z_Proximity_relation 3
-#define Z_Proximity_unit 4
-#define Z_Proximity_distance 5
-#define Z_Proximity_attributes 6
-#define Z_Proximity_ordered 7
-#define Z_Proximity_exclusion 8
-       } u;
-};
-
-struct Z_AttrListList {
-       int num;
-       Z_AttributeList **elements;
-};
-
-struct Z_Scan {
-       int which;
-       union {
-               Odr_null *nonZeroStepSize;
-               Odr_null *specifiedStepSize;
-               Odr_null *termList1;
-               Z_AttrListList *termList2;
-#define Z_Scan_mustBeOne 1
-#define Z_Scan_mustBePositive 2
-#define Z_Scan_mustBeNonNegative 3
-#define Z_Scan_other 4
-               int *posInResponse;
-               Odr_null *resources;
-               Odr_null *endOfList;
-#define Z_Scan_nonZeroStepSize 1
-#define Z_Scan_specifiedStepSize 2
-#define Z_Scan_termList1 3
-#define Z_Scan_termList2 4
-#define Z_Scan_posInResponse 5
-#define Z_Scan_resources 6
-#define Z_Scan_endOfList 7
-       } u;
-};
-
-struct Z_StringList {
-       int num;
-       Z_InternationalString **elements;
-};
-
-struct Z_Sort {
-       int which;
-       union {
-               Odr_null *sequence;
-               Odr_null *noRsName;
-               int *tooMany;
-               Odr_null *incompatible;
-               Odr_null *generic;
-               Odr_null *dbSpecific;
-               Z_SortElement *sortElement;
-#define Z_Sort_tooMany 1
-#define Z_Sort_duplicate 2
-               int *key;
-               Odr_null *action;
-#define Z_Sort_relation 1
-#define Z_Sort_case 2
-#define Z_Sort_action 3
-#define Z_Sort_sort 4
-               int *illegal;
-               Z_StringList *inputTooLarge;
-               Odr_null *aggregateTooLarge;
-#define Z_SortD_sequence 1
-#define Z_SortD_noRsName 2
-#define Z_SortD_tooMany 3
-#define Z_SortD_incompatible 4
-#define Z_SortD_generic 5
-#define Z_SortD_dbSpecific 6
-#define Z_SortD_sortElement 7
-#define Z_SortD_key 8
-#define Z_SortD_action 9
-#define Z_SortD_illegal 10
-#define Z_SortD_inputTooLarge 11
-#define Z_SortD_aggregateTooLarge 12
-       } u;
-};
-
-struct Z_Segmentation {
-       int which;
-       union {
-               Odr_null *segmentCount;
-               int *segmentSize;
-#define Z_Segmentation_segmentCount 1
-#define Z_Segmentation_segmentSize 2
-       } u;
-};
-
-struct Z_ExtServices {
-       int which;
-       union {
-#define Z_ExtServices_nameInUse 1
-#define Z_ExtServices_noSuchName 2
-#define Z_ExtServices_quota 3
-#define Z_ExtServices_type 4
-               int *req;
-#define Z_ExtServices_id 1
-#define Z_ExtServices_modifyDelete 2
-               int *permission;
-#define Z_ExtServices_failed 1
-#define Z_ExtServices_service 2
-#define Z_ExtServices_parameters 3
-               int *immediate;
-#define Z_ExtServices_req 1
-#define Z_ExtServices_permission 2
-#define Z_ExtServices_immediate 3
-       } u;
-};
-
-struct Z_OidList {
-       int num;
-       Odr_oid **elements;
-};
-
-struct Z_AltOidList {
-       int num;
-       Odr_oid **elements;
-};
-
-struct Z_AccessCtrl {
-       int which;
-       union {
-               Odr_null *noUser;
-               Odr_null *refused;
-               Odr_null *simple;
-               Z_OidList *oid;
-               Z_AltOidList *alternative;
-               Odr_null *pwdInv;
-               Odr_null *pwdExp;
-#define Z_AccessCtrl_noUser 1
-#define Z_AccessCtrl_refused 2
-#define Z_AccessCtrl_simple 3
-#define Z_AccessCtrl_oid 4
-#define Z_AccessCtrl_alternative 5
-#define Z_AccessCtrl_pwdInv 6
-#define Z_AccessCtrl_pwdExp 7
-       } u;
-};
-
-struct Z_RecordSyntax {
-       Odr_oid *unsupportedSyntax;
-       int num_suggestedAlternatives;
-       Odr_oid **suggestedAlternatives; /* OPT */
-};
-
-struct Z_DiagFormat {
-       int which;
-       union {
-               Z_TooMany *tooMany;
-               Z_BadSpec *badSpec;
-               Z_DbUnavail *dbUnavail;
-#define Z_DiagFormat_and 0
-#define Z_DiagFormat_or 1
-#define Z_DiagFormat_and_not 2
-#define Z_DiagFormat_prox 3
-               int *unSupOp;
-               Z_Attribute *attribute;
-               Z_AttCombo *attCombo;
-               Z_DiagTerm *term;
-               Z_Proximity *proximity;
-               Z_Scan *scan;
-               Z_Sort *sort;
-               Z_Segmentation *segmentation;
-               Z_ExtServices *extServices;
-               Z_AccessCtrl *accessCtrl;
-               Z_RecordSyntax *recordSyntax;
-#define Z_DiagFormat_tooMany 1
-#define Z_DiagFormat_badSpec 2
-#define Z_DiagFormat_dbUnavail 3
-#define Z_DiagFormat_unSupOp 4
-#define Z_DiagFormat_attribute 5
-#define Z_DiagFormat_attCombo 6
-#define Z_DiagFormat_term 7
-#define Z_DiagFormat_proximity 8
-#define Z_DiagFormat_scan 9
-#define Z_DiagFormat_sort 10
-#define Z_DiagFormat_segmentation 11
-#define Z_DiagFormat_extServices 12
-#define Z_DiagFormat_accessCtrl 13
-#define Z_DiagFormat_recordSyntax 14
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-espec1.h b/include/yaz/z-espec1.h
deleted file mode 100644 (file)
index 35ba36c..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ElementSpecificationFormat-eSpec-1 */
-
-#ifndef z_espec1_H
-#define z_espec1_H
-
-#include <yaz/odr.h>
-#include <yaz/z-grs.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_Espec1 Z_Espec1;
-YAZ_EXPORT int z_Espec1 (ODR o, Z_Espec1 **p, int opt, const char *name);
-
-typedef struct Z_ElementRequestCompositeElementPrimitives Z_ElementRequestCompositeElementPrimitives;
-YAZ_EXPORT int z_ElementRequestCompositeElementPrimitives (ODR o, Z_ElementRequestCompositeElementPrimitives **p, int opt, const char *name);
-
-typedef struct Z_ElementRequestCompositeElementSpecs Z_ElementRequestCompositeElementSpecs;
-YAZ_EXPORT int z_ElementRequestCompositeElementSpecs (ODR o, Z_ElementRequestCompositeElementSpecs **p, int opt, const char *name);
-
-typedef struct Z_ElementRequestCompositeElement Z_ElementRequestCompositeElement;
-YAZ_EXPORT int z_ElementRequestCompositeElement (ODR o, Z_ElementRequestCompositeElement **p, int opt, const char *name);
-
-typedef struct Z_ElementRequest Z_ElementRequest;
-YAZ_EXPORT int z_ElementRequest (ODR o, Z_ElementRequest **p, int opt, const char *name);
-
-typedef struct Z_SimpleElement Z_SimpleElement;
-YAZ_EXPORT int z_SimpleElement (ODR o, Z_SimpleElement **p, int opt, const char *name);
-
-typedef struct Z_SpecificTag Z_SpecificTag;
-YAZ_EXPORT int z_SpecificTag (ODR o, Z_SpecificTag **p, int opt, const char *name);
-
-typedef struct Z_ETagUnit Z_ETagUnit;
-YAZ_EXPORT int z_ETagUnit (ODR o, Z_ETagUnit **p, int opt, const char *name);
-
-typedef struct Z_ETagPath Z_ETagPath;
-YAZ_EXPORT int z_ETagPath (ODR o, Z_ETagPath **p, int opt, const char *name);
-
-typedef struct Z_OccurValues Z_OccurValues;
-YAZ_EXPORT int z_OccurValues (ODR o, Z_OccurValues **p, int opt, const char *name);
-
-typedef struct Z_Occurrences Z_Occurrences;
-YAZ_EXPORT int z_Occurrences (ODR o, Z_Occurrences **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_Espec1 {
-       int num_elementSetNames;
-       Z_InternationalString **elementSetNames; /* OPT */
-       Odr_oid *defaultVariantSetId; /* OPT */
-       Z_Variant *defaultVariantRequest; /* OPT */
-       int *defaultTagType; /* OPT */
-       int num_elements;
-       Z_ElementRequest **elements; /* OPT */
-};
-
-struct Z_ElementRequestCompositeElementPrimitives {
-       int num;
-       Z_InternationalString **elements;
-};
-
-struct Z_ElementRequestCompositeElementSpecs {
-       int num;
-       Z_SimpleElement **elements;
-};
-
-struct Z_ElementRequestCompositeElement {
-       int which;
-       union {
-               Z_ElementRequestCompositeElementPrimitives *primitives;
-               Z_ElementRequestCompositeElementSpecs *specs;
-#define Z_ElementRequestCompositeElement_primitives 1
-#define Z_ElementRequestCompositeElement_specs 2
-       } u;
-       Z_ETagPath *deliveryTag;
-       Z_Variant *variantRequest; /* OPT */
-};
-
-struct Z_ElementRequest {
-       int which;
-       union {
-               Z_SimpleElement *simpleElement;
-               Z_ElementRequestCompositeElement *compositeElement;
-#define Z_ERequest_simpleElement 1
-#define Z_ERequest_compositeElement 2
-       } u;
-};
-
-struct Z_SimpleElement {
-       Z_ETagPath *path;
-       Z_Variant *variantRequest; /* OPT */
-};
-
-struct Z_SpecificTag {
-       int *tagType; /* OPT */
-       Z_StringOrNumeric *tagValue;
-       Z_Occurrences *occurrences; /* OPT */
-};
-
-struct Z_ETagUnit {
-       int which;
-       union {
-               Z_SpecificTag *specificTag;
-               Z_Occurrences *wildThing;
-               Odr_null *wildPath;
-#define Z_ETagUnit_specificTag 1
-#define Z_ETagUnit_wildThing 2
-#define Z_ETagUnit_wildPath 3
-       } u;
-};
-
-struct Z_ETagPath {
-       int num_tags;
-       Z_ETagUnit **tags;
-};
-
-struct Z_OccurValues {
-       int *start;
-       int *howMany; /* OPT */
-};
-
-struct Z_Occurrences {
-       int which;
-       union {
-               Odr_null *all;
-               Odr_null *last;
-               Z_OccurValues *values;
-#define Z_Occurrences_all 1
-#define Z_Occurrences_last 2
-#define Z_Occurrences_values 3
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-estask.h b/include/yaz/z-estask.h
deleted file mode 100644 (file)
index cbf8c0c..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H RecordSyntax-ESTaskPackage */
-
-#ifndef z_estask_H
-#define z_estask_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_TaskPackage Z_TaskPackage;
-YAZ_EXPORT int z_TaskPackage (ODR o, Z_TaskPackage **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_TaskPackage {
-       Odr_oid *packageType;
-       Z_InternationalString *packageName; /* OPT */
-       Z_InternationalString *userId; /* OPT */
-       Z_IntUnit *retentionTime; /* OPT */
-       Z_Permissions *permissions; /* OPT */
-       Z_InternationalString *description; /* OPT */
-       Odr_oct *targetReference; /* OPT */
-       char *creationDateTime; /* OPT */
-#define Z_TaskPackage_pending 0
-#define Z_TaskPackage_active 1
-#define Z_TaskPackage_complete 2
-#define Z_TaskPackage_aborted 3
-       int *taskStatus;
-       int num_packageDiagnostics;
-       Z_DiagRec **packageDiagnostics; /* OPT */
-       Z_External *taskSpecificParameters;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-exp.h b/include/yaz/z-exp.h
deleted file mode 100644 (file)
index 9d5ec12..0000000
+++ /dev/null
@@ -1,1012 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H RecordSyntax-explain */
-
-#ifndef z_exp_H
-#define z_exp_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_ExplainRecord Z_ExplainRecord;
-YAZ_EXPORT int z_ExplainRecord (ODR o, Z_ExplainRecord **p, int opt, const char *name);
-
-typedef struct Z_TargetInfo Z_TargetInfo;
-YAZ_EXPORT int z_TargetInfo (ODR o, Z_TargetInfo **p, int opt, const char *name);
-
-typedef struct Z_DatabaseInfo Z_DatabaseInfo;
-YAZ_EXPORT int z_DatabaseInfo (ODR o, Z_DatabaseInfo **p, int opt, const char *name);
-
-typedef struct Z_TagTypeMapping Z_TagTypeMapping;
-YAZ_EXPORT int z_TagTypeMapping (ODR o, Z_TagTypeMapping **p, int opt, const char *name);
-
-typedef struct Z_SchemaInfo Z_SchemaInfo;
-YAZ_EXPORT int z_SchemaInfo (ODR o, Z_SchemaInfo **p, int opt, const char *name);
-
-typedef struct Z_ElementInfo Z_ElementInfo;
-YAZ_EXPORT int z_ElementInfo (ODR o, Z_ElementInfo **p, int opt, const char *name);
-
-typedef struct Z_PathUnit Z_PathUnit;
-YAZ_EXPORT int z_PathUnit (ODR o, Z_PathUnit **p, int opt, const char *name);
-
-typedef struct Z_Path Z_Path;
-YAZ_EXPORT int z_Path (ODR o, Z_Path **p, int opt, const char *name);
-
-typedef struct Z_ElementInfoList Z_ElementInfoList;
-YAZ_EXPORT int z_ElementInfoList (ODR o, Z_ElementInfoList **p, int opt, const char *name);
-
-typedef struct Z_ElementDataType Z_ElementDataType;
-YAZ_EXPORT int z_ElementDataType (ODR o, Z_ElementDataType **p, int opt, const char *name);
-
-typedef int  Z_PrimitiveDataType;
-YAZ_EXPORT int z_PrimitiveDataType (ODR o, Z_PrimitiveDataType **p, int opt, const char *name);
-
-typedef struct Z_TagSetElements Z_TagSetElements;
-YAZ_EXPORT int z_TagSetElements (ODR o, Z_TagSetElements **p, int opt, const char *name);
-
-typedef struct Z_TagSetInfo Z_TagSetInfo;
-YAZ_EXPORT int z_TagSetInfo (ODR o, Z_TagSetInfo **p, int opt, const char *name);
-
-typedef struct Z_RecordSyntaxInfo Z_RecordSyntaxInfo;
-YAZ_EXPORT int z_RecordSyntaxInfo (ODR o, Z_RecordSyntaxInfo **p, int opt, const char *name);
-
-typedef struct Z_AttributeSetInfo Z_AttributeSetInfo;
-YAZ_EXPORT int z_AttributeSetInfo (ODR o, Z_AttributeSetInfo **p, int opt, const char *name);
-
-typedef struct Z_AttributeType Z_AttributeType;
-YAZ_EXPORT int z_AttributeType (ODR o, Z_AttributeType **p, int opt, const char *name);
-
-typedef struct Z_AttributeDescription Z_AttributeDescription;
-YAZ_EXPORT int z_AttributeDescription (ODR o, Z_AttributeDescription **p, int opt, const char *name);
-
-typedef struct Z_TermListElement Z_TermListElement;
-YAZ_EXPORT int z_TermListElement (ODR o, Z_TermListElement **p, int opt, const char *name);
-
-typedef struct Z_TermListInfo Z_TermListInfo;
-YAZ_EXPORT int z_TermListInfo (ODR o, Z_TermListInfo **p, int opt, const char *name);
-
-typedef struct Z_ExtendedServicesInfo Z_ExtendedServicesInfo;
-YAZ_EXPORT int z_ExtendedServicesInfo (ODR o, Z_ExtendedServicesInfo **p, int opt, const char *name);
-
-typedef struct Z_AttributeDetails Z_AttributeDetails;
-YAZ_EXPORT int z_AttributeDetails (ODR o, Z_AttributeDetails **p, int opt, const char *name);
-
-typedef struct Z_AttributeSetDetails Z_AttributeSetDetails;
-YAZ_EXPORT int z_AttributeSetDetails (ODR o, Z_AttributeSetDetails **p, int opt, const char *name);
-
-typedef struct Z_AttributeTypeDetails Z_AttributeTypeDetails;
-YAZ_EXPORT int z_AttributeTypeDetails (ODR o, Z_AttributeTypeDetails **p, int opt, const char *name);
-
-typedef struct Z_OmittedAttributeInterpretation Z_OmittedAttributeInterpretation;
-YAZ_EXPORT int z_OmittedAttributeInterpretation (ODR o, Z_OmittedAttributeInterpretation **p, int opt, const char *name);
-
-typedef struct Z_AttributeValue Z_AttributeValue;
-YAZ_EXPORT int z_AttributeValue (ODR o, Z_AttributeValue **p, int opt, const char *name);
-
-typedef struct Z_EScanInfo Z_EScanInfo;
-YAZ_EXPORT int z_EScanInfo (ODR o, Z_EScanInfo **p, int opt, const char *name);
-
-typedef struct Z_TermListDetails Z_TermListDetails;
-YAZ_EXPORT int z_TermListDetails (ODR o, Z_TermListDetails **p, int opt, const char *name);
-
-typedef struct Z_ElementSetDetails Z_ElementSetDetails;
-YAZ_EXPORT int z_ElementSetDetails (ODR o, Z_ElementSetDetails **p, int opt, const char *name);
-
-typedef struct Z_RetrievalRecordDetails Z_RetrievalRecordDetails;
-YAZ_EXPORT int z_RetrievalRecordDetails (ODR o, Z_RetrievalRecordDetails **p, int opt, const char *name);
-
-typedef struct Z_PerElementDetails Z_PerElementDetails;
-YAZ_EXPORT int z_PerElementDetails (ODR o, Z_PerElementDetails **p, int opt, const char *name);
-
-typedef struct Z_RecordTag Z_RecordTag;
-YAZ_EXPORT int z_RecordTag (ODR o, Z_RecordTag **p, int opt, const char *name);
-
-typedef struct Z_SortDetails Z_SortDetails;
-YAZ_EXPORT int z_SortDetails (ODR o, Z_SortDetails **p, int opt, const char *name);
-
-typedef struct Z_SortKeyDetails Z_SortKeyDetails;
-YAZ_EXPORT int z_SortKeyDetails (ODR o, Z_SortKeyDetails **p, int opt, const char *name);
-
-typedef struct Z_ProcessingInformation Z_ProcessingInformation;
-YAZ_EXPORT int z_ProcessingInformation (ODR o, Z_ProcessingInformation **p, int opt, const char *name);
-
-typedef struct Z_VariantSetInfo Z_VariantSetInfo;
-YAZ_EXPORT int z_VariantSetInfo (ODR o, Z_VariantSetInfo **p, int opt, const char *name);
-
-typedef struct Z_VariantClass Z_VariantClass;
-YAZ_EXPORT int z_VariantClass (ODR o, Z_VariantClass **p, int opt, const char *name);
-
-typedef struct Z_VariantType Z_VariantType;
-YAZ_EXPORT int z_VariantType (ODR o, Z_VariantType **p, int opt, const char *name);
-
-typedef struct Z_VariantValue Z_VariantValue;
-YAZ_EXPORT int z_VariantValue (ODR o, Z_VariantValue **p, int opt, const char *name);
-
-typedef struct Z_ValueSetEnumerated Z_ValueSetEnumerated;
-YAZ_EXPORT int z_ValueSetEnumerated (ODR o, Z_ValueSetEnumerated **p, int opt, const char *name);
-
-typedef struct Z_ValueSet Z_ValueSet;
-YAZ_EXPORT int z_ValueSet (ODR o, Z_ValueSet **p, int opt, const char *name);
-
-typedef struct Z_ValueRange Z_ValueRange;
-YAZ_EXPORT int z_ValueRange (ODR o, Z_ValueRange **p, int opt, const char *name);
-
-typedef struct Z_ValueDescription Z_ValueDescription;
-YAZ_EXPORT int z_ValueDescription (ODR o, Z_ValueDescription **p, int opt, const char *name);
-
-typedef struct Z_UnitInfo Z_UnitInfo;
-YAZ_EXPORT int z_UnitInfo (ODR o, Z_UnitInfo **p, int opt, const char *name);
-
-typedef struct Z_UnitType Z_UnitType;
-YAZ_EXPORT int z_UnitType (ODR o, Z_UnitType **p, int opt, const char *name);
-
-typedef struct Z_Units Z_Units;
-YAZ_EXPORT int z_Units (ODR o, Z_Units **p, int opt, const char *name);
-
-typedef struct Z_CategoryList Z_CategoryList;
-YAZ_EXPORT int z_CategoryList (ODR o, Z_CategoryList **p, int opt, const char *name);
-
-typedef struct Z_CategoryInfo Z_CategoryInfo;
-YAZ_EXPORT int z_CategoryInfo (ODR o, Z_CategoryInfo **p, int opt, const char *name);
-
-typedef struct Z_CommonInfo Z_CommonInfo;
-YAZ_EXPORT int z_CommonInfo (ODR o, Z_CommonInfo **p, int opt, const char *name);
-
-typedef struct Z_HumanStringUnit Z_HumanStringUnit;
-YAZ_EXPORT int z_HumanStringUnit (ODR o, Z_HumanStringUnit **p, int opt, const char *name);
-
-typedef struct Z_HumanString Z_HumanString;
-YAZ_EXPORT int z_HumanString (ODR o, Z_HumanString **p, int opt, const char *name);
-
-typedef struct Z_IconObjectUnit Z_IconObjectUnit;
-YAZ_EXPORT int z_IconObjectUnit (ODR o, Z_IconObjectUnit **p, int opt, const char *name);
-
-typedef struct Z_IconObject Z_IconObject;
-YAZ_EXPORT int z_IconObject (ODR o, Z_IconObject **p, int opt, const char *name);
-
-typedef Z_InternationalString  Z_LanguageCode;
-YAZ_EXPORT int z_LanguageCode (ODR o, Z_LanguageCode **p, int opt, const char *name);
-
-typedef struct Z_ContactInfo Z_ContactInfo;
-YAZ_EXPORT int z_ContactInfo (ODR o, Z_ContactInfo **p, int opt, const char *name);
-
-typedef struct Z_NetworkAddressIA Z_NetworkAddressIA;
-YAZ_EXPORT int z_NetworkAddressIA (ODR o, Z_NetworkAddressIA **p, int opt, const char *name);
-
-typedef struct Z_NetworkAddressOPA Z_NetworkAddressOPA;
-YAZ_EXPORT int z_NetworkAddressOPA (ODR o, Z_NetworkAddressOPA **p, int opt, const char *name);
-
-typedef struct Z_NetworkAddressOther Z_NetworkAddressOther;
-YAZ_EXPORT int z_NetworkAddressOther (ODR o, Z_NetworkAddressOther **p, int opt, const char *name);
-
-typedef struct Z_NetworkAddress Z_NetworkAddress;
-YAZ_EXPORT int z_NetworkAddress (ODR o, Z_NetworkAddress **p, int opt, const char *name);
-
-typedef struct Z_AccessInfo Z_AccessInfo;
-YAZ_EXPORT int z_AccessInfo (ODR o, Z_AccessInfo **p, int opt, const char *name);
-
-typedef struct Z_QueryTypeDetails Z_QueryTypeDetails;
-YAZ_EXPORT int z_QueryTypeDetails (ODR o, Z_QueryTypeDetails **p, int opt, const char *name);
-
-typedef struct Z_PrivateCapOperator Z_PrivateCapOperator;
-YAZ_EXPORT int z_PrivateCapOperator (ODR o, Z_PrivateCapOperator **p, int opt, const char *name);
-
-typedef struct Z_PrivateCapabilities Z_PrivateCapabilities;
-YAZ_EXPORT int z_PrivateCapabilities (ODR o, Z_PrivateCapabilities **p, int opt, const char *name);
-
-typedef struct Z_RpnCapabilities Z_RpnCapabilities;
-YAZ_EXPORT int z_RpnCapabilities (ODR o, Z_RpnCapabilities **p, int opt, const char *name);
-
-typedef struct Z_Iso8777Capabilities Z_Iso8777Capabilities;
-YAZ_EXPORT int z_Iso8777Capabilities (ODR o, Z_Iso8777Capabilities **p, int opt, const char *name);
-
-typedef struct Z_ProxSupportPrivate Z_ProxSupportPrivate;
-YAZ_EXPORT int z_ProxSupportPrivate (ODR o, Z_ProxSupportPrivate **p, int opt, const char *name);
-
-typedef struct Z_ProxSupportUnit Z_ProxSupportUnit;
-YAZ_EXPORT int z_ProxSupportUnit (ODR o, Z_ProxSupportUnit **p, int opt, const char *name);
-
-typedef struct Z_ProximitySupport Z_ProximitySupport;
-YAZ_EXPORT int z_ProximitySupport (ODR o, Z_ProximitySupport **p, int opt, const char *name);
-
-typedef struct Z_SearchKey Z_SearchKey;
-YAZ_EXPORT int z_SearchKey (ODR o, Z_SearchKey **p, int opt, const char *name);
-
-typedef struct Z_AccessRestrictionsUnit Z_AccessRestrictionsUnit;
-YAZ_EXPORT int z_AccessRestrictionsUnit (ODR o, Z_AccessRestrictionsUnit **p, int opt, const char *name);
-
-typedef struct Z_AccessRestrictions Z_AccessRestrictions;
-YAZ_EXPORT int z_AccessRestrictions (ODR o, Z_AccessRestrictions **p, int opt, const char *name);
-
-typedef struct Z_CostsOtherCharge Z_CostsOtherCharge;
-YAZ_EXPORT int z_CostsOtherCharge (ODR o, Z_CostsOtherCharge **p, int opt, const char *name);
-
-typedef struct Z_Costs Z_Costs;
-YAZ_EXPORT int z_Costs (ODR o, Z_Costs **p, int opt, const char *name);
-
-typedef struct Z_Charge Z_Charge;
-YAZ_EXPORT int z_Charge (ODR o, Z_Charge **p, int opt, const char *name);
-
-typedef struct Z_DatabaseList Z_DatabaseList;
-YAZ_EXPORT int z_DatabaseList (ODR o, Z_DatabaseList **p, int opt, const char *name);
-
-typedef struct Z_AttributeCombinations Z_AttributeCombinations;
-YAZ_EXPORT int z_AttributeCombinations (ODR o, Z_AttributeCombinations **p, int opt, const char *name);
-
-typedef struct Z_AttributeCombination Z_AttributeCombination;
-YAZ_EXPORT int z_AttributeCombination (ODR o, Z_AttributeCombination **p, int opt, const char *name);
-
-typedef struct Z_AttributeValueList Z_AttributeValueList;
-YAZ_EXPORT int z_AttributeValueList (ODR o, Z_AttributeValueList **p, int opt, const char *name);
-
-typedef struct Z_AttributeOccurrence Z_AttributeOccurrence;
-YAZ_EXPORT int z_AttributeOccurrence (ODR o, Z_AttributeOccurrence **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_ExplainRecord {
-       int which;
-       union {
-               Z_TargetInfo *targetInfo;
-               Z_DatabaseInfo *databaseInfo;
-               Z_SchemaInfo *schemaInfo;
-               Z_TagSetInfo *tagSetInfo;
-               Z_RecordSyntaxInfo *recordSyntaxInfo;
-               Z_AttributeSetInfo *attributeSetInfo;
-               Z_TermListInfo *termListInfo;
-               Z_ExtendedServicesInfo *extendedServicesInfo;
-               Z_AttributeDetails *attributeDetails;
-               Z_TermListDetails *termListDetails;
-               Z_ElementSetDetails *elementSetDetails;
-               Z_RetrievalRecordDetails *retrievalRecordDetails;
-               Z_SortDetails *sortDetails;
-               Z_ProcessingInformation *processing;
-               Z_VariantSetInfo *variants;
-               Z_UnitInfo *units;
-               Z_CategoryList *categoryList;
-#define Z_Explain_targetInfo 1
-#define Z_Explain_databaseInfo 2
-#define Z_Explain_schemaInfo 3
-#define Z_Explain_tagSetInfo 4
-#define Z_Explain_recordSyntaxInfo 5
-#define Z_Explain_attributeSetInfo 6
-#define Z_Explain_termListInfo 7
-#define Z_Explain_extendedServicesInfo 8
-#define Z_Explain_attributeDetails 9
-#define Z_Explain_termListDetails 10
-#define Z_Explain_elementSetDetails 11
-#define Z_Explain_retrievalRecordDetails 12
-#define Z_Explain_sortDetails 13
-#define Z_Explain_processing 14
-#define Z_Explain_variants 15
-#define Z_Explain_units 16
-#define Z_Explain_categoryList 17
-       } u;
-};
-
-struct Z_TargetInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_InternationalString *name;
-       Z_HumanString *recentNews; /* OPT */
-       Z_IconObject *icon; /* OPT */
-       bool_t *namedResultSets;
-       bool_t *multipleDBsearch;
-       int *maxResultSets; /* OPT */
-       int *maxResultSize; /* OPT */
-       int *maxTerms; /* OPT */
-       Z_IntUnit *timeoutInterval; /* OPT */
-       Z_HumanString *welcomeMessage; /* OPT */
-       Z_ContactInfo *contactInfo; /* OPT */
-       Z_HumanString *description; /* OPT */
-       int num_nicknames;
-       Z_InternationalString **nicknames; /* OPT */
-       Z_HumanString *usageRest; /* OPT */
-       Z_HumanString *paymentAddr; /* OPT */
-       Z_HumanString *hours; /* OPT */
-       int num_dbCombinations;
-       Z_DatabaseList **dbCombinations; /* OPT */
-       int num_addresses;
-       Z_NetworkAddress **addresses; /* OPT */
-       int num_languages;
-       Z_InternationalString **languages; /* OPT */
-       Z_AccessInfo *commonAccessInfo; /* OPT */
-};
-
-struct Z_DatabaseInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *name;
-       Odr_null *explainDatabase; /* OPT */
-       int num_nicknames;
-       Z_DatabaseName **nicknames; /* OPT */
-       Z_IconObject *icon; /* OPT */
-       bool_t *userFee;
-       bool_t *available;
-       Z_HumanString *titleString; /* OPT */
-       int num_keywords;
-       Z_HumanString **keywords; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_DatabaseList *associatedDbs; /* OPT */
-       Z_DatabaseList *subDbs; /* OPT */
-       Z_HumanString *disclaimers; /* OPT */
-       Z_HumanString *news; /* OPT */
-       int which;
-       union {
-               int *actualNumber;
-               int *approxNumber;
-#define Z_DatabaseInfo_actualNumber 1
-#define Z_DatabaseInfo_approxNumber 2
-       } u; /* OPT */
-       Z_HumanString *defaultOrder; /* OPT */
-       int *avRecordSize; /* OPT */
-       int *maxRecordSize; /* OPT */
-       Z_HumanString *hours; /* OPT */
-       Z_HumanString *bestTime; /* OPT */
-       char *lastUpdate; /* OPT */
-       Z_IntUnit *updateInterval; /* OPT */
-       Z_HumanString *coverage; /* OPT */
-       bool_t *proprietary; /* OPT */
-       Z_HumanString *copyrightText; /* OPT */
-       Z_HumanString *copyrightNotice; /* OPT */
-       Z_ContactInfo *producerContactInfo; /* OPT */
-       Z_ContactInfo *supplierContactInfo; /* OPT */
-       Z_ContactInfo *submissionContactInfo; /* OPT */
-       Z_AccessInfo *accessInfo; /* OPT */
-};
-
-struct Z_TagTypeMapping {
-       int *tagType;
-       Odr_oid *tagSet; /* OPT */
-       Odr_null *defaultTagType; /* OPT */
-};
-
-struct Z_SchemaInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Odr_oid *schema;
-       Z_InternationalString *name;
-       Z_HumanString *description; /* OPT */
-       int num_tagTypeMapping;
-       Z_TagTypeMapping **tagTypeMapping; /* OPT */
-       int num_recordStructure;
-       Z_ElementInfo **recordStructure; /* OPT */
-};
-
-struct Z_ElementInfo {
-       Z_InternationalString *elementName;
-       Z_Path *elementTagPath;
-       Z_ElementDataType *dataType; /* OPT */
-       bool_t *required;
-       bool_t *repeatable;
-       Z_HumanString *description; /* OPT */
-};
-
-struct Z_PathUnit {
-       int *tagType;
-       Z_StringOrNumeric *tagValue;
-};
-
-struct Z_Path {
-       int num;
-       Z_PathUnit **elements;
-};
-
-struct Z_ElementInfoList {
-       int num;
-       Z_ElementInfo **elements;
-};
-
-struct Z_ElementDataType {
-       int which;
-       union {
-               Z_PrimitiveDataType *primitive;
-               Z_ElementInfoList *structured;
-#define Z_ElementDataType_primitive 1
-#define Z_ElementDataType_structured 2
-       } u;
-};
-
-#define Z_PrimitiveDataType_octetString 0
-#define Z_PrimitiveDataType_numeric 1
-#define Z_PrimitiveDataType_date 2
-#define Z_PrimitiveDataType_external 3
-#define Z_PrimitiveDataType_string 4
-#define Z_PrimitiveDataType_trueOrFalse 5
-#define Z_PrimitiveDataType_oid 6
-#define Z_PrimitiveDataType_intUnit 7
-#define Z_PrimitiveDataType_empty 8
-#define Z_PrimitiveDataType_noneOfTheAbove 100
-
-struct Z_TagSetElements {
-       Z_InternationalString *elementname;
-       int num_nicknames;
-       Z_InternationalString **nicknames; /* OPT */
-       Z_StringOrNumeric *elementTag;
-       Z_HumanString *description; /* OPT */
-       Z_PrimitiveDataType *dataType; /* OPT */
-       Z_OtherInformation *otherTagInfo; /* OPT */
-};
-
-struct Z_TagSetInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Odr_oid *tagSet;
-       Z_InternationalString *name;
-       Z_HumanString *description; /* OPT */
-       int num_elements;
-       Z_TagSetElements **elements; /* OPT */
-};
-
-struct Z_RecordSyntaxInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Odr_oid *recordSyntax;
-       Z_InternationalString *name;
-       int num_transferSyntaxes;
-       Odr_oid **transferSyntaxes; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_InternationalString *asn1Module; /* OPT */
-       int num_abstractStructure;
-       Z_ElementInfo **abstractStructure; /* OPT */
-};
-
-struct Z_AttributeSetInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_AttributeSetId *attributeSet;
-       Z_InternationalString *name;
-       int num_attributes;
-       Z_AttributeType **attributes; /* OPT */
-       Z_HumanString *description; /* OPT */
-};
-
-struct Z_AttributeType {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       int *attributeType;
-       int num_attributeValues;
-       Z_AttributeDescription **attributeValues;
-};
-
-struct Z_AttributeDescription {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_StringOrNumeric *attributeValue;
-       int num_equivalentAttributes;
-       Z_StringOrNumeric **equivalentAttributes; /* OPT */
-};
-
-struct Z_TermListElement {
-       Z_InternationalString *name;
-       Z_HumanString *title; /* OPT */
-#define Z_TermListElement_optimized 0
-#define Z_TermListElement_normal 1
-#define Z_TermListElement_expensive 2
-#define Z_TermListElement_filter 3
-       int *searchCost; /* OPT */
-       bool_t *scanable;
-       int num_broader;
-       Z_InternationalString **broader; /* OPT */
-       int num_narrower;
-       Z_InternationalString **narrower; /* OPT */
-};
-
-struct Z_TermListInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *databaseName;
-       int num_termLists;
-       Z_TermListElement **termLists;
-};
-
-struct Z_ExtendedServicesInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Odr_oid *type;
-       Z_InternationalString *name; /* OPT */
-       bool_t *privateType;
-       bool_t *restrictionsApply;
-       bool_t *feeApply;
-       bool_t *available;
-       bool_t *retentionSupported;
-#define Z_ExtendedServicesInfo_waitSupported 1
-#define Z_ExtendedServicesInfo_waitAlways 2
-#define Z_ExtendedServicesInfo_waitNotSupported 3
-#define Z_ExtendedServicesInfo_depends 4
-#define Z_ExtendedServicesInfo_notSaying 5
-       int *waitAction;
-       Z_HumanString *description; /* OPT */
-       Z_External *specificExplain; /* OPT */
-       Z_InternationalString *esASN; /* OPT */
-};
-
-struct Z_AttributeDetails {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *databaseName;
-       int num_attributesBySet;
-       Z_AttributeSetDetails **attributesBySet; /* OPT */
-       Z_AttributeCombinations *attributeCombinations; /* OPT */
-};
-
-struct Z_AttributeSetDetails {
-       Z_AttributeSetId *attributeSet;
-       int num_attributesByType;
-       Z_AttributeTypeDetails **attributesByType;
-};
-
-struct Z_AttributeTypeDetails {
-       int *attributeType;
-       Z_OmittedAttributeInterpretation *defaultIfOmitted; /* OPT */
-       int num_attributeValues;
-       Z_AttributeValue **attributeValues; /* OPT */
-};
-
-struct Z_OmittedAttributeInterpretation {
-       Z_StringOrNumeric *defaultValue; /* OPT */
-       Z_HumanString *defaultDescription; /* OPT */
-};
-
-struct Z_AttributeValue {
-       Z_StringOrNumeric *value;
-       Z_HumanString *description; /* OPT */
-       int num_subAttributes;
-       Z_StringOrNumeric **subAttributes; /* OPT */
-       int num_superAttributes;
-       Z_StringOrNumeric **superAttributes; /* OPT */
-       Odr_null *partialSupport; /* OPT */
-};
-
-struct Z_EScanInfo {
-       int *maxStepSize; /* OPT */
-       Z_HumanString *collatingSequence; /* OPT */
-       bool_t *increasing; /* OPT */
-};
-
-struct Z_TermListDetails {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_InternationalString *termListName;
-       Z_HumanString *description; /* OPT */
-       Z_AttributeCombinations *attributes; /* OPT */
-       Z_EScanInfo *scanInfo; /* OPT */
-       int *estNumberTerms; /* OPT */
-       int num_sampleTerms;
-       Z_Term **sampleTerms; /* OPT */
-};
-
-struct Z_ElementSetDetails {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *databaseName;
-       Z_ElementSetName *elementSetName;
-       Odr_oid *recordSyntax;
-       Odr_oid *schema;
-       Z_HumanString *description; /* OPT */
-       int num_detailsPerElement;
-       Z_PerElementDetails **detailsPerElement; /* OPT */
-};
-
-struct Z_RetrievalRecordDetails {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *databaseName;
-       Odr_oid *schema;
-       Odr_oid *recordSyntax;
-       Z_HumanString *description; /* OPT */
-       int num_detailsPerElement;
-       Z_PerElementDetails **detailsPerElement; /* OPT */
-};
-
-struct Z_PerElementDetails {
-       Z_InternationalString *name; /* OPT */
-       Z_RecordTag *recordTag; /* OPT */
-       int num_schemaTags;
-       Z_Path **schemaTags; /* OPT */
-       int *maxSize; /* OPT */
-       int *minSize; /* OPT */
-       int *avgSize; /* OPT */
-       int *fixedSize; /* OPT */
-       bool_t *repeatable;
-       bool_t *required;
-       Z_HumanString *description; /* OPT */
-       Z_HumanString *contents; /* OPT */
-       Z_HumanString *billingInfo; /* OPT */
-       Z_HumanString *restrictions; /* OPT */
-       int num_alternateNames;
-       Z_InternationalString **alternateNames; /* OPT */
-       int num_genericNames;
-       Z_InternationalString **genericNames; /* OPT */
-       Z_AttributeCombinations *searchAccess; /* OPT */
-};
-
-struct Z_RecordTag {
-       Z_StringOrNumeric *qualifier; /* OPT */
-       Z_StringOrNumeric *tagValue;
-};
-
-struct Z_SortDetails {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *databaseName;
-       int num_sortKeys;
-       Z_SortKeyDetails **sortKeys; /* OPT */
-};
-
-struct Z_SortKeyDetails {
-       Z_HumanString *description; /* OPT */
-       int num_elementSpecifications;
-       Z_Specification **elementSpecifications; /* OPT */
-       Z_AttributeCombinations *attributeSpecifications; /* OPT */
-       int which;
-       union {
-               Odr_null *character;
-               Odr_null *numeric;
-               Z_HumanString *structured;
-#define Z_SortKeyDetails_character 1
-#define Z_SortKeyDetails_numeric 2
-#define Z_SortKeyDetails_structured 3
-       } u; /* OPT */
-#define Z_SortKeyDetails_always 0
-#define Z_SortKeyDetails_never 1
-#define Z_SortKeyDetails_default_yes 2
-#define Z_SortKeyDetails_default_no 3
-       int *caseSensitivity; /* OPT */
-};
-
-struct Z_ProcessingInformation {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_DatabaseName *databaseName;
-#define Z_ProcessingInformation_access 0
-#define Z_ProcessingInformation_search 1
-#define Z_ProcessingInformation_retrieval 2
-#define Z_ProcessingInformation_record_presentation 3
-#define Z_ProcessingInformation_record_handling 4
-       int *processingContext;
-       Z_InternationalString *name;
-       Odr_oid *oid;
-       Z_HumanString *description; /* OPT */
-       Z_External *instructions; /* OPT */
-};
-
-struct Z_VariantSetInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Odr_oid *variantSet;
-       Z_InternationalString *name;
-       int num_variants;
-       Z_VariantClass **variants; /* OPT */
-};
-
-struct Z_VariantClass {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       int *variantClass;
-       int num_variantTypes;
-       Z_VariantType **variantTypes;
-};
-
-struct Z_VariantType {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       int *variantType;
-       Z_VariantValue *variantValue; /* OPT */
-};
-
-struct Z_VariantValue {
-       Z_PrimitiveDataType *dataType;
-       Z_ValueSet *values; /* OPT */
-};
-
-struct Z_ValueSetEnumerated {
-       int num;
-       Z_ValueDescription **elements;
-};
-
-struct Z_ValueSet {
-       int which;
-       union {
-               Z_ValueRange *range;
-               Z_ValueSetEnumerated *enumerated;
-#define Z_ValueSet_range 1
-#define Z_ValueSet_enumerated 2
-       } u;
-};
-
-struct Z_ValueRange {
-       Z_ValueDescription *lower; /* OPT */
-       Z_ValueDescription *upper; /* OPT */
-};
-
-struct Z_ValueDescription {
-       int which;
-       union {
-               int *integer;
-               Z_InternationalString *string;
-               Odr_oct *octets;
-               Odr_oid *oid;
-               Z_Unit *unit;
-               Z_IntUnit *valueAndUnit;
-#define Z_ValueDescription_integer 1
-#define Z_ValueDescription_string 2
-#define Z_ValueDescription_octets 3
-#define Z_ValueDescription_oid 4
-#define Z_ValueDescription_unit 5
-#define Z_ValueDescription_valueAndUnit 6
-       } u;
-};
-
-struct Z_UnitInfo {
-       Z_CommonInfo *commonInfo; /* OPT */
-       Z_InternationalString *unitSystem;
-       Z_HumanString *description; /* OPT */
-       int num_units;
-       Z_UnitType **units; /* OPT */
-};
-
-struct Z_UnitType {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_StringOrNumeric *unitType;
-       int num_units;
-       Z_Units **units;
-};
-
-struct Z_Units {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_StringOrNumeric *unit;
-};
-
-struct Z_CategoryList {
-       Z_CommonInfo *commonInfo; /* OPT */
-       int num_categories;
-       Z_CategoryInfo **categories;
-};
-
-struct Z_CategoryInfo {
-       Z_InternationalString *category;
-       Z_InternationalString *originalCategory; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_InternationalString *asn1Module; /* OPT */
-};
-
-struct Z_CommonInfo {
-       char *dateAdded; /* OPT */
-       char *dateChanged; /* OPT */
-       char *expiry; /* OPT */
-       Z_LanguageCode *humanStringLanguage; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_HumanStringUnit {
-       Z_LanguageCode *language; /* OPT */
-       Z_InternationalString *text;
-};
-
-struct Z_HumanString {
-       int num_strings;
-       Z_HumanStringUnit **strings;
-};
-
-struct Z_IconObjectUnit {
-       int which;
-       union {
-               Z_InternationalString *ianaType;
-               Z_InternationalString *z3950type;
-               Z_InternationalString *otherType;
-#define Z_IconObjectUnit_ianaType 1
-#define Z_IconObjectUnit_z3950type 2
-#define Z_IconObjectUnit_otherType 3
-       } u;
-       Odr_oct *content;
-};
-
-struct Z_IconObject {
-       int num;
-       Z_IconObjectUnit **elements;
-};
-
-
-
-struct Z_ContactInfo {
-       Z_InternationalString *name; /* OPT */
-       Z_HumanString *description; /* OPT */
-       Z_HumanString *address; /* OPT */
-       Z_InternationalString *email; /* OPT */
-       Z_InternationalString *phone; /* OPT */
-};
-
-struct Z_NetworkAddressIA {
-       Z_InternationalString *hostAddress;
-       int *port;
-};
-
-struct Z_NetworkAddressOPA {
-       Z_InternationalString *pSel;
-       Z_InternationalString *sSel; /* OPT */
-       Z_InternationalString *tSel; /* OPT */
-       Z_InternationalString *nSap;
-};
-
-struct Z_NetworkAddressOther {
-       Z_InternationalString *type;
-       Z_InternationalString *address;
-};
-
-struct Z_NetworkAddress {
-       int which;
-       union {
-               Z_NetworkAddressIA *internetAddress;
-               Z_NetworkAddressOPA *osiPresentationAddress;
-               Z_NetworkAddressOther *other;
-#define Z_NetworkAddress_iA 1
-#define Z_NetworkAddress_oPA 2
-#define Z_NetworkAddress_other 3
-       } u;
-};
-
-struct Z_AccessInfo {
-       int num_queryTypesSupported;
-       Z_QueryTypeDetails **queryTypesSupported; /* OPT */
-       int num_diagnosticsSets;
-       Odr_oid **diagnosticsSets; /* OPT */
-       int num_attributeSetIds;
-       Z_AttributeSetId **attributeSetIds; /* OPT */
-       int num_schemas;
-       Odr_oid **schemas; /* OPT */
-       int num_recordSyntaxes;
-       Odr_oid **recordSyntaxes; /* OPT */
-       int num_resourceChallenges;
-       Odr_oid **resourceChallenges; /* OPT */
-       Z_AccessRestrictions *restrictedAccess; /* OPT */
-       Z_Costs *costInfo; /* OPT */
-       int num_variantSets;
-       Odr_oid **variantSets; /* OPT */
-       int num_elementSetNames;
-       Z_ElementSetName **elementSetNames; /* OPT */
-       int num_unitSystems;
-       Z_InternationalString **unitSystems;
-};
-
-struct Z_QueryTypeDetails {
-       int which;
-       union {
-               Z_PrivateCapabilities *zprivate;
-               Z_RpnCapabilities *rpn;
-               Z_Iso8777Capabilities *iso8777;
-               Z_HumanString *z39_58;
-               Z_RpnCapabilities *erpn;
-               Z_HumanString *rankedList;
-#define Z_QueryTypeDetails_private 1
-#define Z_QueryTypeDetails_rpn 2
-#define Z_QueryTypeDetails_iso8777 3
-#define Z_QueryTypeDetails_z39_58 4
-#define Z_QueryTypeDetails_erpn 5
-#define Z_QueryTypeDetails_rankedList 6
-       } u;
-};
-
-struct Z_PrivateCapOperator {
-       Z_InternationalString *roperator;
-       Z_HumanString *description; /* OPT */
-};
-
-struct Z_PrivateCapabilities {
-       int num_operators;
-       Z_PrivateCapOperator **operators; /* OPT */
-       int num_searchKeys;
-       Z_SearchKey **searchKeys; /* OPT */
-       int num_description;
-       Z_HumanString **description; /* OPT */
-};
-
-struct Z_RpnCapabilities {
-       int num_operators;
-       int **operators; /* OPT */
-       bool_t *resultSetAsOperandSupported;
-       bool_t *restrictionOperandSupported;
-       Z_ProximitySupport *proximity; /* OPT */
-};
-
-struct Z_Iso8777Capabilities {
-       int num_searchKeys;
-       Z_SearchKey **searchKeys;
-       Z_HumanString *restrictions; /* OPT */
-};
-
-struct Z_ProxSupportPrivate {
-       int *unit;
-       Z_HumanString *description; /* OPT */
-};
-
-struct Z_ProxSupportUnit {
-       int which;
-       union {
-               int *known;
-               Z_ProxSupportPrivate *zprivate;
-#define Z_ProxSupportUnit_known 1
-#define Z_ProxSupportUnit_private 2
-       } u;
-};
-
-struct Z_ProximitySupport {
-       bool_t *anySupport;
-       int num_unitsSupported;
-       Z_ProxSupportUnit **unitsSupported; /* OPT */
-};
-
-struct Z_SearchKey {
-       Z_InternationalString *searchKey;
-       Z_HumanString *description; /* OPT */
-};
-
-struct Z_AccessRestrictionsUnit {
-#define Z_AccessRestrictionsUnit_any 0
-#define Z_AccessRestrictionsUnit_search 1
-#define Z_AccessRestrictionsUnit_present 2
-#define Z_AccessRestrictionsUnit_specific_elements 3
-#define Z_AccessRestrictionsUnit_extended_services 4
-#define Z_AccessRestrictionsUnit_by_database 5
-       int *accessType;
-       Z_HumanString *accessText; /* OPT */
-       int num_accessChallenges;
-       Odr_oid **accessChallenges; /* OPT */
-};
-
-struct Z_AccessRestrictions {
-       int num;
-       Z_AccessRestrictionsUnit **elements;
-};
-
-struct Z_CostsOtherCharge {
-       Z_HumanString *forWhat;
-       Z_Charge *charge;
-};
-
-struct Z_Costs {
-       Z_Charge *connectCharge; /* OPT */
-       Z_Charge *connectTime; /* OPT */
-       Z_Charge *displayCharge; /* OPT */
-       Z_Charge *searchCharge; /* OPT */
-       Z_Charge *subscriptCharge; /* OPT */
-       int num_otherCharges;
-       Z_CostsOtherCharge **otherCharges; /* OPT */
-};
-
-struct Z_Charge {
-       Z_IntUnit *cost;
-       Z_Unit *perWhat; /* OPT */
-       Z_HumanString *text; /* OPT */
-};
-
-struct Z_DatabaseList {
-       int num_databases;
-       Z_DatabaseName **databases;
-};
-
-struct Z_AttributeCombinations {
-       Z_AttributeSetId *defaultAttributeSet;
-       int num_legalCombinations;
-       Z_AttributeCombination **legalCombinations;
-};
-
-struct Z_AttributeCombination {
-       int num_occurrences;
-       Z_AttributeOccurrence **occurrences;
-};
-
-struct Z_AttributeValueList {
-       int num_attributes;
-       Z_StringOrNumeric **attributes;
-};
-
-struct Z_AttributeOccurrence {
-       Z_AttributeSetId *attributeSet; /* OPT */
-       int *attributeType;
-       Odr_null *mustBeSupplied; /* OPT */
-       int which;
-       union {
-               Odr_null *any_or_none;
-               Z_AttributeValueList *specific;
-#define Z_AttributeOcc_any_or_none 1
-#define Z_AttributeOcc_specific 2
-       } attributeValues;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-grs.h b/include/yaz/z-grs.h
deleted file mode 100644 (file)
index 4750997..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H RecordSyntax-generic */
-
-#ifndef z_grs_H
-#define z_grs_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_GenericRecord Z_GenericRecord;
-YAZ_EXPORT int z_GenericRecord (ODR o, Z_GenericRecord **p, int opt, const char *name);
-
-typedef struct Z_TaggedElement Z_TaggedElement;
-YAZ_EXPORT int z_TaggedElement (ODR o, Z_TaggedElement **p, int opt, const char *name);
-
-typedef struct Z_ElementData Z_ElementData;
-YAZ_EXPORT int z_ElementData (ODR o, Z_ElementData **p, int opt, const char *name);
-
-typedef struct Z_ElementMetaData Z_ElementMetaData;
-YAZ_EXPORT int z_ElementMetaData (ODR o, Z_ElementMetaData **p, int opt, const char *name);
-
-typedef struct Z_TagPath_s Z_TagPath_s;
-YAZ_EXPORT int z_TagPath_s (ODR o, Z_TagPath_s **p, int opt, const char *name);
-
-typedef struct Z_TagPath Z_TagPath;
-YAZ_EXPORT int z_TagPath (ODR o, Z_TagPath **p, int opt, const char *name);
-
-typedef struct Z_Order Z_Order;
-YAZ_EXPORT int z_Order (ODR o, Z_Order **p, int opt, const char *name);
-
-typedef struct Z_Usage Z_Usage;
-YAZ_EXPORT int z_Usage (ODR o, Z_Usage **p, int opt, const char *name);
-
-typedef struct Z_HitVector Z_HitVector;
-YAZ_EXPORT int z_HitVector (ODR o, Z_HitVector **p, int opt, const char *name);
-
-typedef struct Z_Triple Z_Triple;
-YAZ_EXPORT int z_Triple (ODR o, Z_Triple **p, int opt, const char *name);
-
-typedef struct Z_Variant Z_Variant;
-YAZ_EXPORT int z_Variant (ODR o, Z_Variant **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_GenericRecord {
-       int num_elements;
-       Z_TaggedElement **elements;
-};
-
-struct Z_TaggedElement {
-       int *tagType; /* OPT */
-       Z_StringOrNumeric *tagValue;
-       int *tagOccurrence; /* OPT */
-       Z_ElementData *content;
-       Z_ElementMetaData *metaData; /* OPT */
-       Z_Variant *appliedVariant; /* OPT */
-};
-
-struct Z_ElementData {
-       int which;
-       union {
-               Odr_oct *octets;
-               int *numeric;
-               char *date;
-               Z_External *ext;
-               Z_InternationalString *string;
-               bool_t *trueOrFalse;
-               Odr_oid *oid;
-               Z_IntUnit *intUnit;
-               Odr_null *elementNotThere;
-               Odr_null *elementEmpty;
-               Odr_null *noDataRequested;
-               Z_External *diagnostic;
-               Z_GenericRecord *subtree;
-#define Z_ElementData_octets 1
-#define Z_ElementData_numeric 2
-#define Z_ElementData_date 3
-#define Z_ElementData_ext 4
-#define Z_ElementData_string 5
-#define Z_ElementData_trueOrFalse 6
-#define Z_ElementData_oid 7
-#define Z_ElementData_intUnit 8
-#define Z_ElementData_elementNotThere 9
-#define Z_ElementData_elementEmpty 10
-#define Z_ElementData_noDataRequested 11
-#define Z_ElementData_diagnostic 12
-#define Z_ElementData_subtree 13
-       } u;
-};
-
-struct Z_ElementMetaData {
-       Z_Order *seriesOrder; /* OPT */
-       Z_Usage *usageRight; /* OPT */
-       int num_hits;
-       Z_HitVector **hits; /* OPT */
-       Z_InternationalString *displayName; /* OPT */
-       int num_supportedVariants;
-       Z_Variant **supportedVariants; /* OPT */
-       Z_InternationalString *message; /* OPT */
-       Odr_oct *elementDescriptor; /* OPT */
-       Z_TagPath *surrogateFor; /* OPT */
-       Z_TagPath *surrogateElement; /* OPT */
-       Z_External *other; /* OPT */
-};
-
-struct Z_TagPath_s {
-       int *tagType; /* OPT */
-       Z_StringOrNumeric *tagValue;
-       int *tagOccurrence; /* OPT */
-};
-
-struct Z_TagPath {
-       int num;
-       Z_TagPath_s **elements;
-};
-
-struct Z_Order {
-       bool_t *ascending;
-       int *order;
-};
-
-struct Z_Usage {
-#define Z_Usage_redistributable 1
-#define Z_Usage_restricted 2
-#define Z_Usage_licensePointer 3
-       int *type;
-       Z_InternationalString *restriction; /* OPT */
-};
-
-struct Z_HitVector {
-       Z_Term *satisfier; /* OPT */
-       Z_IntUnit *offsetIntoElement; /* OPT */
-       Z_IntUnit *length; /* OPT */
-       int *hitRank; /* OPT */
-       Odr_oct *targetToken; /* OPT */
-};
-
-struct Z_Triple {
-       Odr_oid *variantSetId; /* OPT */
-       int *zclass;
-       int *type;
-       int which;
-       union {
-               int *integer;
-               Z_InternationalString *internationalString;
-               Odr_oct *octetString;
-               Odr_oid *objectIdentifier;
-               bool_t *boolean;
-               Odr_null *null;
-               Z_Unit *unit;
-               Z_IntUnit *valueAndUnit;
-#define Z_Triple_integer 1
-#define Z_Triple_internationalString 2
-#define Z_Triple_octetString 3
-#define Z_Triple_objectIdentifier 4
-#define Z_Triple_boolean 5
-#define Z_Triple_null 6
-#define Z_Triple_unit 7
-#define Z_Triple_valueAndUnit 8
-       } value;
-};
-
-struct Z_Variant {
-       Odr_oid *globalVariantSetId; /* OPT */
-       int num_triples;
-       Z_Triple **triples;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-opac.h b/include/yaz/z-opac.h
deleted file mode 100644 (file)
index bbd64ae..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H RecordSyntax-opac */
-
-#ifndef z_opac_H
-#define z_opac_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_OPACRecord Z_OPACRecord;
-YAZ_EXPORT int z_OPACRecord (ODR o, Z_OPACRecord **p, int opt, const char *name);
-
-typedef struct Z_HoldingsRecord Z_HoldingsRecord;
-YAZ_EXPORT int z_HoldingsRecord (ODR o, Z_HoldingsRecord **p, int opt, const char *name);
-
-typedef struct Z_HoldingsAndCircData Z_HoldingsAndCircData;
-YAZ_EXPORT int z_HoldingsAndCircData (ODR o, Z_HoldingsAndCircData **p, int opt, const char *name);
-
-typedef struct Z_Volume Z_Volume;
-YAZ_EXPORT int z_Volume (ODR o, Z_Volume **p, int opt, const char *name);
-
-typedef struct Z_CircRecord Z_CircRecord;
-YAZ_EXPORT int z_CircRecord (ODR o, Z_CircRecord **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_OPACRecord {
-       Z_External *bibliographicRecord; /* OPT */
-       int num_holdingsData;
-       Z_HoldingsRecord **holdingsData; /* OPT */
-};
-
-struct Z_HoldingsRecord {
-       int which;
-       union {
-               Z_External *marcHoldingsRecord;
-               Z_HoldingsAndCircData *holdingsAndCirc;
-#define Z_HoldingsRecord_marcHoldingsRecord 1
-#define Z_HoldingsRecord_holdingsAndCirc 2
-       } u;
-};
-
-struct Z_HoldingsAndCircData {
-       Z_InternationalString *typeOfRecord; /* OPT */
-       Z_InternationalString *encodingLevel; /* OPT */
-       Z_InternationalString *format; /* OPT */
-       Z_InternationalString *receiptAcqStatus; /* OPT */
-       Z_InternationalString *generalRetention; /* OPT */
-       Z_InternationalString *completeness; /* OPT */
-       Z_InternationalString *dateOfReport; /* OPT */
-       Z_InternationalString *nucCode; /* OPT */
-       Z_InternationalString *localLocation; /* OPT */
-       Z_InternationalString *shelvingLocation; /* OPT */
-       Z_InternationalString *callNumber; /* OPT */
-       Z_InternationalString *shelvingData; /* OPT */
-       Z_InternationalString *copyNumber; /* OPT */
-       Z_InternationalString *publicNote; /* OPT */
-       Z_InternationalString *reproductionNote; /* OPT */
-       Z_InternationalString *termsUseRepro; /* OPT */
-       Z_InternationalString *enumAndChron; /* OPT */
-       int num_volumes;
-       Z_Volume **volumes; /* OPT */
-       int num_circulationData;
-       Z_CircRecord **circulationData; /* OPT */
-};
-
-struct Z_Volume {
-       Z_InternationalString *enumeration; /* OPT */
-       Z_InternationalString *chronology; /* OPT */
-       Z_InternationalString *enumAndChron; /* OPT */
-};
-
-struct Z_CircRecord {
-       bool_t *availableNow;
-       Z_InternationalString *availablityDate; /* OPT */
-       Z_InternationalString *availableThru; /* OPT */
-       Z_InternationalString *restrictions; /* OPT */
-       Z_InternationalString *itemId; /* OPT */
-       bool_t *renewable;
-       bool_t *onHold;
-       Z_InternationalString *enumAndChron; /* OPT */
-       Z_InternationalString *midspine; /* OPT */
-       Z_InternationalString *temporaryLocation; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-rrf1.h b/include/yaz/z-rrf1.h
deleted file mode 100644 (file)
index 76a6090..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ResourceReport-Format-Resource-1 */
-
-#ifndef z_rrf1_H
-#define z_rrf1_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_ResourceReport1 Z_ResourceReport1;
-YAZ_EXPORT int z_ResourceReport1 (ODR o, Z_ResourceReport1 **p, int opt, const char *name);
-
-typedef struct Z_Estimate1 Z_Estimate1;
-YAZ_EXPORT int z_Estimate1 (ODR o, Z_Estimate1 **p, int opt, const char *name);
-
-typedef int  Z_EstimateType;
-YAZ_EXPORT int z_EstimateType (ODR o, Z_EstimateType **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_ResourceReport1 {
-       int num_estimates;
-       Z_Estimate1 **estimates;
-       Z_InternationalString *message;
-};
-
-struct Z_Estimate1 {
-       Z_EstimateType *type;
-       int *value;
-       int *currency_code; /* OPT */
-};
-
-#define Z_EstimateType_currentSearchRecords 1
-#define Z_EstimateType_finalSearchRecords 2
-#define Z_EstimateType_currentPresentRecords 3
-#define Z_EstimateType_finalPresentRecords 4
-#define Z_EstimateType_currentOpTimeProcessing 5
-#define Z_EstimateType_finalOpTimeProcessing 6
-#define Z_EstimateType_currentAssocTime 7
-#define Z_EstimateType_currentOperationCost 8
-#define Z_EstimateType_finalOperationCost 9
-#define Z_EstimateType_currentAssocCost 10
-#define Z_EstimateType_finalOpTimeElapsed 11
-#define Z_EstimateType_percentComplete 12
-#define Z_EstimateType_currentSearchAssocCost 13
-#define Z_EstimateType_currentPresentAssocCost 14
-#define Z_EstimateType_currentConnectAssocCost 15
-#define Z_EstimateType_currentOtherAssocCost 16
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-rrf2.h b/include/yaz/z-rrf2.h
deleted file mode 100644 (file)
index 030d550..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ResourceReport-Format-Resource-2 */
-
-#ifndef z_rrf2_H
-#define z_rrf2_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_ResourceReport2 Z_ResourceReport2;
-YAZ_EXPORT int z_ResourceReport2 (ODR o, Z_ResourceReport2 **p, int opt, const char *name);
-
-typedef struct Z_Estimate2 Z_Estimate2;
-YAZ_EXPORT int z_Estimate2 (ODR o, Z_Estimate2 **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_ResourceReport2 {
-       int num_estimates;
-       Z_Estimate2 **estimates; /* OPT */
-       Z_InternationalString *message; /* OPT */
-};
-
-struct Z_Estimate2 {
-       Z_StringOrNumeric *type;
-       Z_IntUnit *value;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-sum.h b/include/yaz/z-sum.h
deleted file mode 100644 (file)
index bbfb0e0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H RecordSyntax-summary */
-
-#ifndef z_sum_H
-#define z_sum_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_BriefBib Z_BriefBib;
-YAZ_EXPORT int z_BriefBib (ODR o, Z_BriefBib **p, int opt, const char *name);
-
-typedef struct Z_FormatSpec Z_FormatSpec;
-YAZ_EXPORT int z_FormatSpec (ODR o, Z_FormatSpec **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_BriefBib {
-       Z_InternationalString *title;
-       Z_InternationalString *author; /* OPT */
-       Z_InternationalString *callNumber; /* OPT */
-       Z_InternationalString *recordType; /* OPT */
-       Z_InternationalString *bibliographicLevel; /* OPT */
-       int num_format;
-       Z_FormatSpec **format; /* OPT */
-       Z_InternationalString *publicationPlace; /* OPT */
-       Z_InternationalString *publicationDate; /* OPT */
-       Z_InternationalString *targetSystemKey; /* OPT */
-       Z_InternationalString *satisfyingElement; /* OPT */
-       int *rank; /* OPT */
-       Z_InternationalString *documentId; /* OPT */
-       Z_InternationalString *abstract; /* OPT */
-       Z_OtherInformation *otherInfo; /* OPT */
-};
-
-struct Z_FormatSpec {
-       Z_InternationalString *type;
-       int *size; /* OPT */
-       int *bestPosn; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-sutrs.h b/include/yaz/z-sutrs.h
deleted file mode 100644 (file)
index abedc26..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H RecordSyntax-SUTRS */
-
-#ifndef z_sutrs_H
-#define z_sutrs_H
-
-#include <yaz/odr.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef Odr_oct Z_SUTRS;
-YAZ_EXPORT int z_SUTRS (ODR o, Odr_oct **p, int opt);
-
-#ifdef __cplusplus
-}
-#endif
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef Z_InternationalString  Z_SutrsRecord;
-YAZ_EXPORT int z_SutrsRecord (ODR o, Z_SutrsRecord **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-uifr1.h b/include/yaz/z-uifr1.h
deleted file mode 100644 (file)
index 8f306b4..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H UserInfoFormat-searchResult-1 */
-
-#ifndef z_uifr1_H
-#define z_uifr1_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_SearchInfoReport_s Z_SearchInfoReport_s;
-YAZ_EXPORT int z_SearchInfoReport_s (ODR o, Z_SearchInfoReport_s **p, int opt, const char *name);
-
-typedef struct Z_SearchInfoReport Z_SearchInfoReport;
-YAZ_EXPORT int z_SearchInfoReport (ODR o, Z_SearchInfoReport **p, int opt, const char *name);
-
-typedef struct Z_ResultsByDB_sList Z_ResultsByDB_sList;
-YAZ_EXPORT int z_ResultsByDB_sList (ODR o, Z_ResultsByDB_sList **p, int opt, const char *name);
-
-typedef struct Z_ResultsByDB_s Z_ResultsByDB_s;
-YAZ_EXPORT int z_ResultsByDB_s (ODR o, Z_ResultsByDB_s **p, int opt, const char *name);
-
-typedef struct Z_ResultsByDB Z_ResultsByDB;
-YAZ_EXPORT int z_ResultsByDB (ODR o, Z_ResultsByDB **p, int opt, const char *name);
-
-typedef struct Z_QueryExpressionTerm Z_QueryExpressionTerm;
-YAZ_EXPORT int z_QueryExpressionTerm (ODR o, Z_QueryExpressionTerm **p, int opt, const char *name);
-
-typedef struct Z_QueryExpression Z_QueryExpression;
-YAZ_EXPORT int z_QueryExpression (ODR o, Z_QueryExpression **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_SearchInfoReport_s {
-       Z_InternationalString *subqueryId; /* OPT */
-       bool_t *fullQuery;
-       Z_QueryExpression *subqueryExpression; /* OPT */
-       Z_QueryExpression *subqueryInterpretation; /* OPT */
-       Z_QueryExpression *subqueryRecommendation; /* OPT */
-       int *subqueryCount; /* OPT */
-       Z_IntUnit *subqueryWeight; /* OPT */
-       Z_ResultsByDB *resultsByDB; /* OPT */
-};
-
-struct Z_SearchInfoReport {
-       int num;
-       Z_SearchInfoReport_s **elements;
-};
-
-struct Z_ResultsByDB_sList {
-       int num;
-       Z_DatabaseName **elements;
-};
-
-struct Z_ResultsByDB_s {
-       int which;
-       union {
-               Odr_null *all;
-               Z_ResultsByDB_sList *list;
-#define Z_ResultsByDB_s_all 1
-#define Z_ResultsByDB_s_list 2
-       } u;
-       int *count; /* OPT */
-       Z_InternationalString *resultSetName; /* OPT */
-};
-
-struct Z_ResultsByDB {
-       int num;
-       Z_ResultsByDB_s **elements;
-};
-
-struct Z_QueryExpressionTerm {
-       Z_Term *queryTerm;
-       Z_InternationalString *termComment; /* OPT */
-};
-
-struct Z_QueryExpression {
-       int which;
-       union {
-               Z_QueryExpressionTerm *term;
-               Z_Query *query;
-#define Z_QueryExpression_term 1
-#define Z_QueryExpression_query 2
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/z-univ.h b/include/yaz/z-univ.h
deleted file mode 100644 (file)
index e446e92..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ResourceReport-Format-Universe-1 */
-
-#ifndef z_univ_H
-#define z_univ_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_UniverseReportHits Z_UniverseReportHits;
-YAZ_EXPORT int z_UniverseReportHits (ODR o, Z_UniverseReportHits **p, int opt, const char *name);
-
-typedef struct Z_UniverseReportDuplicate Z_UniverseReportDuplicate;
-YAZ_EXPORT int z_UniverseReportDuplicate (ODR o, Z_UniverseReportDuplicate **p, int opt, const char *name);
-
-typedef struct Z_UniverseReport Z_UniverseReport;
-YAZ_EXPORT int z_UniverseReport (ODR o, Z_UniverseReport **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_UniverseReportHits {
-       Z_StringOrNumeric *database;
-       Z_StringOrNumeric *hits;
-};
-
-struct Z_UniverseReportDuplicate {
-       Z_StringOrNumeric *hitno;
-};
-
-struct Z_UniverseReport {
-       int *totalHits;
-       int which;
-       union {
-               Z_UniverseReportHits *databaseHits;
-               Z_UniverseReportDuplicate *duplicate;
-#define Z_UniverseReport_databaseHits 1
-#define Z_UniverseReport_duplicate 2
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-admin.h b/include/yaz/zes-admin.h
deleted file mode 100644 (file)
index 84eab56..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-Admin */
-
-#ifndef zes_admin_H
-#define zes_admin_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_AdminEsRequest Z_AdminEsRequest;
-YAZ_EXPORT int z_AdminEsRequest (ODR o, Z_AdminEsRequest **p, int opt, const char *name);
-
-typedef struct Z_AdminTaskPackage Z_AdminTaskPackage;
-YAZ_EXPORT int z_AdminTaskPackage (ODR o, Z_AdminTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_Admin Z_Admin;
-YAZ_EXPORT int z_Admin (ODR o, Z_Admin **p, int opt, const char *name);
-
-typedef struct Z_ESAdminOriginPartToKeep Z_ESAdminOriginPartToKeep;
-YAZ_EXPORT int z_ESAdminOriginPartToKeep (ODR o, Z_ESAdminOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_ESAdminOriginPartNotToKeep Z_ESAdminOriginPartNotToKeep;
-YAZ_EXPORT int z_ESAdminOriginPartNotToKeep (ODR o, Z_ESAdminOriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_ESAdminTargetPart Z_ESAdminTargetPart;
-YAZ_EXPORT int z_ESAdminTargetPart (ODR o, Z_ESAdminTargetPart **p, int opt, const char *name);
-
-typedef struct Z_ImportParameters Z_ImportParameters;
-YAZ_EXPORT int z_ImportParameters (ODR o, Z_ImportParameters **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_AdminEsRequest {
-       Z_ESAdminOriginPartToKeep *toKeep;
-       Z_ESAdminOriginPartNotToKeep *notToKeep;
-};
-
-struct Z_AdminTaskPackage {
-       Z_ESAdminOriginPartToKeep *originPart;
-       Z_ESAdminTargetPart *targetPart;
-};
-
-struct Z_Admin {
-       int which;
-       union {
-               Z_AdminEsRequest *esRequest;
-               Z_AdminTaskPackage *taskPackage;
-#define Z_Admin_esRequest 1
-#define Z_Admin_taskPackage 2
-       } u;
-};
-
-struct Z_ESAdminOriginPartToKeep {
-       int which;
-       union {
-               Odr_null *reIndex;
-               Odr_null *truncate;
-               Odr_null *drop;
-               Odr_null *create;
-               Z_ImportParameters *import;
-               Odr_null *refresh;
-               Odr_null *commit;
-               Odr_null *shutdown;
-               Odr_null *start;
-#define Z_ESAdminOriginPartToKeep_reIndex 1
-#define Z_ESAdminOriginPartToKeep_truncate 2
-#define Z_ESAdminOriginPartToKeep_drop 3
-#define Z_ESAdminOriginPartToKeep_create 4
-#define Z_ESAdminOriginPartToKeep_import 5
-#define Z_ESAdminOriginPartToKeep_refresh 6
-#define Z_ESAdminOriginPartToKeep_commit 7
-#define Z_ESAdminOriginPartToKeep_shutdown 8
-#define Z_ESAdminOriginPartToKeep_start 9
-       } u;
-       Z_InternationalString *databaseName; /* OPT */
-};
-
-struct Z_ESAdminOriginPartNotToKeep {
-       int which;
-       union {
-               Z_Segment *records;
-               Odr_null *recordsWillFollow;
-#define Z_ESAdminOriginPartNotToKeep_records 1
-#define Z_ESAdminOriginPartNotToKeep_recordsWillFollow 2
-       } u;
-};
-
-struct Z_ESAdminTargetPart {
-#define Z_ESAdminTargetPart_success 1
-#define Z_ESAdminTargetPart_partial 2
-#define Z_ESAdminTargetPart_failure 3
-       int *updateStatus;
-       int num_globalDiagnostics;
-       Z_DiagRec **globalDiagnostics; /* OPT */
-};
-
-struct Z_ImportParameters {
-       Z_InternationalString *recordType;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-expi.h b/include/yaz/zes-expi.h
deleted file mode 100644 (file)
index df8391c..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-ExportInvocation */
-
-#ifndef zes_expi_H
-#define zes_expi_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#include <yaz/zes-exps.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_EIExportInvocationEsRequest Z_EIExportInvocationEsRequest;
-YAZ_EXPORT int z_EIExportInvocationEsRequest (ODR o, Z_EIExportInvocationEsRequest **p, int opt, const char *name);
-
-typedef struct Z_EIExportInvocationTaskPackage Z_EIExportInvocationTaskPackage;
-YAZ_EXPORT int z_EIExportInvocationTaskPackage (ODR o, Z_EIExportInvocationTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_EIExportInvocation Z_EIExportInvocation;
-YAZ_EXPORT int z_EIExportInvocation (ODR o, Z_EIExportInvocation **p, int opt, const char *name);
-
-typedef struct Z_EIOriginPartToKeep Z_EIOriginPartToKeep;
-YAZ_EXPORT int z_EIOriginPartToKeep (ODR o, Z_EIOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_EIOriginPartNotToKeepRanges_s Z_EIOriginPartNotToKeepRanges_s;
-YAZ_EXPORT int z_EIOriginPartNotToKeepRanges_s (ODR o, Z_EIOriginPartNotToKeepRanges_s **p, int opt, const char *name);
-
-typedef struct Z_EIOriginPartNotToKeepRanges Z_EIOriginPartNotToKeepRanges;
-YAZ_EXPORT int z_EIOriginPartNotToKeepRanges (ODR o, Z_EIOriginPartNotToKeepRanges **p, int opt, const char *name);
-
-typedef struct Z_EIOriginPartNotToKeep Z_EIOriginPartNotToKeep;
-YAZ_EXPORT int z_EIOriginPartNotToKeep (ODR o, Z_EIOriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_EITargetPart Z_EITargetPart;
-YAZ_EXPORT int z_EITargetPart (ODR o, Z_EITargetPart **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_EIExportInvocationEsRequest {
-       Z_EIOriginPartToKeep *toKeep;
-       Z_EIOriginPartNotToKeep *notToKeep;
-};
-
-struct Z_EIExportInvocationTaskPackage {
-       Z_EIOriginPartToKeep *originPart;
-       Z_EITargetPart *targetPart; /* OPT */
-};
-
-struct Z_EIExportInvocation {
-       int which;
-       union {
-               Z_EIExportInvocationEsRequest *esRequest;
-               Z_EIExportInvocationTaskPackage *taskPackage;
-#define Z_EIExportInvocation_esRequest 1
-#define Z_EIExportInvocation_taskPackage 2
-       } u;
-};
-
-struct Z_EIOriginPartToKeep {
-       int which;
-       union {
-               Z_InternationalString *packageName;
-               Z_ESExportSpecification *packageSpec;
-#define Z_EIOriginPartToKeep_packageName 1
-#define Z_EIOriginPartToKeep_packageSpec 2
-       } u;
-       int *numberOfCopies;
-};
-
-struct Z_EIOriginPartNotToKeepRanges_s {
-       int *start;
-       int *count; /* OPT */
-};
-
-struct Z_EIOriginPartNotToKeepRanges {
-       int num;
-       Z_EIOriginPartNotToKeepRanges_s **elements;
-};
-
-struct Z_EIOriginPartNotToKeep {
-       Z_InternationalString *resultSetId;
-       int which;
-       union {
-               Odr_null *all;
-               Z_EIOriginPartNotToKeepRanges *ranges;
-#define Z_EIOriginPartNotToKeep_all 1
-#define Z_EIOriginPartNotToKeep_ranges 2
-       } u;
-};
-
-struct Z_EITargetPart {
-       Z_IntUnit *estimatedQuantity; /* OPT */
-       Z_IntUnit *quantitySoFar; /* OPT */
-       Z_IntUnit *estimatedCost; /* OPT */
-       Z_IntUnit *costSoFar; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-exps.h b/include/yaz/zes-exps.h
deleted file mode 100644 (file)
index 18bab97..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-ExportSpecification */
-
-#ifndef zes_exps_H
-#define zes_exps_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_ESExportSpecificationEsRequest Z_ESExportSpecificationEsRequest;
-YAZ_EXPORT int z_ESExportSpecificationEsRequest (ODR o, Z_ESExportSpecificationEsRequest **p, int opt, const char *name);
-
-typedef struct Z_ESExportSpecificationTaskPackage Z_ESExportSpecificationTaskPackage;
-YAZ_EXPORT int z_ESExportSpecificationTaskPackage (ODR o, Z_ESExportSpecificationTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_ESExportSpecification Z_ESExportSpecification;
-YAZ_EXPORT int z_ESExportSpecification (ODR o, Z_ESExportSpecification **p, int opt, const char *name);
-
-typedef struct Z_ESOriginPartToKeep Z_ESOriginPartToKeep;
-YAZ_EXPORT int z_ESOriginPartToKeep (ODR o, Z_ESOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_ESDestinationOther Z_ESDestinationOther;
-YAZ_EXPORT int z_ESDestinationOther (ODR o, Z_ESDestinationOther **p, int opt, const char *name);
-
-typedef struct Z_ESDestination Z_ESDestination;
-YAZ_EXPORT int z_ESDestination (ODR o, Z_ESDestination **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_ESExportSpecificationEsRequest {
-       Z_ESOriginPartToKeep *toKeep;
-       Odr_null *notToKeep;
-};
-
-struct Z_ESExportSpecificationTaskPackage {
-       Z_ESOriginPartToKeep *originPart;
-       Odr_null *targetPart;
-};
-
-struct Z_ESExportSpecification {
-       int which;
-       union {
-               Z_ESExportSpecificationEsRequest *esRequest;
-               Z_ESExportSpecificationTaskPackage *taskPackage;
-#define Z_ESExportSpecification_esRequest 1
-#define Z_ESExportSpecification_taskPackage 2
-       } u;
-};
-
-struct Z_ESOriginPartToKeep {
-       Z_CompSpec *composition;
-       Z_ESDestination *exportDestination;
-};
-
-struct Z_ESDestinationOther {
-       Z_InternationalString *vehicle; /* OPT */
-       Z_InternationalString *destination;
-};
-
-struct Z_ESDestination {
-       int which;
-       union {
-               Z_InternationalString *phoneNumber;
-               Z_InternationalString *faxNumber;
-               Z_InternationalString *x400address;
-               Z_InternationalString *emailAddress;
-               Z_InternationalString *pagerNumber;
-               Z_InternationalString *ftpAddress;
-               Z_InternationalString *ftamAddress;
-               Z_InternationalString *printerAddress;
-               Z_ESDestinationOther *other;
-#define Z_ESDestination_phoneNumber 1
-#define Z_ESDestination_faxNumber 2
-#define Z_ESDestination_x400address 3
-#define Z_ESDestination_emailAddress 4
-#define Z_ESDestination_pagerNumber 5
-#define Z_ESDestination_ftpAddress 6
-#define Z_ESDestination_ftamAddress 7
-#define Z_ESDestination_printerAddress 8
-#define Z_ESDestination_other 9
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-order.h b/include/yaz/zes-order.h
deleted file mode 100644 (file)
index 76ccdbf..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-ItemOrder */
-
-#ifndef zes_order_H
-#define zes_order_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_IORequest Z_IORequest;
-YAZ_EXPORT int z_IORequest (ODR o, Z_IORequest **p, int opt, const char *name);
-
-typedef struct Z_IOTaskPackage Z_IOTaskPackage;
-YAZ_EXPORT int z_IOTaskPackage (ODR o, Z_IOTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_IOItemOrder Z_IOItemOrder;
-YAZ_EXPORT int z_IOItemOrder (ODR o, Z_IOItemOrder **p, int opt, const char *name);
-
-typedef struct Z_IOContact Z_IOContact;
-YAZ_EXPORT int z_IOContact (ODR o, Z_IOContact **p, int opt, const char *name);
-
-typedef struct Z_IOBilling Z_IOBilling;
-YAZ_EXPORT int z_IOBilling (ODR o, Z_IOBilling **p, int opt, const char *name);
-
-typedef struct Z_IOOriginPartToKeep Z_IOOriginPartToKeep;
-YAZ_EXPORT int z_IOOriginPartToKeep (ODR o, Z_IOOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_IOCreditCardInfo Z_IOCreditCardInfo;
-YAZ_EXPORT int z_IOCreditCardInfo (ODR o, Z_IOCreditCardInfo **p, int opt, const char *name);
-
-typedef struct Z_IOResultSetItem Z_IOResultSetItem;
-YAZ_EXPORT int z_IOResultSetItem (ODR o, Z_IOResultSetItem **p, int opt, const char *name);
-
-typedef struct Z_IOOriginPartNotToKeep Z_IOOriginPartNotToKeep;
-YAZ_EXPORT int z_IOOriginPartNotToKeep (ODR o, Z_IOOriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_IOTargetPart Z_IOTargetPart;
-YAZ_EXPORT int z_IOTargetPart (ODR o, Z_IOTargetPart **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_IORequest {
-       Z_IOOriginPartToKeep *toKeep; /* OPT */
-       Z_IOOriginPartNotToKeep *notToKeep;
-};
-
-struct Z_IOTaskPackage {
-       Z_IOOriginPartToKeep *originPart; /* OPT */
-       Z_IOTargetPart *targetPart;
-};
-
-struct Z_IOItemOrder {
-       int which;
-       union {
-               Z_IORequest *esRequest;
-               Z_IOTaskPackage *taskPackage;
-#define Z_IOItemOrder_esRequest 1
-#define Z_IOItemOrder_taskPackage 2
-       } u;
-};
-
-struct Z_IOContact {
-       Z_InternationalString *name; /* OPT */
-       Z_InternationalString *phone; /* OPT */
-       Z_InternationalString *email; /* OPT */
-};
-
-struct Z_IOBilling {
-       int which;
-       union {
-               Odr_null *billInvoice;
-               Odr_null *prepay;
-               Odr_null *depositAccount;
-               Z_IOCreditCardInfo *creditCard;
-               Odr_null *cardInfoPreviouslySupplied;
-               Odr_null *privateKnown;
-               Z_External *privateNotKnown;
-#define Z_IOBilling_billInvoice 1
-#define Z_IOBilling_prepay 2
-#define Z_IOBilling_depositAccount 3
-#define Z_IOBilling_creditCard 4
-#define Z_IOBilling_cardInfoPreviouslySupplied 5
-#define Z_IOBilling_privateKnown 6
-#define Z_IOBilling_privateNotKnown 7
-       } u;
-       Z_InternationalString *customerReference; /* OPT */
-       Z_InternationalString *customerPONumber; /* OPT */
-};
-
-struct Z_IOOriginPartToKeep {
-       Z_External *supplDescription; /* OPT */
-       Z_IOContact *contact; /* OPT */
-       Z_IOBilling *addlBilling; /* OPT */
-};
-
-struct Z_IOCreditCardInfo {
-       Z_InternationalString *nameOnCard;
-       Z_InternationalString *expirationDate;
-       Z_InternationalString *cardNumber;
-};
-
-struct Z_IOResultSetItem {
-       Z_InternationalString *resultSetId;
-       int *item;
-};
-
-struct Z_IOOriginPartNotToKeep {
-       Z_IOResultSetItem *resultSetItem; /* OPT */
-       Z_External *itemRequest; /* OPT */
-};
-
-struct Z_IOTargetPart {
-       Z_External *itemRequest; /* OPT */
-       Z_External *statusOrErrorReport; /* OPT */
-#define Z_IOTargetPart_notReceived 1
-#define Z_IOTargetPart_loanQueue 2
-#define Z_IOTargetPart_forwarded 3
-#define Z_IOTargetPart_unfilledCopyright 4
-#define Z_IOTargetPart_filledCopyright 5
-       int *auxiliaryStatus; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-pquery.h b/include/yaz/zes-pquery.h
deleted file mode 100644 (file)
index 65a9010..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-PersistentQuery */
-
-#ifndef zes_pquery_H
-#define zes_pquery_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_PQueryPersistentQueryEsRequest Z_PQueryPersistentQueryEsRequest;
-YAZ_EXPORT int z_PQueryPersistentQueryEsRequest (ODR o, Z_PQueryPersistentQueryEsRequest **p, int opt, const char *name);
-
-typedef struct Z_PQueryPersistentQueryTaskPackage Z_PQueryPersistentQueryTaskPackage;
-YAZ_EXPORT int z_PQueryPersistentQueryTaskPackage (ODR o, Z_PQueryPersistentQueryTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_PQueryPersistentQuery Z_PQueryPersistentQuery;
-YAZ_EXPORT int z_PQueryPersistentQuery (ODR o, Z_PQueryPersistentQuery **p, int opt, const char *name);
-
-typedef struct Z_PQueryOriginPartToKeep Z_PQueryOriginPartToKeep;
-YAZ_EXPORT int z_PQueryOriginPartToKeep (ODR o, Z_PQueryOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_PQueryOriginPartNotToKeep Z_PQueryOriginPartNotToKeep;
-YAZ_EXPORT int z_PQueryOriginPartNotToKeep (ODR o, Z_PQueryOriginPartNotToKeep **p, int opt, const char *name);
-
-typedef Z_Query  Z_PQueryTargetPart;
-YAZ_EXPORT int z_PQueryTargetPart (ODR o, Z_PQueryTargetPart **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_PQueryPersistentQueryEsRequest {
-       Z_PQueryOriginPartToKeep *toKeep; /* OPT */
-       Z_PQueryOriginPartNotToKeep *notToKeep;
-};
-
-struct Z_PQueryPersistentQueryTaskPackage {
-       Z_PQueryOriginPartToKeep *originPart; /* OPT */
-       Z_PQueryTargetPart *targetPart;
-};
-
-struct Z_PQueryPersistentQuery {
-       int which;
-       union {
-               Z_PQueryPersistentQueryEsRequest *esRequest;
-               Z_PQueryPersistentQueryTaskPackage *taskPackage;
-#define Z_PQueryPersistentQuery_esRequest 1
-#define Z_PQueryPersistentQuery_taskPackage 2
-       } u;
-};
-
-struct Z_PQueryOriginPartToKeep {
-       int num_dbNames;
-       Z_InternationalString **dbNames; /* OPT */
-       Z_OtherInformation *additionalSearchInfo; /* OPT */
-};
-
-struct Z_PQueryOriginPartNotToKeep {
-       int which;
-       union {
-               Z_InternationalString *package;
-               Z_Query *query;
-#define Z_PQueryOriginPartNotToKeep_package 1
-#define Z_PQueryOriginPartNotToKeep_query 2
-       } u;
-};
-
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-psched.h b/include/yaz/zes-psched.h
deleted file mode 100644 (file)
index 4565168..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-PeriodicQuerySchedule */
-
-#ifndef zes_psched_H
-#define zes_psched_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#include <yaz/zes-exps.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_PQSPeriodicQueryScheduleEsRequest Z_PQSPeriodicQueryScheduleEsRequest;
-YAZ_EXPORT int z_PQSPeriodicQueryScheduleEsRequest (ODR o, Z_PQSPeriodicQueryScheduleEsRequest **p, int opt, const char *name);
-
-typedef struct Z_PQSPeriodicQueryScheduleTaskPackage Z_PQSPeriodicQueryScheduleTaskPackage;
-YAZ_EXPORT int z_PQSPeriodicQueryScheduleTaskPackage (ODR o, Z_PQSPeriodicQueryScheduleTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_PQSPeriodicQuerySchedule Z_PQSPeriodicQuerySchedule;
-YAZ_EXPORT int z_PQSPeriodicQuerySchedule (ODR o, Z_PQSPeriodicQuerySchedule **p, int opt, const char *name);
-
-typedef struct Z_PQSOriginPartToKeep Z_PQSOriginPartToKeep;
-YAZ_EXPORT int z_PQSOriginPartToKeep (ODR o, Z_PQSOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_PQSOriginPartNotToKeep Z_PQSOriginPartNotToKeep;
-YAZ_EXPORT int z_PQSOriginPartNotToKeep (ODR o, Z_PQSOriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_PQSTargetPart Z_PQSTargetPart;
-YAZ_EXPORT int z_PQSTargetPart (ODR o, Z_PQSTargetPart **p, int opt, const char *name);
-
-typedef struct Z_PQSPeriod Z_PQSPeriod;
-YAZ_EXPORT int z_PQSPeriod (ODR o, Z_PQSPeriod **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_PQSPeriodicQueryScheduleEsRequest {
-       Z_PQSOriginPartToKeep *toKeep;
-       Z_PQSOriginPartNotToKeep *notToKeep;
-};
-
-struct Z_PQSPeriodicQueryScheduleTaskPackage {
-       Z_PQSOriginPartToKeep *originPart;
-       Z_PQSTargetPart *targetPart;
-};
-
-struct Z_PQSPeriodicQuerySchedule {
-       int which;
-       union {
-               Z_PQSPeriodicQueryScheduleEsRequest *esRequest;
-               Z_PQSPeriodicQueryScheduleTaskPackage *taskPackage;
-#define Z_PQSPeriodicQuerySchedule_esRequest 1
-#define Z_PQSPeriodicQuerySchedule_taskPackage 2
-       } u;
-};
-
-struct Z_PQSOriginPartToKeep {
-       bool_t *activeFlag;
-       int num_databaseNames;
-       Z_InternationalString **databaseNames; /* OPT */
-#define Z_PQSOriginPartToKeep_replace 1
-#define Z_PQSOriginPartToKeep_append 2
-#define Z_PQSOriginPartToKeep_createNew 3
-       int *resultSetDisposition; /* OPT */
-       Z_ESDestination *alertDestination; /* OPT */
-       int which;
-       union {
-               Z_InternationalString *packageName;
-               Z_ESExportSpecification *exportPackage;
-#define Z_PQSOriginPartToKeep_packageName 1
-#define Z_PQSOriginPartToKeep_exportPackage 2
-       } u; /* OPT */
-};
-
-struct Z_PQSOriginPartNotToKeep {
-       int which;
-       union {
-               Z_Query *actualQuery;
-               Z_InternationalString *packageName;
-#define Z_PQSOriginPartNotToKeep_actualQuery 1
-#define Z_PQSOriginPartNotToKeep_packageName 2
-       } u; /* OPT */
-       Z_PQSPeriod *originSuggestedPeriod; /* OPT */
-       char *expiration; /* OPT */
-       Z_InternationalString *resultSetPackage; /* OPT */
-};
-
-struct Z_PQSTargetPart {
-       Z_Query *actualQuery;
-       Z_PQSPeriod *targetStatedPeriod;
-       char *expiration; /* OPT */
-       Z_InternationalString *resultSetPackage; /* OPT */
-       char *lastQueryTime;
-       int *lastResultNumber;
-       int *numberSinceModify; /* OPT */
-};
-
-struct Z_PQSPeriod {
-       int which;
-       union {
-               Z_IntUnit *unit;
-               Odr_null *businessDaily;
-               Odr_null *continuous;
-               Z_InternationalString *other;
-#define Z_PQSPeriod_unit 1
-#define Z_PQSPeriod_businessDaily 2
-#define Z_PQSPeriod_continuous 3
-#define Z_PQSPeriod_other 4
-       } u;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-pset.h b/include/yaz/zes-pset.h
deleted file mode 100644 (file)
index 6a291cb..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-PersistentResultSet */
-
-#ifndef zes_pset_H
-#define zes_pset_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_PRPersistentResultSetEsRequest Z_PRPersistentResultSetEsRequest;
-YAZ_EXPORT int z_PRPersistentResultSetEsRequest (ODR o, Z_PRPersistentResultSetEsRequest **p, int opt, const char *name);
-
-typedef struct Z_PRPersistentResultSetTaskPackage Z_PRPersistentResultSetTaskPackage;
-YAZ_EXPORT int z_PRPersistentResultSetTaskPackage (ODR o, Z_PRPersistentResultSetTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_PRPersistentResultSet Z_PRPersistentResultSet;
-YAZ_EXPORT int z_PRPersistentResultSet (ODR o, Z_PRPersistentResultSet **p, int opt, const char *name);
-
-typedef struct Z_PROriginPartNotToKeep Z_PROriginPartNotToKeep;
-YAZ_EXPORT int z_PROriginPartNotToKeep (ODR o, Z_PROriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_PRTargetPart Z_PRTargetPart;
-YAZ_EXPORT int z_PRTargetPart (ODR o, Z_PRTargetPart **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_PRPersistentResultSetEsRequest {
-       Odr_null *toKeep;
-       Z_PROriginPartNotToKeep *notToKeep; /* OPT */
-};
-
-struct Z_PRPersistentResultSetTaskPackage {
-       Odr_null *originPart;
-       Z_PRTargetPart *targetPart; /* OPT */
-};
-
-struct Z_PRPersistentResultSet {
-       int which;
-       union {
-               Z_PRPersistentResultSetEsRequest *esRequest;
-               Z_PRPersistentResultSetTaskPackage *taskPackage;
-#define Z_PRPersistentResultSet_esRequest 1
-#define Z_PRPersistentResultSet_taskPackage 2
-       } u;
-};
-
-struct Z_PROriginPartNotToKeep {
-       Z_InternationalString *originSuppliedResultSet; /* OPT */
-#define Z_PROriginPartNotToKeep_replace 1
-#define Z_PROriginPartNotToKeep_append 2
-       int *replaceOrAppend; /* OPT */
-};
-
-struct Z_PRTargetPart {
-       Z_InternationalString *targetSuppliedResultSet; /* OPT */
-       int *numberOfRecords; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-update.h b/include/yaz/zes-update.h
deleted file mode 100644 (file)
index 8e8079c..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-Update */
-
-#ifndef zes_update_H
-#define zes_update_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_IUUpdateEsRequest Z_IUUpdateEsRequest;
-YAZ_EXPORT int z_IUUpdateEsRequest (ODR o, Z_IUUpdateEsRequest **p, int opt, const char *name);
-
-typedef struct Z_IUUpdateTaskPackage Z_IUUpdateTaskPackage;
-YAZ_EXPORT int z_IUUpdateTaskPackage (ODR o, Z_IUUpdateTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_IUUpdate Z_IUUpdate;
-YAZ_EXPORT int z_IUUpdate (ODR o, Z_IUUpdate **p, int opt, const char *name);
-
-typedef struct Z_IUOriginPartToKeep Z_IUOriginPartToKeep;
-YAZ_EXPORT int z_IUOriginPartToKeep (ODR o, Z_IUOriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_IUTargetPart Z_IUTargetPart;
-YAZ_EXPORT int z_IUTargetPart (ODR o, Z_IUTargetPart **p, int opt, const char *name);
-
-typedef struct Z_IUSuppliedRecordsId Z_IUSuppliedRecordsId;
-YAZ_EXPORT int z_IUSuppliedRecordsId (ODR o, Z_IUSuppliedRecordsId **p, int opt, const char *name);
-
-typedef struct Z_IUSuppliedRecords_elem Z_IUSuppliedRecords_elem;
-YAZ_EXPORT int z_IUSuppliedRecords_elem (ODR o, Z_IUSuppliedRecords_elem **p, int opt, const char *name);
-
-typedef struct Z_IUSuppliedRecords Z_IUSuppliedRecords;
-YAZ_EXPORT int z_IUSuppliedRecords (ODR o, Z_IUSuppliedRecords **p, int opt, const char *name);
-
-typedef Z_IUSuppliedRecords  Z_IUOriginPartNotToKeep;
-YAZ_EXPORT int z_IUOriginPartNotToKeep (ODR o, Z_IUOriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_IUCorrelationInfo Z_IUCorrelationInfo;
-YAZ_EXPORT int z_IUCorrelationInfo (ODR o, Z_IUCorrelationInfo **p, int opt, const char *name);
-
-typedef struct Z_IUTaskPackageRecordStructureSurrogateDiagnostics Z_IUTaskPackageRecordStructureSurrogateDiagnostics;
-YAZ_EXPORT int z_IUTaskPackageRecordStructureSurrogateDiagnostics (ODR o, Z_IUTaskPackageRecordStructureSurrogateDiagnostics **p, int opt, const char *name);
-
-typedef struct Z_IUTaskPackageRecordStructure Z_IUTaskPackageRecordStructure;
-YAZ_EXPORT int z_IUTaskPackageRecordStructure (ODR o, Z_IUTaskPackageRecordStructure **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_IUUpdateEsRequest {
-       Z_IUOriginPartToKeep *toKeep;
-       Z_IUOriginPartNotToKeep *notToKeep;
-};
-
-struct Z_IUUpdateTaskPackage {
-       Z_IUOriginPartToKeep *originPart;
-       Z_IUTargetPart *targetPart;
-};
-
-struct Z_IUUpdate {
-       int which;
-       union {
-               Z_IUUpdateEsRequest *esRequest;
-               Z_IUUpdateTaskPackage *taskPackage;
-#define Z_IUUpdate_esRequest 1
-#define Z_IUUpdate_taskPackage 2
-       } u;
-};
-
-struct Z_IUOriginPartToKeep {
-#define Z_IUOriginPartToKeep_recordInsert 1
-#define Z_IUOriginPartToKeep_recordReplace 2
-#define Z_IUOriginPartToKeep_recordDelete 3
-#define Z_IUOriginPartToKeep_elementUpdate 4
-#define Z_IUOriginPartToKeep_specialUpdate 5
-       int *action;
-       Z_InternationalString *databaseName;
-       Odr_oid *schema; /* OPT */
-       Z_InternationalString *elementSetName; /* OPT */
-       Z_External *actionQualifier; /* OPT */
-};
-
-
-
-struct Z_IUTargetPart {
-#define Z_IUTargetPart_success 1
-#define Z_IUTargetPart_partial 2
-#define Z_IUTargetPart_failure 3
-       int *updateStatus;
-       int num_globalDiagnostics;
-       Z_DiagRec **globalDiagnostics; /* OPT */
-       int num_taskPackageRecords;
-       Z_IUTaskPackageRecordStructure **taskPackageRecords;
-};
-
-struct Z_IUSuppliedRecordsId {
-       int which;
-       union {
-               char *timeStamp;
-               Z_InternationalString *versionNumber;
-               Z_External *previousVersion;
-#define Z_IUSuppliedRecordsId_timeStamp 1
-#define Z_IUSuppliedRecordsId_versionNumber 2
-#define Z_IUSuppliedRecordsId_previousVersion 3
-       } u;
-};
-
-struct Z_IUSuppliedRecords_elem {
-       int which;
-       union {
-               int *number;
-               Z_InternationalString *string;
-               Odr_oct *opaque;
-#define Z_IUSuppliedRecords_elem_number 1
-#define Z_IUSuppliedRecords_elem_string 2
-#define Z_IUSuppliedRecords_elem_opaque 3
-       } u; /* OPT */
-       Z_IUSuppliedRecordsId *supplementalId; /* OPT */
-       Z_IUCorrelationInfo *correlationInfo; /* OPT */
-       Z_External *record;
-};
-
-struct Z_IUSuppliedRecords {
-       int num;
-       Z_IUSuppliedRecords_elem **elements;
-};
-
-struct Z_IUCorrelationInfo {
-       Z_InternationalString *note; /* OPT */
-       int *id; /* OPT */
-};
-
-struct Z_IUTaskPackageRecordStructureSurrogateDiagnostics {
-       int num;
-       Z_DiagRec **elements;
-};
-
-struct Z_IUTaskPackageRecordStructure {
-       int which;
-       union {
-               Z_External *record;
-               Z_IUTaskPackageRecordStructureSurrogateDiagnostics *surrogateDiagnostics;
-#define Z_IUTaskPackageRecordStructure_record 1
-#define Z_IUTaskPackageRecordStructure_surrogateDiagnostics 2
-       } u; /* OPT */
-       Z_IUCorrelationInfo *correlationInfo; /* OPT */
-#define Z_IUTaskPackageRecordStructure_success 1
-#define Z_IUTaskPackageRecordStructure_queued 2
-#define Z_IUTaskPackageRecordStructure_inProcess 3
-#define Z_IUTaskPackageRecordStructure_failure 4
-       int *recordStatus;
-       int num_supplementalDiagnostics;
-       Z_DiagRec **supplementalDiagnostics; /* OPT */
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/include/yaz/zes-update0.h b/include/yaz/zes-update0.h
deleted file mode 100644 (file)
index b2ae393..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-H ESFormat-Update0 */
-
-#ifndef zes_update0_H
-#define zes_update0_H
-
-#include <yaz/odr.h>
-#include <yaz/z-core.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Z_IU0UpdateEsRequest Z_IU0UpdateEsRequest;
-YAZ_EXPORT int z_IU0UpdateEsRequest (ODR o, Z_IU0UpdateEsRequest **p, int opt, const char *name);
-
-typedef struct Z_IU0UpdateTaskPackage Z_IU0UpdateTaskPackage;
-YAZ_EXPORT int z_IU0UpdateTaskPackage (ODR o, Z_IU0UpdateTaskPackage **p, int opt, const char *name);
-
-typedef struct Z_IU0Update Z_IU0Update;
-YAZ_EXPORT int z_IU0Update (ODR o, Z_IU0Update **p, int opt, const char *name);
-
-typedef struct Z_IU0OriginPartToKeep Z_IU0OriginPartToKeep;
-YAZ_EXPORT int z_IU0OriginPartToKeep (ODR o, Z_IU0OriginPartToKeep **p, int opt, const char *name);
-
-typedef struct Z_IU0TargetPart Z_IU0TargetPart;
-YAZ_EXPORT int z_IU0TargetPart (ODR o, Z_IU0TargetPart **p, int opt, const char *name);
-
-typedef struct Z_IU0SuppliedRecordsId Z_IU0SuppliedRecordsId;
-YAZ_EXPORT int z_IU0SuppliedRecordsId (ODR o, Z_IU0SuppliedRecordsId **p, int opt, const char *name);
-
-typedef struct Z_IU0SuppliedRecords_elem Z_IU0SuppliedRecords_elem;
-YAZ_EXPORT int z_IU0SuppliedRecords_elem (ODR o, Z_IU0SuppliedRecords_elem **p, int opt, const char *name);
-
-typedef struct Z_IU0SuppliedRecords Z_IU0SuppliedRecords;
-YAZ_EXPORT int z_IU0SuppliedRecords (ODR o, Z_IU0SuppliedRecords **p, int opt, const char *name);
-
-typedef Z_IU0SuppliedRecords  Z_IU0OriginPartNotToKeep;
-YAZ_EXPORT int z_IU0OriginPartNotToKeep (ODR o, Z_IU0OriginPartNotToKeep **p, int opt, const char *name);
-
-typedef struct Z_IU0CorrelationInfo Z_IU0CorrelationInfo;
-YAZ_EXPORT int z_IU0CorrelationInfo (ODR o, Z_IU0CorrelationInfo **p, int opt, const char *name);
-
-typedef struct Z_IU0TaskPackageRecordStructure Z_IU0TaskPackageRecordStructure;
-YAZ_EXPORT int z_IU0TaskPackageRecordStructure (ODR o, Z_IU0TaskPackageRecordStructure **p, int opt, const char *name);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct Z_IU0UpdateEsRequest {
-       Z_IU0OriginPartToKeep *toKeep;
-       Z_IU0OriginPartNotToKeep *notToKeep;
-};
-
-struct Z_IU0UpdateTaskPackage {
-       Z_IU0OriginPartToKeep *originPart;
-       Z_IU0TargetPart *targetPart;
-};
-
-struct Z_IU0Update {
-       int which;
-       union {
-               Z_IU0UpdateEsRequest *esRequest;
-               Z_IU0UpdateTaskPackage *taskPackage;
-#define Z_IU0Update_esRequest 1
-#define Z_IU0Update_taskPackage 2
-       } u;
-};
-
-struct Z_IU0OriginPartToKeep {
-#define Z_IU0OriginPartToKeep_recordInsert 1
-#define Z_IU0OriginPartToKeep_recordReplace 2
-#define Z_IU0OriginPartToKeep_recordDelete 3
-#define Z_IU0OriginPartToKeep_elementUpdate 4
-       int *action;
-       Z_InternationalString *databaseName;
-       Odr_oid *schema; /* OPT */
-       Z_InternationalString *elementSetName; /* OPT */
-};
-
-
-
-struct Z_IU0TargetPart {
-#define Z_IU0TargetPart_success 1
-#define Z_IU0TargetPart_partial 2
-#define Z_IU0TargetPart_failure 3
-       int *updateStatus;
-       int num_globalDiagnostics;
-       Z_DiagRec **globalDiagnostics; /* OPT */
-       int num_taskPackageRecords;
-       Z_IU0TaskPackageRecordStructure **taskPackageRecords;
-};
-
-struct Z_IU0SuppliedRecordsId {
-       int which;
-       union {
-               char *timeStamp;
-               Z_InternationalString *versionNumber;
-               Z_External *previousVersion;
-#define Z_IU0SuppliedRecordsId_timeStamp 1
-#define Z_IU0SuppliedRecordsId_versionNumber 2
-#define Z_IU0SuppliedRecordsId_previousVersion 3
-       } u;
-};
-
-struct Z_IU0SuppliedRecords_elem {
-       int which;
-       union {
-               int *number;
-               Z_InternationalString *string;
-               Odr_oct *opaque;
-#define Z_IU0SuppliedRecords_elem_number 1
-#define Z_IU0SuppliedRecords_elem_string 2
-#define Z_IU0SuppliedRecords_elem_opaque 3
-       } u; /* OPT */
-       Z_IU0SuppliedRecordsId *supplementalId; /* OPT */
-       Z_IU0CorrelationInfo *correlationInfo; /* OPT */
-       Z_External *record;
-};
-
-struct Z_IU0SuppliedRecords {
-       int num;
-       Z_IU0SuppliedRecords_elem **elements;
-};
-
-struct Z_IU0CorrelationInfo {
-       Z_InternationalString *note; /* OPT */
-       int *id; /* OPT */
-};
-
-struct Z_IU0TaskPackageRecordStructure {
-       int which;
-       union {
-               Z_External *record;
-               Z_DiagRec *diagnostic;
-#define Z_IU0TaskPackageRecordStructure_record 1
-#define Z_IU0TaskPackageRecordStructure_diagnostic 2
-       } u; /* OPT */
-       Z_IU0CorrelationInfo *correlationInfo; /* OPT */
-#define Z_IU0TaskPackageRecordStructure_success 1
-#define Z_IU0TaskPackageRecordStructure_queued 2
-#define Z_IU0TaskPackageRecordStructure_inProcess 3
-#define Z_IU0TaskPackageRecordStructure_failure 4
-       int *recordStatus;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/z39.50/z-accdes1.c b/z39.50/z-accdes1.c
deleted file mode 100644 (file)
index 6637862..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: AccessControlFormat-des-1 */
-
-#include <yaz/z-accdes1.h>
-
-int z_DES_RN_Object (ODR o, Z_DES_RN_Object **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_DES_RN_Object_challenge,
-               (Odr_fun) z_DRNType, "challenge"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_DES_RN_Object_response,
-               (Odr_fun) z_DRNType, "response"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DRNType (ODR o, Z_DRNType **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->userId, ODR_CONTEXT, 1, 1, "userId") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->salt, ODR_CONTEXT, 2, 1, "salt") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->randomNumber, ODR_CONTEXT, 3, 0, "randomNumber") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-accform1.c b/z39.50/z-accform1.c
deleted file mode 100644 (file)
index 978af7e..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: AccessControlFormat-prompt-1 */
-
-#include <yaz/z-accform1.h>
-
-int z_PromptObject1 (ODR o, Z_PromptObject1 **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptObject1_challenge,
-               (Odr_fun) z_Challenge1, "challenge"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptObject1_response,
-               (Odr_fun) z_Response1, "response"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ChallengeUnit1 (ODR o, Z_ChallengeUnit1 **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ChallengeUnit1_character,
-               (Odr_fun) z_InternationalString, "character"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ChallengeUnit1_encrypted,
-               (Odr_fun) z_Encryption, "encrypted"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PromptId,
-                       &(*p)->promptId, ODR_CONTEXT, 1, 0, "promptId") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->defaultResponse, ODR_CONTEXT, 2, 1, "defaultResponse") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 3, "promptInfo") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->regExpr, ODR_CONTEXT, 4, 1, "regExpr") &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->responseRequired, ODR_CONTEXT, 5, 1, "responseRequired") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 6) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->allowedValues,
-                 &(*p)->num_allowedValues, "allowedValues") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->shouldSave, ODR_CONTEXT, 7, 1, "shouldSave") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->dataType, ODR_CONTEXT, 8, 1, "dataType") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->diagnostic, ODR_CONTEXT, 9, 1, "diagnostic") &&
-               odr_sequence_end (o);
-}
-
-int z_Challenge1 (ODR o, Z_Challenge1 **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ChallengeUnit1, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ResponseUnit1 (ODR o, Z_ResponseUnit1 **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ResponseUnit1_string,
-               (Odr_fun) z_InternationalString, "string"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ResponseUnit1_accept,
-               (Odr_fun) odr_bool, "accept"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ResponseUnit1_acknowledge,
-               (Odr_fun) odr_null, "acknowledge"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 4, Z_ResponseUnit1_diagnostic,
-               (Odr_fun) z_DiagRec, "diagnostic"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ResponseUnit1_encrypted,
-               (Odr_fun) z_Encryption, "encrypted"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PromptId,
-                       &(*p)->promptId, ODR_CONTEXT, 1, 0, "promptId") &&
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 2, "promptResponse") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_sequence_end (o);
-}
-
-int z_Response1 (ODR o, Z_Response1 **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ResponseUnit1, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PromptIdEnumeratedPrompt (ODR o, Z_PromptIdEnumeratedPrompt **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->type, ODR_CONTEXT, 1, 0, "type") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->suggestedString, ODR_CONTEXT, 2, 1, "suggestedString") &&
-               odr_sequence_end (o);
-}
-
-int z_PromptId (ODR o, Z_PromptId **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptId_enumeratedPrompt,
-               (Odr_fun) z_PromptIdEnumeratedPrompt, "enumeratedPrompt"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptId_nonEnumeratedPrompt,
-               (Odr_fun) z_InternationalString, "nonEnumeratedPrompt"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Encryption (ODR o, Z_Encryption **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->cryptType, ODR_CONTEXT, 1, 1, "cryptType") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->credential, ODR_CONTEXT, 2, 1, "credential") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->data, ODR_CONTEXT, 3, 0, "data") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-acckrb1.c b/z39.50/z-acckrb1.c
deleted file mode 100644 (file)
index ae8bd1a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: AccessControlFormat-krb-1 */
-
-#include <yaz/z-acckrb1.h>
-
-int z_KRBObject (ODR o, Z_KRBObject **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_KRBObject_challenge,
-               (Odr_fun) z_KRBRequest, "challenge"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_KRBObject_response,
-               (Odr_fun) z_KRBResponse, "response"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_KRBRequest (ODR o, Z_KRBRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->service, ODR_CONTEXT, 1, 0, "service") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->instance, ODR_CONTEXT, 2, 1, "instance") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->realm, ODR_CONTEXT, 3, 1, "realm") &&
-               odr_sequence_end (o);
-}
-
-int z_KRBResponse (ODR o, Z_KRBResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->userid, ODR_CONTEXT, 1, 1, "userid") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->ticket, ODR_CONTEXT, 2, 0, "ticket") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-core.c b/z39.50/z-core.c
deleted file mode 100644 (file)
index fe234a5..0000000
+++ /dev/null
@@ -1,1453 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: Z39-50-APDU-1995 */
-
-#include <yaz/z-core.h>
-
-int z_APDU (ODR o, Z_APDU **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 20, Z_APDU_initRequest,
-               (Odr_fun) z_InitRequest, "initRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 21, Z_APDU_initResponse,
-               (Odr_fun) z_InitResponse, "initResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 22, Z_APDU_searchRequest,
-               (Odr_fun) z_SearchRequest, "searchRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 23, Z_APDU_searchResponse,
-               (Odr_fun) z_SearchResponse, "searchResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 24, Z_APDU_presentRequest,
-               (Odr_fun) z_PresentRequest, "presentRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse,
-               (Odr_fun) z_PresentResponse, "presentResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 26, Z_APDU_deleteResultSetRequest,
-               (Odr_fun) z_DeleteResultSetRequest, "deleteResultSetRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
-               (Odr_fun) z_DeleteResultSetResponse, "deleteResultSetResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_APDU_accessControlRequest,
-               (Odr_fun) z_AccessControlRequest, "accessControlRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 29, Z_APDU_accessControlResponse,
-               (Odr_fun) z_AccessControlResponse, "accessControlResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
-               (Odr_fun) z_ResourceControlRequest, "resourceControlRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,
-               (Odr_fun) z_ResourceControlResponse, "resourceControlResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 32, Z_APDU_triggerResourceControlRequest,
-               (Odr_fun) z_TriggerResourceControlRequest, "triggerResourceControlRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 33, Z_APDU_resourceReportRequest,
-               (Odr_fun) z_ResourceReportRequest, "resourceReportRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 34, Z_APDU_resourceReportResponse,
-               (Odr_fun) z_ResourceReportResponse, "resourceReportResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest,
-               (Odr_fun) z_ScanRequest, "scanRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse,
-               (Odr_fun) z_ScanResponse, "scanResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest,
-               (Odr_fun) z_SortRequest, "sortRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 44, Z_APDU_sortResponse,
-               (Odr_fun) z_SortResponse, "sortResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest,
-               (Odr_fun) z_Segment, "segmentRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 46, Z_APDU_extendedServicesRequest,
-               (Odr_fun) z_ExtendedServicesRequest, "extendedServicesRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 47, Z_APDU_extendedServicesResponse,
-               (Odr_fun) z_ExtendedServicesResponse, "extendedServicesResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close,
-               (Odr_fun) z_Close, "close"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_InitRequest (ODR o, Z_InitRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               z_ProtocolVersion(o, &(*p)->protocolVersion, 0, "protocolVersion") &&
-               z_Options(o, &(*p)->options, 0, "options") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->preferredMessageSize, ODR_CONTEXT, 5, 0, "preferredMessageSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maximumRecordSize, ODR_CONTEXT, 6, 0, "maximumRecordSize") &&
-               odr_explicit_tag (o, z_IdAuthentication,
-                       &(*p)->idAuthentication, ODR_CONTEXT, 7, 1, "idAuthentication") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->implementationId, ODR_CONTEXT, 110, 1, "implementationId") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->implementationName, ODR_CONTEXT, 111, 1, "implementationName") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->implementationVersion, ODR_CONTEXT, 112, 1, "implementationVersion") &&
-               odr_explicit_tag (o, z_External,
-                       &(*p)->userInformationField, ODR_CONTEXT, 11, 1, "userInformationField") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_IdPass (ODR o, Z_IdPass **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->groupId, ODR_CONTEXT, 0, 1, "groupId") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->userId, ODR_CONTEXT, 1, 1, "userId") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->password, ODR_CONTEXT, 2, 1, "password") &&
-               odr_sequence_end (o);
-}
-
-int z_IdAuthentication (ODR o, Z_IdAuthentication **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_IdAuthentication_open,
-                (Odr_fun) odr_visiblestring, "open"},
-               {-1, -1, -1, Z_IdAuthentication_idPass,
-                (Odr_fun) z_IdPass, "idPass"},
-               {-1, -1, -1, Z_IdAuthentication_anonymous,
-                (Odr_fun) odr_null, "anonymous"},
-               {-1, -1, -1, Z_IdAuthentication_other,
-                (Odr_fun) z_External, "other"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_InitResponse (ODR o, Z_InitResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               z_ProtocolVersion(o, &(*p)->protocolVersion, 0, "protocolVersion") &&
-               z_Options(o, &(*p)->options, 0, "options") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->preferredMessageSize, ODR_CONTEXT, 5, 0, "preferredMessageSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maximumRecordSize, ODR_CONTEXT, 6, 0, "maximumRecordSize") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->result, ODR_CONTEXT, 12, 0, "result") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->implementationId, ODR_CONTEXT, 110, 1, "implementationId") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->implementationName, ODR_CONTEXT, 111, 1, "implementationName") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->implementationVersion, ODR_CONTEXT, 112, 1, "implementationVersion") &&
-               odr_explicit_tag (o, z_External,
-                       &(*p)->userInformationField, ODR_CONTEXT, 11, 1, "userInformationField") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ProtocolVersion (ODR o, Z_ProtocolVersion **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, odr_bitstring, p, ODR_CONTEXT, 3, opt, name);
-}
-
-int z_Options (ODR o, Z_Options **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, odr_bitstring, p, ODR_CONTEXT, 4, opt, name);
-}
-
-int z_SearchRequest (ODR o, Z_SearchRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->smallSetUpperBound, ODR_CONTEXT, 13, 0, "smallSetUpperBound") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->largeSetLowerBound, ODR_CONTEXT, 14, 0, "largeSetLowerBound") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->mediumSetPresentNumber, ODR_CONTEXT, 15, 0, "mediumSetPresentNumber") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->replaceIndicator, ODR_CONTEXT, 16, 0, "replaceIndicator") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->resultSetName, ODR_CONTEXT, 17, 0, "resultSetName") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 18) &&
-               odr_sequence_of(o, (Odr_fun) z_DatabaseName, &(*p)->databaseNames,
-                 &(*p)->num_databaseNames, "databaseNames") &&
-               odr_explicit_tag (o, z_ElementSetNames,
-                       &(*p)->smallSetElementSetNames, ODR_CONTEXT, 100, 1, "smallSetElementSetNames") &&
-               odr_explicit_tag (o, z_ElementSetNames,
-                       &(*p)->mediumSetElementSetNames, ODR_CONTEXT, 101, 1, "mediumSetElementSetNames") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->preferredRecordSyntax, ODR_CONTEXT, 104, 1, "preferredRecordSyntax") &&
-               odr_explicit_tag (o, z_Query,
-                       &(*p)->query, ODR_CONTEXT, 21, 0, "query") &&
-               odr_implicit_tag (o, z_OtherInformation,
-                       &(*p)->additionalSearchInfo, ODR_CONTEXT, 203, 1, "additionalSearchInfo") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_Query (ODR o, Z_Query **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_Query_type_0,
-               (Odr_fun) z_ANY_type_0, "type_0"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1,
-               (Odr_fun) z_RPNQuery, "type_1"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2,
-               (Odr_fun) odr_octetstring, "type_2"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 100, Z_Query_type_100,
-               (Odr_fun) odr_octetstring, "type_100"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 101, Z_Query_type_101,
-               (Odr_fun) z_RPNQuery, "type_101"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 102, Z_Query_type_102,
-               (Odr_fun) odr_octetstring, "type_102"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_RPNQuery (ODR o, Z_RPNQuery **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_AttributeSetId(o, &(*p)->attributeSetId, 0, "attributeSetId") &&
-               z_RPNStructure(o, &(*p)->RPNStructure, 0, "RPNStructure") &&
-               odr_sequence_end (o);
-}
-
-int z_Complex (ODR o, Z_Complex **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_RPNStructure(o, &(*p)->s1, 0, "s1") &&
-               z_RPNStructure(o, &(*p)->s2, 0, "s2") &&
-               z_Operator(o, &(*p)->roperator, 0, "roperator") &&
-               odr_sequence_end (o);
-}
-
-int z_RPNStructure (ODR o, Z_RPNStructure **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_RPNStructure_simple,
-               (Odr_fun) z_Operand, "simple"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_RPNStructure_complex,
-               (Odr_fun) z_Complex, "complex"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Operand (ODR o, Z_Operand **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_Operand_APT,
-                (Odr_fun) z_AttributesPlusTerm, "attributesPlusTerm"},
-               {-1, -1, -1, Z_Operand_resultSetId,
-                (Odr_fun) z_ResultSetId, "resultSetId"},
-               {-1, -1, -1, Z_Operand_resultAttr,
-                (Odr_fun) z_ResultSetPlusAttributes, "resultAttr"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AttributesPlusTerm (ODR o, Z_AttributesPlusTerm **p, int opt, const char *name)
-{
-       if (!odr_implicit_settag (o, ODR_CONTEXT, 102) ||
-               !odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok(o);
-       return
-               z_AttributeList(o, &(*p)->attributes, 0, "attributes") &&
-               z_Term(o, &(*p)->term, 0, "term") &&
-               odr_sequence_end (o);
-}
-
-int z_ResultSetPlusAttributes (ODR o, Z_ResultSetPlusAttributes **p, int opt, const char *name)
-{
-       if (!odr_implicit_settag (o, ODR_CONTEXT, 214) ||
-               !odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok(o);
-       return
-               z_ResultSetId(o, &(*p)->resultSet, 0, "resultSet") &&
-               z_AttributeList(o, &(*p)->attributes, 0, "attributes") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeList (ODR o, Z_AttributeList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       odr_implicit_settag (o, ODR_CONTEXT, 44);
-       if (odr_sequence_of (o, (Odr_fun) z_AttributeElement, &(*p)->attributes,
-               &(*p)->num_attributes, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Term (ODR o, Z_Term **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_Term_general,
-               (Odr_fun) odr_octetstring, "general"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 215, Z_Term_numeric,
-               (Odr_fun) odr_integer, "numeric"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 216, Z_Term_characterString,
-               (Odr_fun) z_InternationalString, "characterString"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid,
-               (Odr_fun) odr_oid, "oid"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 218, Z_Term_dateTime,
-               (Odr_fun) odr_generalizedtime, "dateTime"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external,
-               (Odr_fun) z_External, "external"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 220, Z_Term_integerAndUnit,
-               (Odr_fun) z_IntUnit, "integerAndUnit"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null,
-               (Odr_fun) odr_null, "null"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Operator (ODR o, Z_Operator **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and,
-               (Odr_fun) odr_null, "and"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or,
-               (Odr_fun) odr_null, "or"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not,
-               (Odr_fun) odr_null, "and_not"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox,
-               (Odr_fun) z_ProximityOperator, "prox"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!*p && o->direction != ODR_DECODE)
-               return opt;
-       if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46, 0))
-               return opt && odr_ok(o);
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name) &&
-               odr_constructed_end(o))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ComplexAttribute (ODR o, Z_ComplexAttribute **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               odr_sequence_of(o, (Odr_fun) z_StringOrNumeric, &(*p)->list,
-                 &(*p)->num_list, "list") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) odr_integer, &(*p)->semanticAction,
-                 &(*p)->num_semanticAction, "semanticAction") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeElement (ODR o, Z_AttributeElement **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 121, Z_AttributeValue_numeric,
-               (Odr_fun) odr_integer, "numeric"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 224, Z_AttributeValue_complex,
-               (Odr_fun) z_ComplexAttribute, "complex"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_AttributeSetId,
-                       &(*p)->attributeSet, ODR_CONTEXT, 1, 1, "attributeSet") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->attributeType, ODR_CONTEXT, 120, 0, "attributeType") &&
-               odr_choice (o, arm, &(*p)->value, &(*p)->which, 0) &&
-               odr_sequence_end (o);
-}
-
-int z_ProximityOperator (ODR o, Z_ProximityOperator **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProximityOperator_known,
-               (Odr_fun) z_ProxUnit, "known"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProximityOperator_private,
-               (Odr_fun) odr_integer, "zprivate"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->exclusion, ODR_CONTEXT, 1, 1, "exclusion") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->distance, ODR_CONTEXT, 2, 0, "distance") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->ordered, ODR_CONTEXT, 3, 0, "ordered") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->relationType, ODR_CONTEXT, 4, 0, "relationType") &&
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 5, "proximityUnitCode") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_sequence_end (o);
-}
-
-int z_ProxUnit (ODR o, Z_ProxUnit **p, int opt, const char *name)
-{
-       return odr_integer (o, p, opt, name);
-}
-
-int z_SearchResponse (ODR o, Z_SearchResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->resultCount, ODR_CONTEXT, 23, 0, "resultCount") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfRecordsReturned, ODR_CONTEXT, 24, 0, "numberOfRecordsReturned") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->nextResultSetPosition, ODR_CONTEXT, 25, 0, "nextResultSetPosition") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->searchStatus, ODR_CONTEXT, 22, 0, "searchStatus") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->resultSetStatus, ODR_CONTEXT, 26, 1, "resultSetStatus") &&
-               z_PresentStatus(o, &(*p)->presentStatus, 1, "presentStatus") &&
-               z_Records(o, &(*p)->records, 1, "records") &&
-               odr_implicit_tag (o, z_OtherInformation,
-                       &(*p)->additionalSearchInfo, ODR_CONTEXT, 203, 1, "additionalSearchInfo") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_RecordComposition (ODR o, Z_RecordComposition **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 19, Z_RecordComp_simple,
-               (Odr_fun) z_ElementSetNames, "simple"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex,
-               (Odr_fun) z_CompSpec, "complex"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PresentRequest (ODR o, Z_PresentRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               z_ResultSetId(o, &(*p)->resultSetId, 0, "resultSetId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->resultSetStartPoint, ODR_CONTEXT, 30, 0, "resultSetStartPoint") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfRecordsRequested, ODR_CONTEXT, 29, 0, "numberOfRecordsRequested") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 212) &&
-               (odr_sequence_of(o, (Odr_fun) z_Range, &(*p)->additionalRanges,
-                 &(*p)->num_ranges, "additionalRanges") || odr_ok(o)) &&
-               z_RecordComposition (o, &(*p)->recordComposition, 1, "recordComposition") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->preferredRecordSyntax, ODR_CONTEXT, 104, 1, "preferredRecordSyntax") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxSegmentCount, ODR_CONTEXT, 204, 1, "maxSegmentCount") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxRecordSize, ODR_CONTEXT, 206, 1, "maxRecordSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxSegmentSize, ODR_CONTEXT, 207, 1, "maxSegmentSize") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_Segment (ODR o, Z_Segment **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfRecordsReturned, ODR_CONTEXT, 24, 0, "numberOfRecordsReturned") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 0) &&
-               odr_sequence_of(o, (Odr_fun) z_NamePlusRecord, &(*p)->segmentRecords,
-                 &(*p)->num_segmentRecords, "segmentRecords") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_PresentResponse (ODR o, Z_PresentResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfRecordsReturned, ODR_CONTEXT, 24, 0, "numberOfRecordsReturned") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->nextResultSetPosition, ODR_CONTEXT, 25, 0, "nextResultSetPosition") &&
-               z_PresentStatus(o, &(*p)->presentStatus, 0, "presentStatus") &&
-               z_Records(o, &(*p)->records, 1, "records") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_NamePlusRecordList (ODR o, Z_NamePlusRecordList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_NamePlusRecord, &(*p)->records,
-               &(*p)->num_records, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DiagRecs (ODR o, Z_DiagRecs **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_DiagRec, &(*p)->diagRecs,
-               &(*p)->num_diagRecs, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Records (ODR o, Z_Records **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD,
-               (Odr_fun) z_NamePlusRecordList, "databaseOrSurDiagnostics"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD,
-               (Odr_fun) z_DefaultDiagFormat, "nonSurrogateDiagnostic"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 205, Z_Records_multipleNSD,
-               (Odr_fun) z_DiagRecs, "multipleNonSurDiagnostics"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_NamePlusRecord (ODR o, Z_NamePlusRecord **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_NamePlusRecord_databaseRecord,
-               (Odr_fun) z_External, "databaseRecord"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_NamePlusRecord_surrogateDiagnostic,
-               (Odr_fun) z_DiagRec, "surrogateDiagnostic"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 3, Z_NamePlusRecord_startingFragment,
-               (Odr_fun) z_FragmentSyntax, "startingFragment"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 4, Z_NamePlusRecord_intermediateFragment,
-               (Odr_fun) z_FragmentSyntax, "intermediateFragment"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 5, Z_NamePlusRecord_finalFragment,
-               (Odr_fun) z_FragmentSyntax, "finalFragment"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 0, 1, "databaseName") &&
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "record") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_sequence_end (o);
-}
-
-int z_FragmentSyntax (ODR o, Z_FragmentSyntax **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_FragmentSyntax_externallyTagged,
-                (Odr_fun) z_External, "externallyTagged"},
-               {-1, -1, -1, Z_FragmentSyntax_notExternallyTagged,
-                (Odr_fun) odr_octetstring, "notExternallyTagged"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DiagRec (ODR o, Z_DiagRec **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_DiagRec_defaultFormat,
-                (Odr_fun) z_DefaultDiagFormat, "defaultFormat"},
-               {-1, -1, -1, Z_DiagRec_externallyDefined,
-                (Odr_fun) z_External, "externallyDefined"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DefaultDiagFormat (ODR o, Z_DefaultDiagFormat **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_DefaultDiagFormat_v2Addinfo,
-                (Odr_fun) odr_visiblestring, "v2Addinfo"},
-               {-1, -1, -1, Z_DefaultDiagFormat_v3Addinfo,
-                (Odr_fun) z_InternationalString, "v3Addinfo"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_oid(o, &(*p)->diagnosticSetId, 0, "diagnosticSetId") &&
-               odr_integer(o, &(*p)->condition, 0, "condition") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_sequence_end (o);
-}
-
-int z_Range (ODR o, Z_Range **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->startingPosition, ODR_CONTEXT, 1, 0, "startingPosition") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfRecords, ODR_CONTEXT, 2, 0, "numberOfRecords") &&
-               odr_sequence_end (o);
-}
-
-int z_DatabaseSpecificUnit (ODR o, Z_DatabaseSpecificUnit **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_DatabaseName(o, &(*p)->dbName, 0, "dbName") &&
-               z_ElementSetName(o, &(*p)->esn, 0, "esn") &&
-               odr_sequence_end (o);
-}
-
-int z_DatabaseSpecific (ODR o, Z_DatabaseSpecific **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_DatabaseSpecificUnit, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ElementSetNames (ODR o, Z_ElementSetNames **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ElementSetNames_generic,
-               (Odr_fun) z_InternationalString, "generic"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSetNames_databaseSpecific,
-               (Odr_fun) z_DatabaseSpecific, "databaseSpecific"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PresentStatus (ODR o, Z_PresentStatus **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, odr_integer, p, ODR_CONTEXT, 27, opt, name);
-}
-
-int z_DbSpecific (ODR o, Z_DbSpecific **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_DatabaseName,
-                       &(*p)->db, ODR_CONTEXT, 1, 0, "db") &&
-               odr_implicit_tag (o, z_Specification,
-                       &(*p)->spec, ODR_CONTEXT, 2, 0, "spec") &&
-               odr_sequence_end (o);
-}
-
-int z_CompSpec (ODR o, Z_CompSpec **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->selectAlternativeSyntax, ODR_CONTEXT, 1, 0, "selectAlternativeSyntax") &&
-               odr_implicit_tag (o, z_Specification,
-                       &(*p)->generic, ODR_CONTEXT, 2, 1, "generic") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_DbSpecific, &(*p)->dbSpecific,
-                 &(*p)->num_dbSpecific, "dbSpecific") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->recordSyntax,
-                 &(*p)->num_recordSyntax, "recordSyntax") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_ElementSpec (ODR o, Z_ElementSpec **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName,
-               (Odr_fun) z_InternationalString, "elementSetName"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementSpec_externalSpec,
-               (Odr_fun) z_External, "externalSpec"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Specification (ODR o, Z_Specification **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->schema, ODR_CONTEXT, 1, 1, "schema") &&
-               odr_explicit_tag (o, z_ElementSpec,
-                       &(*p)->elementSpec, ODR_CONTEXT, 2, 1, "elementSpec") &&
-               odr_sequence_end (o);
-}
-
-int z_DeleteResultSetRequest (ODR o, Z_DeleteResultSetRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->deleteFunction, ODR_CONTEXT, 32, 0, "deleteFunction") &&
-               (odr_sequence_of(o, (Odr_fun) z_ResultSetId, &(*p)->resultSetList,
-                 &(*p)->num_resultSetList, "resultSetList") || odr_ok(o)) &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_DeleteResultSetResponse (ODR o, Z_DeleteResultSetResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, z_DeleteStatus,
-                       &(*p)->deleteOperationStatus, ODR_CONTEXT, 0, 0, "deleteOperationStatus") &&
-               odr_implicit_tag (o, z_ListStatuses,
-                       &(*p)->deleteListStatuses, ODR_CONTEXT, 1, 1, "deleteListStatuses") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberNotDeleted, ODR_CONTEXT, 34, 1, "numberNotDeleted") &&
-               odr_implicit_tag (o, z_ListStatuses,
-                       &(*p)->bulkStatuses, ODR_CONTEXT, 35, 1, "bulkStatuses") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->deleteMessage, ODR_CONTEXT, 36, 1, "deleteMessage") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ListStatus (ODR o, Z_ListStatus **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ResultSetId(o, &(*p)->id, 0, "id") &&
-               z_DeleteStatus(o, &(*p)->status, 0, "status") &&
-               odr_sequence_end (o);
-}
-
-int z_ListStatuses (ODR o, Z_ListStatuses **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ListStatus, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DeleteStatus (ODR o, Z_DeleteStatus **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, odr_integer, p, ODR_CONTEXT, 33, opt, name);
-}
-
-int z_AccessControlRequest (ODR o, Z_AccessControlRequest **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessControlRequest_simpleForm,
-               (Odr_fun) odr_octetstring, "simpleForm"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessControlRequest_externallyDefined,
-               (Odr_fun) z_External, "externallyDefined"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_AccessControlResponse (ODR o, Z_AccessControlResponse **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessControlResponse_simpleForm,
-               (Odr_fun) odr_octetstring, "simpleForm"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessControlResponse_externallyDefined,
-               (Odr_fun) z_External, "externallyDefined"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               (odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) || odr_ok(o)) &&
-               odr_explicit_tag (o, z_DiagRec,
-                       &(*p)->diagnostic, ODR_CONTEXT, 223, 1, "diagnostic") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ResourceControlRequest (ODR o, Z_ResourceControlRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->suspendedFlag, ODR_CONTEXT, 39, 1, "suspendedFlag") &&
-               odr_explicit_tag (o, z_ResourceReport,
-                       &(*p)->resourceReport, ODR_CONTEXT, 40, 1, "resourceReport") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->partialResultsAvailable, ODR_CONTEXT, 41, 1, "partialResultsAvailable") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->responseRequired, ODR_CONTEXT, 42, 0, "responseRequired") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->triggeredRequestFlag, ODR_CONTEXT, 43, 1, "triggeredRequestFlag") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ResourceControlResponse (ODR o, Z_ResourceControlResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->continueFlag, ODR_CONTEXT, 44, 0, "continueFlag") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->resultSetWanted, ODR_CONTEXT, 45, 1, "resultSetWanted") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_TriggerResourceControlRequest (ODR o, Z_TriggerResourceControlRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->requestedAction, ODR_CONTEXT, 46, 0, "requestedAction") &&
-               odr_implicit_tag (o, z_ResourceReportId,
-                       &(*p)->prefResourceReportFormat, ODR_CONTEXT, 47, 1, "prefResourceReportFormat") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->resultSetWanted, ODR_CONTEXT, 48, 1, "resultSetWanted") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ResourceReportRequest (ODR o, Z_ResourceReportRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, z_ReferenceId,
-                       &(*p)->opId, ODR_CONTEXT, 210, 1, "opId") &&
-               odr_implicit_tag (o, z_ResourceReportId,
-                       &(*p)->prefResourceReportFormat, ODR_CONTEXT, 49, 1, "prefResourceReportFormat") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ResourceReportResponse (ODR o, Z_ResourceReportResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->resourceReportStatus, ODR_CONTEXT, 50, 0, "resourceReportStatus") &&
-               odr_explicit_tag (o, z_ResourceReport,
-                       &(*p)->resourceReport, ODR_CONTEXT, 51, 1, "resourceReport") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ResourceReport (ODR o, Z_ResourceReport **p, int opt, const char *name)
-{
-       return z_External (o, p, opt, name);
-}
-
-int z_ResourceReportId (ODR o, Z_ResourceReportId **p, int opt, const char *name)
-{
-       return odr_oid (o, p, opt, name);
-}
-
-int z_ScanRequest (ODR o, Z_ScanRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_DatabaseName, &(*p)->databaseNames,
-                 &(*p)->num_databaseNames, "databaseNames") &&
-               z_AttributeSetId(o, &(*p)->attributeSet, 1, "attributeSet") &&
-               z_AttributesPlusTerm(o, &(*p)->termListAndStartPoint, 0, "termListAndStartPoint") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->stepSize, ODR_CONTEXT, 5, 1, "stepSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfTermsRequested, ODR_CONTEXT, 6, 0, "numberOfTermsRequested") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->preferredPositionInResponse, ODR_CONTEXT, 7, 1, "preferredPositionInResponse") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ScanResponse (ODR o, Z_ScanResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->stepSize, ODR_CONTEXT, 3, 1, "stepSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->scanStatus, ODR_CONTEXT, 4, 0, "scanStatus") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfEntriesReturned, ODR_CONTEXT, 5, 0, "numberOfEntriesReturned") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->positionOfTerm, ODR_CONTEXT, 6, 1, "positionOfTerm") &&
-               odr_implicit_tag (o, z_ListEntries,
-                       &(*p)->entries, ODR_CONTEXT, 7, 1, "entries") &&
-               odr_implicit_tag (o, z_AttributeSetId,
-                       &(*p)->attributeSet, ODR_CONTEXT, 8, 1, "attributeSet") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ListEntries (ODR o, Z_ListEntries **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) z_Entry, &(*p)->entries,
-                 &(*p)->num_entries, "entries") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->nonsurrogateDiagnostics,
-                 &(*p)->num_nonsurrogateDiagnostics, "nonsurrogateDiagnostics") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_Entry (ODR o, Z_Entry **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Entry_termInfo,
-               (Odr_fun) z_TermInfo, "termInfo"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Entry_surrogateDiagnostic,
-               (Odr_fun) z_DiagRec, "surrogateDiagnostic"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_TermInfo (ODR o, Z_TermInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_Term(o, &(*p)->term, 0, "term") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->displayTerm, ODR_CONTEXT, 0, 1, "displayTerm") &&
-               z_AttributeList(o, &(*p)->suggestedAttributes, 1, "suggestedAttributes") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) z_AttributesPlusTerm, &(*p)->alternativeTerm,
-                 &(*p)->num_alternativeTerm, "alternativeTerm") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->globalOccurrences, ODR_CONTEXT, 2, 1, "globalOccurrences") &&
-               odr_implicit_tag (o, z_OccurrenceByAttributes,
-                       &(*p)->byAttributes, ODR_CONTEXT, 3, 1, "byAttributes") &&
-               z_OtherInformation(o, &(*p)->otherTermInfo, 1, "otherTermInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_byDatabaseList_s (ODR o, Z_byDatabaseList_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_DatabaseName(o, &(*p)->db, 0, "db") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->num, ODR_CONTEXT, 1, 1, "num") &&
-               z_OtherInformation(o, &(*p)->otherDbInfo, 1, "otherDbInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_byDatabaseList (ODR o, Z_byDatabaseList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_byDatabaseList_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_OccurrenceByAttributesElem (ODR o, Z_OccurrenceByAttributesElem **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_OccurrenceByAttributesElem_global,
-               (Odr_fun) odr_integer, "global"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OccurrenceByAttributesElem_byDatabase,
-               (Odr_fun) z_byDatabaseList, "byDatabase"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_AttributeList,
-                       &(*p)->attributes, ODR_CONTEXT, 1, 0, "attributes") &&
-               (odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) || odr_ok(o)) &&
-               z_OtherInformation(o, &(*p)->otherOccurInfo, 1, "otherOccurInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_OccurrenceByAttributes (ODR o, Z_OccurrenceByAttributes **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_OccurrenceByAttributesElem, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_SortKeySpecList (ODR o, Z_SortKeySpecList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_SortKeySpec, &(*p)->specs,
-               &(*p)->num_specs, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_SortRequest (ODR o, Z_SortRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->inputResultSetNames,
-                 &(*p)->num_inputResultSetNames, "inputResultSetNames") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->sortedResultSetName, ODR_CONTEXT, 4, 0, "sortedResultSetName") &&
-               odr_implicit_tag (o, z_SortKeySpecList,
-                       &(*p)->sortSequence, ODR_CONTEXT, 5, 0, "sortSequence") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_SortResponse (ODR o, Z_SortResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->sortStatus, ODR_CONTEXT, 3, 0, "sortStatus") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->resultSetStatus, ODR_CONTEXT, 4, 1, "resultSetStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->diagnostics,
-                 &(*p)->num_diagnostics, "diagnostics") || odr_ok(o)) &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_SortKeySpec (ODR o, Z_SortKeySpec **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKeySpec_abort,
-               (Odr_fun) odr_null, "abort"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKeySpec_null,
-               (Odr_fun) odr_null, "null"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortKeySpec_missingValueData,
-               (Odr_fun) odr_octetstring, "missingValueData"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_SortElement(o, &(*p)->sortElement, 0, "sortElement") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->sortRelation, ODR_CONTEXT, 1, 0, "sortRelation") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->caseSensitivity, ODR_CONTEXT, 2, 0, "caseSensitivity") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 3, "missingValueAction") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_SortDbSpecificList_s (ODR o, Z_SortDbSpecificList_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_DatabaseName(o, &(*p)->databaseName, 0, "databaseName") &&
-               z_SortKey(o, &(*p)->dbSort, 0, "dbSort") &&
-               odr_sequence_end (o);
-}
-
-int z_SortDbSpecificList (ODR o, Z_SortDbSpecificList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_SortDbSpecificList_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_SortElement (ODR o, Z_SortElement **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_SortElement_generic,
-               (Odr_fun) z_SortKey, "generic"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortElement_databaseSpecific,
-               (Odr_fun) z_SortDbSpecificList, "databaseSpecific"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_SortAttributes (ODR o, Z_SortAttributes **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_AttributeSetId(o, &(*p)->id, 0, "id") &&
-               z_AttributeList(o, &(*p)->list, 0, "list") &&
-               odr_sequence_end (o);
-}
-
-int z_SortKey (ODR o, Z_SortKey **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKey_sortField,
-               (Odr_fun) z_InternationalString, "sortField"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKey_elementSpec,
-               (Odr_fun) z_Specification, "elementSpec"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKey_sortAttributes,
-               (Odr_fun) z_SortAttributes, "sortAttributes"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ExtendedServicesRequest (ODR o, Z_ExtendedServicesRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->function, ODR_CONTEXT, 3, 0, "function") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->packageType, ODR_CONTEXT, 4, 0, "packageType") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->packageName, ODR_CONTEXT, 5, 1, "packageName") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->userId, ODR_CONTEXT, 6, 1, "userId") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->retentionTime, ODR_CONTEXT, 7, 1, "retentionTime") &&
-               odr_implicit_tag (o, z_Permissions,
-                       &(*p)->permissions, ODR_CONTEXT, 8, 1, "permissions") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->description, ODR_CONTEXT, 9, 1, "description") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->taskSpecificParameters, ODR_CONTEXT, 10, 1, "taskSpecificParameters") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->waitAction, ODR_CONTEXT, 11, 0, "waitAction") &&
-               z_ElementSetName(o, &(*p)->elements, 1, "elements") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_ExtendedServicesResponse (ODR o, Z_ExtendedServicesResponse **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->operationStatus, ODR_CONTEXT, 3, 0, "operationStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->diagnostics,
-                 &(*p)->num_diagnostics, "diagnostics") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->taskPackage, ODR_CONTEXT, 5, 1, "taskPackage") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_Permissions_s (ODR o, Z_Permissions_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->userId, ODR_CONTEXT, 1, 0, "userId") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               odr_sequence_of(o, (Odr_fun) odr_integer, &(*p)->allowableFunctions,
-                 &(*p)->num_allowableFunctions, "allowableFunctions") &&
-               odr_sequence_end (o);
-}
-
-int z_Permissions (ODR o, Z_Permissions **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_Permissions_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Close (ODR o, Z_Close **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_ReferenceId(o, &(*p)->referenceId, 1, "referenceId") &&
-               z_CloseReason(o, &(*p)->closeReason, 0, "closeReason") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->diagnosticInformation, ODR_CONTEXT, 3, 1, "diagnosticInformation") &&
-               odr_implicit_tag (o, z_ResourceReportId,
-                       &(*p)->resourceReportFormat, ODR_CONTEXT, 4, 1, "resourceReportFormat") &&
-               odr_explicit_tag (o, z_ResourceReport,
-                       &(*p)->resourceReport, ODR_CONTEXT, 5, 1, "resourceReport") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_CloseReason (ODR o, Z_CloseReason **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, odr_integer, p, ODR_CONTEXT, 211, opt, name);
-}
-
-int z_ReferenceId (ODR o, Z_ReferenceId **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, odr_octetstring, p, ODR_CONTEXT, 2, opt, name);
-}
-
-int z_ResultSetId (ODR o, Z_ResultSetId **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, z_InternationalString, p, ODR_CONTEXT, 31, opt, name);
-}
-
-int z_ElementSetName (ODR o, Z_ElementSetName **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, z_InternationalString, p, ODR_CONTEXT, 103, opt, name);
-}
-
-int z_DatabaseName (ODR o, Z_DatabaseName **p, int opt, const char *name)
-{
-       return odr_implicit_tag (o, z_InternationalString, p, ODR_CONTEXT, 105, opt, name);
-}
-
-int z_AttributeSetId (ODR o, Z_AttributeSetId **p, int opt, const char *name)
-{
-       return odr_oid (o, p, opt, name);
-}
-
-int z_OtherInformationUnit (ODR o, Z_OtherInformationUnit **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_OtherInfo_characterInfo,
-               (Odr_fun) z_InternationalString, "characterInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo,
-               (Odr_fun) odr_octetstring, "binaryInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo,
-               (Odr_fun) z_External, "externallyDefinedInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid,
-               (Odr_fun) odr_oid, "oid"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InfoCategory,
-                       &(*p)->category, ODR_CONTEXT, 1, 1, "category") &&
-               odr_choice (o, arm, &(*p)->information, &(*p)->which, 0) &&
-               odr_sequence_end (o);
-}
-
-int z_OtherInformation (ODR o, Z_OtherInformation **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       odr_implicit_settag (o, ODR_CONTEXT, 201);
-       if (odr_sequence_of (o, (Odr_fun) z_OtherInformationUnit, &(*p)->list,
-               &(*p)->num_elements, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_InfoCategory (ODR o, Z_InfoCategory **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->categoryTypeId, ODR_CONTEXT, 1, 1, "categoryTypeId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->categoryValue, ODR_CONTEXT, 2, 0, "categoryValue") &&
-               odr_sequence_end (o);
-}
-
-int z_IntUnit (ODR o, Z_IntUnit **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->value, ODR_CONTEXT, 1, 0, "value") &&
-               odr_implicit_tag (o, z_Unit,
-                       &(*p)->unitUsed, ODR_CONTEXT, 2, 0, "unitUsed") &&
-               odr_sequence_end (o);
-}
-
-int z_Unit (ODR o, Z_Unit **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_InternationalString,
-                       &(*p)->unitSystem, ODR_CONTEXT, 1, 1, "unitSystem") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->unitType, ODR_CONTEXT, 2, 1, "unitType") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->unit, ODR_CONTEXT, 3, 1, "unit") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->scaleFactor, ODR_CONTEXT, 4, 1, "scaleFactor") &&
-               odr_sequence_end (o);
-}
-
-int z_InternationalString (ODR o, Z_InternationalString **p, int opt, const char *name)
-{
-       return odr_generalstring (o, p, opt, name);
-}
-
-int z_StringOrNumeric (ODR o, Z_StringOrNumeric **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_StringOrNumeric_string,
-               (Odr_fun) z_InternationalString, "string"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_StringOrNumeric_numeric,
-               (Odr_fun) odr_integer, "numeric"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-
-/* the type-0 query ... */
-int z_ANY_type_0 (ODR o, void **p, int opt)
-{
-    return 0;
-}
-
-
diff --git a/z39.50/z-date.c b/z39.50/z-date.c
deleted file mode 100644 (file)
index 9348777..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: UserInfoFormat-dateTime */
-
-#include <yaz/z-date.h>
-
-int z_DateTime (ODR o, Z_DateTime **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_Date,
-                       &(*p)->date, ODR_CONTEXT, 1, 1, "date") &&
-               odr_explicit_tag (o, z_Time,
-                       &(*p)->time, ODR_CONTEXT, 2, 1, "time") &&
-               odr_sequence_end (o);
-}
-
-int z_DateMonthAndDay (ODR o, Z_DateMonthAndDay **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->month, ODR_CONTEXT, 2, 0, "month") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->day, ODR_CONTEXT, 3, 1, "day") &&
-               odr_sequence_end (o);
-}
-
-int z_DateQuarter (ODR o, Z_DateQuarter **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_DateQuarter_first,
-               (Odr_fun) odr_null, "first"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_DateQuarter_second,
-               (Odr_fun) odr_null, "second"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_DateQuarter_third,
-               (Odr_fun) odr_null, "third"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_DateQuarter_fourth,
-               (Odr_fun) odr_null, "fourth"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DateSeason (ODR o, Z_DateSeason **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_DateSeason_winter,
-               (Odr_fun) odr_null, "winter"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_DateSeason_spring,
-               (Odr_fun) odr_null, "spring"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_DateSeason_summer,
-               (Odr_fun) odr_null, "summer"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_DateSeason_autumn,
-               (Odr_fun) odr_null, "autumn"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Era (ODR o, Z_Era **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Era_decade,
-               (Odr_fun) odr_null, "decade"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Era_century,
-               (Odr_fun) odr_null, "century"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Era_millennium,
-               (Odr_fun) odr_null, "millennium"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_DateFlags (ODR o, Z_DateFlags **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->circa, ODR_CONTEXT, 1, 1, "circa") &&
-               odr_implicit_tag (o, z_Era,
-                       &(*p)->era, ODR_CONTEXT, 2, 1, "era") &&
-               odr_sequence_end (o);
-}
-
-int z_Date (ODR o, Z_Date **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Date_monthAndDay,
-               (Odr_fun) z_DateMonthAndDay, "monthAndDay"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Date_julianDay,
-               (Odr_fun) odr_integer, "julianDay"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Date_weekNumber,
-               (Odr_fun) odr_integer, "weekNumber"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 4, Z_Date_quarter,
-               (Odr_fun) z_DateQuarter, "quarter"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 5, Z_Date_season,
-               (Odr_fun) z_DateSeason, "season"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->year, ODR_CONTEXT, 1, 0, "year") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 2, "partOfYear") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, z_DateFlags,
-                       &(*p)->flags, ODR_CONTEXT, 3, 1, "flags") &&
-               odr_sequence_end (o);
-}
-
-int z_Time (ODR o, Z_Time **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Time_local,
-               (Odr_fun) odr_null, "local"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Time_utc,
-               (Odr_fun) odr_null, "utc"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Time_utcOffset,
-               (Odr_fun) odr_integer, "utcOffset"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->hour, ODR_CONTEXT, 1, 0, "hour") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->minute, ODR_CONTEXT, 2, 1, "minute") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->second, ODR_CONTEXT, 3, 1, "second") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->partOfSecond, ODR_CONTEXT, 4, 1, "partOfSecond") &&
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 5, "zone") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-diag1.c b/z39.50/z-diag1.c
deleted file mode 100644 (file)
index a827658..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: DiagnosticFormatDiag1 */
-
-#include <yaz/z-diag1.h>
-
-int z_DiagnosticFormat_s (ODR o, Z_DiagnosticFormat_s **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_DiagnosticFormat_s_defaultDiagRec,
-               (Odr_fun) z_DefaultDiagFormat, "defaultDiagRec"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_DiagnosticFormat_s_explicitDiagnostic,
-               (Odr_fun) z_DiagFormat, "explicitDiagnostic"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "diagnostic") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->message, ODR_CONTEXT, 2, 1, "message") &&
-               odr_sequence_end (o);
-}
-
-int z_DiagnosticFormat (ODR o, Z_DiagnosticFormat **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_DiagnosticFormat_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_TooMany (ODR o, Z_TooMany **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tooManyWhat, ODR_CONTEXT, 1, 0, "tooManyWhat") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->max, ODR_CONTEXT, 2, 1, "max") &&
-               odr_sequence_end (o);
-}
-
-int z_BadSpec (ODR o, Z_BadSpec **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_Specification,
-                       &(*p)->spec, ODR_CONTEXT, 1, 0, "spec") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->db, ODR_CONTEXT, 2, 1, "db") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_Specification, &(*p)->goodOnes,
-                 &(*p)->num_goodOnes, "goodOnes") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_DbUnavail_0 (ODR o, Z_DbUnavail_0 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->reasonCode, ODR_CONTEXT, 1, 1, "reasonCode") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->message, ODR_CONTEXT, 2, 1, "message") &&
-               odr_sequence_end (o);
-}
-
-int z_DbUnavail (ODR o, Z_DbUnavail **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->db, ODR_CONTEXT, 1, 0, "db") &&
-               odr_implicit_tag (o, z_DbUnavail_0,
-                       &(*p)->why, ODR_CONTEXT, 2, 0, "why") &&
-               odr_sequence_end (o);
-}
-
-int z_Attribute (ODR o, Z_Attribute **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->id, ODR_CONTEXT, 1, 0, "id") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->type, ODR_CONTEXT, 2, 1, "type") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->value, ODR_CONTEXT, 3, 1, "value") &&
-               odr_explicit_tag (o, z_Term,
-                       &(*p)->term, ODR_CONTEXT, 4, 1, "term") &&
-               odr_sequence_end (o);
-}
-
-int z_AttCombo (ODR o, Z_AttCombo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_AttributeList,
-                       &(*p)->unsupportedCombination, ODR_CONTEXT, 1, 0, "unsupportedCombination") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_AttributeList, &(*p)->recommendedAlternatives,
-                 &(*p)->num_recommendedAlternatives, "recommendedAlternatives") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_DiagTerm (ODR o, Z_DiagTerm **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->problem, ODR_CONTEXT, 1, 1, "problem") &&
-               odr_explicit_tag (o, z_Term,
-                       &(*p)->term, ODR_CONTEXT, 2, 0, "term") &&
-               odr_sequence_end (o);
-}
-
-int z_Proximity (ODR o, Z_Proximity **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Proximity_resultSets,
-               (Odr_fun) odr_null, "resultSets"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Proximity_badSet,
-               (Odr_fun) z_InternationalString, "badSet"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Proximity_relation,
-               (Odr_fun) odr_integer, "relation"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Proximity_unit,
-               (Odr_fun) odr_integer, "unit"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Proximity_distance,
-               (Odr_fun) odr_integer, "distance"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_Proximity_attributes,
-               (Odr_fun) z_AttributeList, "attributes"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_Proximity_ordered,
-               (Odr_fun) odr_null, "ordered"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_Proximity_exclusion,
-               (Odr_fun) odr_null, "exclusion"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AttrListList (ODR o, Z_AttrListList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_AttributeList, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Scan (ODR o, Z_Scan **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Scan_nonZeroStepSize,
-               (Odr_fun) odr_null, "nonZeroStepSize"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Scan_specifiedStepSize,
-               (Odr_fun) odr_null, "specifiedStepSize"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Scan_termList1,
-               (Odr_fun) odr_null, "termList1"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Scan_termList2,
-               (Odr_fun) z_AttrListList, "termList2"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Scan_posInResponse,
-               (Odr_fun) odr_integer, "posInResponse"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_Scan_resources,
-               (Odr_fun) odr_null, "resources"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_Scan_endOfList,
-               (Odr_fun) odr_null, "endOfList"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_StringList (ODR o, Z_StringList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_InternationalString, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Sort (ODR o, Z_Sort **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortD_sequence,
-               (Odr_fun) odr_null, "sequence"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortD_noRsName,
-               (Odr_fun) odr_null, "noRsName"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortD_tooMany,
-               (Odr_fun) odr_integer, "tooMany"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortD_incompatible,
-               (Odr_fun) odr_null, "incompatible"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_SortD_generic,
-               (Odr_fun) odr_null, "generic"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_SortD_dbSpecific,
-               (Odr_fun) odr_null, "dbSpecific"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_SortD_sortElement,
-               (Odr_fun) z_SortElement, "sortElement"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_SortD_key,
-               (Odr_fun) odr_integer, "key"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_SortD_action,
-               (Odr_fun) odr_null, "action"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 9, Z_SortD_illegal,
-               (Odr_fun) odr_integer, "illegal"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 10, Z_SortD_inputTooLarge,
-               (Odr_fun) z_StringList, "inputTooLarge"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 11, Z_SortD_aggregateTooLarge,
-               (Odr_fun) odr_null, "aggregateTooLarge"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Segmentation (ODR o, Z_Segmentation **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Segmentation_segmentCount,
-               (Odr_fun) odr_null, "segmentCount"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Segmentation_segmentSize,
-               (Odr_fun) odr_integer, "segmentSize"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ExtServices (ODR o, Z_ExtServices **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ExtServices_req,
-               (Odr_fun) odr_integer, "req"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ExtServices_permission,
-               (Odr_fun) odr_integer, "permission"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ExtServices_immediate,
-               (Odr_fun) odr_integer, "immediate"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_OidList (ODR o, Z_OidList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) odr_oid, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AltOidList (ODR o, Z_AltOidList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) odr_oid, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AccessCtrl (ODR o, Z_AccessCtrl **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_AccessCtrl_noUser,
-               (Odr_fun) odr_null, "noUser"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_AccessCtrl_refused,
-               (Odr_fun) odr_null, "refused"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_AccessCtrl_simple,
-               (Odr_fun) odr_null, "simple"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_AccessCtrl_oid,
-               (Odr_fun) z_OidList, "oid"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_AccessCtrl_alternative,
-               (Odr_fun) z_AltOidList, "alternative"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_AccessCtrl_pwdInv,
-               (Odr_fun) odr_null, "pwdInv"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_AccessCtrl_pwdExp,
-               (Odr_fun) odr_null, "pwdExp"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_RecordSyntax (ODR o, Z_RecordSyntax **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->unsupportedSyntax, ODR_CONTEXT, 1, 0, "unsupportedSyntax") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->suggestedAlternatives,
-                 &(*p)->num_suggestedAlternatives, "suggestedAlternatives") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_DiagFormat (ODR o, Z_DiagFormat **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1000, Z_DiagFormat_tooMany,
-               (Odr_fun) z_TooMany, "tooMany"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1001, Z_DiagFormat_badSpec,
-               (Odr_fun) z_BadSpec, "badSpec"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1002, Z_DiagFormat_dbUnavail,
-               (Odr_fun) z_DbUnavail, "dbUnavail"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1003, Z_DiagFormat_unSupOp,
-               (Odr_fun) odr_integer, "unSupOp"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1004, Z_DiagFormat_attribute,
-               (Odr_fun) z_Attribute, "attribute"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1005, Z_DiagFormat_attCombo,
-               (Odr_fun) z_AttCombo, "attCombo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1006, Z_DiagFormat_term,
-               (Odr_fun) z_DiagTerm, "term"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1007, Z_DiagFormat_proximity,
-               (Odr_fun) z_Proximity, "proximity"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1008, Z_DiagFormat_scan,
-               (Odr_fun) z_Scan, "scan"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1009, Z_DiagFormat_sort,
-               (Odr_fun) z_Sort, "sort"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1010, Z_DiagFormat_segmentation,
-               (Odr_fun) z_Segmentation, "segmentation"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1011, Z_DiagFormat_extServices,
-               (Odr_fun) z_ExtServices, "extServices"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 1012, Z_DiagFormat_accessCtrl,
-               (Odr_fun) z_AccessCtrl, "accessCtrl"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1013, Z_DiagFormat_recordSyntax,
-               (Odr_fun) z_RecordSyntax, "recordSyntax"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
diff --git a/z39.50/z-espec1.c b/z39.50/z-espec1.c
deleted file mode 100644 (file)
index 4a7734b..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ElementSpecificationFormat-eSpec-1 */
-
-#include <yaz/z-espec1.h>
-
-int z_Espec1 (ODR o, Z_Espec1 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->elementSetNames,
-                 &(*p)->num_elementSetNames, "elementSetNames") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->defaultVariantSetId, ODR_CONTEXT, 2, 1, "defaultVariantSetId") &&
-               odr_implicit_tag (o, z_Variant,
-                       &(*p)->defaultVariantRequest, ODR_CONTEXT, 3, 1, "defaultVariantRequest") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->defaultTagType, ODR_CONTEXT, 4, 1, "defaultTagType") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_ElementRequest, &(*p)->elements,
-                 &(*p)->num_elements, "elements") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_ElementRequestCompositeElementPrimitives (ODR o, Z_ElementRequestCompositeElementPrimitives **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_InternationalString, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ElementRequestCompositeElementSpecs (ODR o, Z_ElementRequestCompositeElementSpecs **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_SimpleElement, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ElementRequestCompositeElement (ODR o, Z_ElementRequestCompositeElement **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementRequestCompositeElement_primitives,
-               (Odr_fun) z_ElementRequestCompositeElementPrimitives, "primitives"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementRequestCompositeElement_specs,
-               (Odr_fun) z_ElementRequestCompositeElementSpecs, "specs"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "elementList") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_implicit_tag (o, z_ETagPath,
-                       &(*p)->deliveryTag, ODR_CONTEXT, 2, 0, "deliveryTag") &&
-               odr_implicit_tag (o, z_Variant,
-                       &(*p)->variantRequest, ODR_CONTEXT, 3, 1, "variantRequest") &&
-               odr_sequence_end (o);
-}
-
-int z_ElementRequest (ODR o, Z_ElementRequest **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ERequest_simpleElement,
-               (Odr_fun) z_SimpleElement, "simpleElement"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ERequest_compositeElement,
-               (Odr_fun) z_ElementRequestCompositeElement, "compositeElement"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_SimpleElement (ODR o, Z_SimpleElement **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_ETagPath,
-                       &(*p)->path, ODR_CONTEXT, 1, 0, "path") &&
-               odr_implicit_tag (o, z_Variant,
-                       &(*p)->variantRequest, ODR_CONTEXT, 2, 1, "variantRequest") &&
-               odr_sequence_end (o);
-}
-
-int z_SpecificTag (ODR o, Z_SpecificTag **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagType, ODR_CONTEXT, 1, 1, "tagType") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->tagValue, ODR_CONTEXT, 2, 0, "tagValue") &&
-               odr_explicit_tag (o, z_Occurrences,
-                       &(*p)->occurrences, ODR_CONTEXT, 3, 1, "occurrences") &&
-               odr_sequence_end (o);
-}
-
-int z_ETagUnit (ODR o, Z_ETagUnit **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ETagUnit_specificTag,
-               (Odr_fun) z_SpecificTag, "specificTag"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ETagUnit_wildThing,
-               (Odr_fun) z_Occurrences, "wildThing"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ETagUnit_wildPath,
-               (Odr_fun) odr_null, "wildPath"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ETagPath (ODR o, Z_ETagPath **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ETagUnit, &(*p)->tags,
-               &(*p)->num_tags, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_OccurValues (ODR o, Z_OccurValues **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->start, ODR_CONTEXT, 1, 0, "start") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->howMany, ODR_CONTEXT, 2, 1, "howMany") &&
-               odr_sequence_end (o);
-}
-
-int z_Occurrences (ODR o, Z_Occurrences **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Occurrences_all,
-               (Odr_fun) odr_null, "all"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Occurrences_last,
-               (Odr_fun) odr_null, "last"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Occurrences_values,
-               (Odr_fun) z_OccurValues, "values"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
diff --git a/z39.50/z-estask.c b/z39.50/z-estask.c
deleted file mode 100644 (file)
index 79a7795..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: RecordSyntax-ESTaskPackage */
-
-#include <yaz/z-estask.h>
-
-int z_TaskPackage (ODR o, Z_TaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->packageType, ODR_CONTEXT, 1, 0, "packageType") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->packageName, ODR_CONTEXT, 2, 1, "packageName") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->userId, ODR_CONTEXT, 3, 1, "userId") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->retentionTime, ODR_CONTEXT, 4, 1, "retentionTime") &&
-               odr_implicit_tag (o, z_Permissions,
-                       &(*p)->permissions, ODR_CONTEXT, 5, 1, "permissions") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->description, ODR_CONTEXT, 6, 1, "description") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->targetReference, ODR_CONTEXT, 7, 1, "targetReference") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->creationDateTime, ODR_CONTEXT, 8, 1, "creationDateTime") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->taskStatus, ODR_CONTEXT, 9, 0, "taskStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 10) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->packageDiagnostics,
-                 &(*p)->num_packageDiagnostics, "packageDiagnostics") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->taskSpecificParameters, ODR_CONTEXT, 11, 0, "taskSpecificParameters") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-exp.c b/z39.50/z-exp.c
deleted file mode 100644 (file)
index d8f5f1c..0000000
+++ /dev/null
@@ -1,1436 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: RecordSyntax-explain */
-
-#include <yaz/z-exp.h>
-
-int z_ExplainRecord (ODR o, Z_ExplainRecord **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Explain_targetInfo,
-               (Odr_fun) z_TargetInfo, "targetInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Explain_databaseInfo,
-               (Odr_fun) z_DatabaseInfo, "databaseInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Explain_schemaInfo,
-               (Odr_fun) z_SchemaInfo, "schemaInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Explain_tagSetInfo,
-               (Odr_fun) z_TagSetInfo, "tagSetInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Explain_recordSyntaxInfo,
-               (Odr_fun) z_RecordSyntaxInfo, "recordSyntaxInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Explain_attributeSetInfo,
-               (Odr_fun) z_AttributeSetInfo, "attributeSetInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_Explain_termListInfo,
-               (Odr_fun) z_TermListInfo, "termListInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_Explain_extendedServicesInfo,
-               (Odr_fun) z_ExtendedServicesInfo, "extendedServicesInfo"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_Explain_attributeDetails,
-               (Odr_fun) z_AttributeDetails, "attributeDetails"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 9, Z_Explain_termListDetails,
-               (Odr_fun) z_TermListDetails, "termListDetails"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 10, Z_Explain_elementSetDetails,
-               (Odr_fun) z_ElementSetDetails, "elementSetDetails"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 11, Z_Explain_retrievalRecordDetails,
-               (Odr_fun) z_RetrievalRecordDetails, "retrievalRecordDetails"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 12, Z_Explain_sortDetails,
-               (Odr_fun) z_SortDetails, "sortDetails"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 13, Z_Explain_processing,
-               (Odr_fun) z_ProcessingInformation, "processing"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 14, Z_Explain_variants,
-               (Odr_fun) z_VariantSetInfo, "variants"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 15, Z_Explain_units,
-               (Odr_fun) z_UnitInfo, "units"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 100, Z_Explain_categoryList,
-               (Odr_fun) z_CategoryList, "categoryList"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_TargetInfo (ODR o, Z_TargetInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 1, 0, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->recentNews, ODR_CONTEXT, 2, 1, "recentNews") &&
-               odr_implicit_tag (o, z_IconObject,
-                       &(*p)->icon, ODR_CONTEXT, 3, 1, "icon") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->namedResultSets, ODR_CONTEXT, 4, 0, "namedResultSets") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->multipleDBsearch, ODR_CONTEXT, 5, 0, "multipleDBsearch") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxResultSets, ODR_CONTEXT, 6, 1, "maxResultSets") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxResultSize, ODR_CONTEXT, 7, 1, "maxResultSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxTerms, ODR_CONTEXT, 8, 1, "maxTerms") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->timeoutInterval, ODR_CONTEXT, 9, 1, "timeoutInterval") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->welcomeMessage, ODR_CONTEXT, 10, 1, "welcomeMessage") &&
-               odr_implicit_tag (o, z_ContactInfo,
-                       &(*p)->contactInfo, ODR_CONTEXT, 11, 1, "contactInfo") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 12, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 13) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->nicknames,
-                 &(*p)->num_nicknames, "nicknames") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->usageRest, ODR_CONTEXT, 14, 1, "usageRest") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->paymentAddr, ODR_CONTEXT, 15, 1, "paymentAddr") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->hours, ODR_CONTEXT, 16, 1, "hours") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 17) &&
-               (odr_sequence_of(o, (Odr_fun) z_DatabaseList, &(*p)->dbCombinations,
-                 &(*p)->num_dbCombinations, "dbCombinations") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 18) &&
-               (odr_sequence_of(o, (Odr_fun) z_NetworkAddress, &(*p)->addresses,
-                 &(*p)->num_addresses, "addresses") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 101) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->languages,
-                 &(*p)->num_languages, "languages") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_AccessInfo,
-                       &(*p)->commonAccessInfo, ODR_CONTEXT, 19, 1, "commonAccessInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_DatabaseInfo (ODR o, Z_DatabaseInfo **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_DatabaseInfo_actualNumber,
-               (Odr_fun) odr_integer, "actualNumber"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_DatabaseInfo_approxNumber,
-               (Odr_fun) odr_integer, "approxNumber"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->name, ODR_CONTEXT, 1, 0, "name") &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->explainDatabase, ODR_CONTEXT, 2, 1, "explainDatabase") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_DatabaseName, &(*p)->nicknames,
-                 &(*p)->num_nicknames, "nicknames") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_IconObject,
-                       &(*p)->icon, ODR_CONTEXT, 4, 1, "icon") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->userFee, ODR_CONTEXT, 5, 0, "userFee") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->available, ODR_CONTEXT, 6, 0, "available") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->titleString, ODR_CONTEXT, 7, 1, "titleString") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 8) &&
-               (odr_sequence_of(o, (Odr_fun) z_HumanString, &(*p)->keywords,
-                 &(*p)->num_keywords, "keywords") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 9, 1, "description") &&
-               odr_implicit_tag (o, z_DatabaseList,
-                       &(*p)->associatedDbs, ODR_CONTEXT, 10, 1, "associatedDbs") &&
-               odr_implicit_tag (o, z_DatabaseList,
-                       &(*p)->subDbs, ODR_CONTEXT, 11, 1, "subDbs") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->disclaimers, ODR_CONTEXT, 12, 1, "disclaimers") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->news, ODR_CONTEXT, 13, 1, "news") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 14, "recordCount") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->defaultOrder, ODR_CONTEXT, 15, 1, "defaultOrder") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->avRecordSize, ODR_CONTEXT, 16, 1, "avRecordSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxRecordSize, ODR_CONTEXT, 17, 1, "maxRecordSize") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->hours, ODR_CONTEXT, 18, 1, "hours") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->bestTime, ODR_CONTEXT, 19, 1, "bestTime") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->lastUpdate, ODR_CONTEXT, 20, 1, "lastUpdate") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->updateInterval, ODR_CONTEXT, 21, 1, "updateInterval") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->coverage, ODR_CONTEXT, 22, 1, "coverage") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->proprietary, ODR_CONTEXT, 23, 1, "proprietary") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->copyrightText, ODR_CONTEXT, 24, 1, "copyrightText") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->copyrightNotice, ODR_CONTEXT, 25, 1, "copyrightNotice") &&
-               odr_implicit_tag (o, z_ContactInfo,
-                       &(*p)->producerContactInfo, ODR_CONTEXT, 26, 1, "producerContactInfo") &&
-               odr_implicit_tag (o, z_ContactInfo,
-                       &(*p)->supplierContactInfo, ODR_CONTEXT, 27, 1, "supplierContactInfo") &&
-               odr_implicit_tag (o, z_ContactInfo,
-                       &(*p)->submissionContactInfo, ODR_CONTEXT, 28, 1, "submissionContactInfo") &&
-               odr_implicit_tag (o, z_AccessInfo,
-                       &(*p)->accessInfo, ODR_CONTEXT, 29, 1, "accessInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_TagTypeMapping (ODR o, Z_TagTypeMapping **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagType, ODR_CONTEXT, 0, 0, "tagType") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->tagSet, ODR_CONTEXT, 1, 1, "tagSet") &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->defaultTagType, ODR_CONTEXT, 2, 1, "defaultTagType") &&
-               odr_sequence_end (o);
-}
-
-int z_SchemaInfo (ODR o, Z_SchemaInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->schema, ODR_CONTEXT, 1, 0, "schema") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 2, 0, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 3, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) z_TagTypeMapping, &(*p)->tagTypeMapping,
-                 &(*p)->num_tagTypeMapping, "tagTypeMapping") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_ElementInfo, &(*p)->recordStructure,
-                 &(*p)->num_recordStructure, "recordStructure") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_ElementInfo (ODR o, Z_ElementInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->elementName, ODR_CONTEXT, 1, 0, "elementName") &&
-               odr_implicit_tag (o, z_Path,
-                       &(*p)->elementTagPath, ODR_CONTEXT, 2, 0, "elementTagPath") &&
-               odr_explicit_tag (o, z_ElementDataType,
-                       &(*p)->dataType, ODR_CONTEXT, 3, 1, "dataType") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->required, ODR_CONTEXT, 4, 0, "required") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->repeatable, ODR_CONTEXT, 5, 0, "repeatable") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 6, 1, "description") &&
-               odr_sequence_end (o);
-}
-
-int z_PathUnit (ODR o, Z_PathUnit **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagType, ODR_CONTEXT, 1, 0, "tagType") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->tagValue, ODR_CONTEXT, 2, 0, "tagValue") &&
-               odr_sequence_end (o);
-}
-
-int z_Path (ODR o, Z_Path **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_PathUnit, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ElementInfoList (ODR o, Z_ElementInfoList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ElementInfo, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ElementDataType (ODR o, Z_ElementDataType **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ElementDataType_primitive,
-               (Odr_fun) z_PrimitiveDataType, "primitive"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementDataType_structured,
-               (Odr_fun) z_ElementInfoList, "structured"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PrimitiveDataType (ODR o, Z_PrimitiveDataType **p, int opt, const char *name)
-{
-       return odr_integer (o, p, opt, name);
-}
-
-int z_TagSetElements (ODR o, Z_TagSetElements **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->elementname, ODR_CONTEXT, 1, 0, "elementname") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->nicknames,
-                 &(*p)->num_nicknames, "nicknames") || odr_ok(o)) &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->elementTag, ODR_CONTEXT, 3, 0, "elementTag") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 4, 1, "description") &&
-               odr_explicit_tag (o, z_PrimitiveDataType,
-                       &(*p)->dataType, ODR_CONTEXT, 5, 1, "dataType") &&
-               z_OtherInformation(o, &(*p)->otherTagInfo, 1, "otherTagInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_TagSetInfo (ODR o, Z_TagSetInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->tagSet, ODR_CONTEXT, 1, 0, "tagSet") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 2, 0, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 3, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) z_TagSetElements, &(*p)->elements,
-                 &(*p)->num_elements, "elements") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_RecordSyntaxInfo (ODR o, Z_RecordSyntaxInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->recordSyntax, ODR_CONTEXT, 1, 0, "recordSyntax") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 2, 0, "name") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->transferSyntaxes,
-                 &(*p)->num_transferSyntaxes, "transferSyntaxes") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 4, 1, "description") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->asn1Module, ODR_CONTEXT, 5, 1, "asn1Module") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 6) &&
-               (odr_sequence_of(o, (Odr_fun) z_ElementInfo, &(*p)->abstractStructure,
-                 &(*p)->num_abstractStructure, "abstractStructure") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeSetInfo (ODR o, Z_AttributeSetInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_AttributeSetId,
-                       &(*p)->attributeSet, ODR_CONTEXT, 1, 0, "attributeSet") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 2, 0, "name") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_AttributeType, &(*p)->attributes,
-                 &(*p)->num_attributes, "attributes") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 4, 1, "description") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeType (ODR o, Z_AttributeType **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->attributeType, ODR_CONTEXT, 2, 0, "attributeType") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_AttributeDescription, &(*p)->attributeValues,
-                 &(*p)->num_attributeValues, "attributeValues") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeDescription (ODR o, Z_AttributeDescription **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->attributeValue, ODR_CONTEXT, 2, 0, "attributeValue") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_StringOrNumeric, &(*p)->equivalentAttributes,
-                 &(*p)->num_equivalentAttributes, "equivalentAttributes") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_TermListElement (ODR o, Z_TermListElement **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 1, 0, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->title, ODR_CONTEXT, 2, 1, "title") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->searchCost, ODR_CONTEXT, 3, 1, "searchCost") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->scanable, ODR_CONTEXT, 4, 0, "scanable") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->broader,
-                 &(*p)->num_broader, "broader") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 6) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->narrower,
-                 &(*p)->num_narrower, "narrower") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_TermListInfo (ODR o, Z_TermListInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 1, 0, "databaseName") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               odr_sequence_of(o, (Odr_fun) z_TermListElement, &(*p)->termLists,
-                 &(*p)->num_termLists, "termLists") &&
-               odr_sequence_end (o);
-}
-
-int z_ExtendedServicesInfo (ODR o, Z_ExtendedServicesInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->type, ODR_CONTEXT, 1, 0, "type") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 2, 1, "name") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->privateType, ODR_CONTEXT, 3, 0, "privateType") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->restrictionsApply, ODR_CONTEXT, 5, 0, "restrictionsApply") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->feeApply, ODR_CONTEXT, 6, 0, "feeApply") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->available, ODR_CONTEXT, 7, 0, "available") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->retentionSupported, ODR_CONTEXT, 8, 0, "retentionSupported") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->waitAction, ODR_CONTEXT, 9, 0, "waitAction") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 10, 1, "description") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->specificExplain, ODR_CONTEXT, 11, 1, "specificExplain") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->esASN, ODR_CONTEXT, 12, 1, "esASN") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeDetails (ODR o, Z_AttributeDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 1, 0, "databaseName") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_AttributeSetDetails, &(*p)->attributesBySet,
-                 &(*p)->num_attributesBySet, "attributesBySet") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_AttributeCombinations,
-                       &(*p)->attributeCombinations, ODR_CONTEXT, 3, 1, "attributeCombinations") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeSetDetails (ODR o, Z_AttributeSetDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_AttributeSetId,
-                       &(*p)->attributeSet, ODR_CONTEXT, 0, 0, "attributeSet") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               odr_sequence_of(o, (Odr_fun) z_AttributeTypeDetails, &(*p)->attributesByType,
-                 &(*p)->num_attributesByType, "attributesByType") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeTypeDetails (ODR o, Z_AttributeTypeDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->attributeType, ODR_CONTEXT, 0, 0, "attributeType") &&
-               odr_implicit_tag (o, z_OmittedAttributeInterpretation,
-                       &(*p)->defaultIfOmitted, ODR_CONTEXT, 1, 1, "defaultIfOmitted") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_AttributeValue, &(*p)->attributeValues,
-                 &(*p)->num_attributeValues, "attributeValues") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_OmittedAttributeInterpretation (ODR o, Z_OmittedAttributeInterpretation **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->defaultValue, ODR_CONTEXT, 0, 1, "defaultValue") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->defaultDescription, ODR_CONTEXT, 1, 1, "defaultDescription") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeValue (ODR o, Z_AttributeValue **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->value, ODR_CONTEXT, 0, 0, "value") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_StringOrNumeric, &(*p)->subAttributes,
-                 &(*p)->num_subAttributes, "subAttributes") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_StringOrNumeric, &(*p)->superAttributes,
-                 &(*p)->num_superAttributes, "superAttributes") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->partialSupport, ODR_CONTEXT, 4, 1, "partialSupport") &&
-               odr_sequence_end (o);
-}
-
-int z_EScanInfo (ODR o, Z_EScanInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxStepSize, ODR_CONTEXT, 0, 1, "maxStepSize") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->collatingSequence, ODR_CONTEXT, 1, 1, "collatingSequence") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->increasing, ODR_CONTEXT, 2, 1, "increasing") &&
-               odr_sequence_end (o);
-}
-
-int z_TermListDetails (ODR o, Z_TermListDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->termListName, ODR_CONTEXT, 1, 0, "termListName") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 2, 1, "description") &&
-               odr_implicit_tag (o, z_AttributeCombinations,
-                       &(*p)->attributes, ODR_CONTEXT, 3, 1, "attributes") &&
-               odr_implicit_tag (o, z_EScanInfo,
-                       &(*p)->scanInfo, ODR_CONTEXT, 4, 1, "scanInfo") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->estNumberTerms, ODR_CONTEXT, 5, 1, "estNumberTerms") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 6) &&
-               (odr_sequence_of(o, (Odr_fun) z_Term, &(*p)->sampleTerms,
-                 &(*p)->num_sampleTerms, "sampleTerms") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_ElementSetDetails (ODR o, Z_ElementSetDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 1, 0, "databaseName") &&
-               odr_implicit_tag (o, z_ElementSetName,
-                       &(*p)->elementSetName, ODR_CONTEXT, 2, 0, "elementSetName") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->recordSyntax, ODR_CONTEXT, 3, 0, "recordSyntax") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->schema, ODR_CONTEXT, 4, 0, "schema") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 5, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 6) &&
-               (odr_sequence_of(o, (Odr_fun) z_PerElementDetails, &(*p)->detailsPerElement,
-                 &(*p)->num_detailsPerElement, "detailsPerElement") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_RetrievalRecordDetails (ODR o, Z_RetrievalRecordDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 1, 0, "databaseName") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->schema, ODR_CONTEXT, 2, 0, "schema") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->recordSyntax, ODR_CONTEXT, 3, 0, "recordSyntax") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 4, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_PerElementDetails, &(*p)->detailsPerElement,
-                 &(*p)->num_detailsPerElement, "detailsPerElement") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_PerElementDetails (ODR o, Z_PerElementDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_RecordTag,
-                       &(*p)->recordTag, ODR_CONTEXT, 1, 1, "recordTag") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_Path, &(*p)->schemaTags,
-                 &(*p)->num_schemaTags, "schemaTags") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->maxSize, ODR_CONTEXT, 3, 1, "maxSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->minSize, ODR_CONTEXT, 4, 1, "minSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->avgSize, ODR_CONTEXT, 5, 1, "avgSize") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->fixedSize, ODR_CONTEXT, 6, 1, "fixedSize") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->repeatable, ODR_CONTEXT, 8, 0, "repeatable") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->required, ODR_CONTEXT, 9, 0, "required") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 12, 1, "description") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->contents, ODR_CONTEXT, 13, 1, "contents") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->billingInfo, ODR_CONTEXT, 14, 1, "billingInfo") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->restrictions, ODR_CONTEXT, 15, 1, "restrictions") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 16) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->alternateNames,
-                 &(*p)->num_alternateNames, "alternateNames") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 17) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->genericNames,
-                 &(*p)->num_genericNames, "genericNames") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_AttributeCombinations,
-                       &(*p)->searchAccess, ODR_CONTEXT, 18, 1, "searchAccess") &&
-               odr_sequence_end (o);
-}
-
-int z_RecordTag (ODR o, Z_RecordTag **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->qualifier, ODR_CONTEXT, 0, 1, "qualifier") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->tagValue, ODR_CONTEXT, 1, 0, "tagValue") &&
-               odr_sequence_end (o);
-}
-
-int z_SortDetails (ODR o, Z_SortDetails **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 1, 0, "databaseName") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_SortKeyDetails, &(*p)->sortKeys,
-                 &(*p)->num_sortKeys, "sortKeys") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_SortKeyDetails (ODR o, Z_SortKeyDetails **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKeyDetails_character,
-               (Odr_fun) odr_null, "character"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKeyDetails_numeric,
-               (Odr_fun) odr_null, "numeric"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKeyDetails_structured,
-               (Odr_fun) z_HumanString, "structured"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 0, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) z_Specification, &(*p)->elementSpecifications,
-                 &(*p)->num_elementSpecifications, "elementSpecifications") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_AttributeCombinations,
-                       &(*p)->attributeSpecifications, ODR_CONTEXT, 2, 1, "attributeSpecifications") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 3, "sortType") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->caseSensitivity, ODR_CONTEXT, 4, 1, "caseSensitivity") &&
-               odr_sequence_end (o);
-}
-
-int z_ProcessingInformation (ODR o, Z_ProcessingInformation **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_DatabaseName,
-                       &(*p)->databaseName, ODR_CONTEXT, 1, 0, "databaseName") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->processingContext, ODR_CONTEXT, 2, 0, "processingContext") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 3, 0, "name") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->oid, ODR_CONTEXT, 4, 0, "oid") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 5, 1, "description") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->instructions, ODR_CONTEXT, 6, 1, "instructions") &&
-               odr_sequence_end (o);
-}
-
-int z_VariantSetInfo (ODR o, Z_VariantSetInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->variantSet, ODR_CONTEXT, 1, 0, "variantSet") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 2, 0, "name") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_VariantClass, &(*p)->variants,
-                 &(*p)->num_variants, "variants") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_VariantClass (ODR o, Z_VariantClass **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->variantClass, ODR_CONTEXT, 2, 0, "variantClass") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_VariantType, &(*p)->variantTypes,
-                 &(*p)->num_variantTypes, "variantTypes") &&
-               odr_sequence_end (o);
-}
-
-int z_VariantType (ODR o, Z_VariantType **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->variantType, ODR_CONTEXT, 2, 0, "variantType") &&
-               odr_implicit_tag (o, z_VariantValue,
-                       &(*p)->variantValue, ODR_CONTEXT, 3, 1, "variantValue") &&
-               odr_sequence_end (o);
-}
-
-int z_VariantValue (ODR o, Z_VariantValue **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PrimitiveDataType,
-                       &(*p)->dataType, ODR_CONTEXT, 0, 0, "dataType") &&
-               odr_explicit_tag (o, z_ValueSet,
-                       &(*p)->values, ODR_CONTEXT, 1, 1, "values") &&
-               odr_sequence_end (o);
-}
-
-int z_ValueSetEnumerated (ODR o, Z_ValueSetEnumerated **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ValueDescription, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ValueSet (ODR o, Z_ValueSet **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ValueSet_range,
-               (Odr_fun) z_ValueRange, "range"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ValueSet_enumerated,
-               (Odr_fun) z_ValueSetEnumerated, "enumerated"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ValueRange (ODR o, Z_ValueRange **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_ValueDescription,
-                       &(*p)->lower, ODR_CONTEXT, 0, 1, "lower") &&
-               odr_explicit_tag (o, z_ValueDescription,
-                       &(*p)->upper, ODR_CONTEXT, 1, 1, "upper") &&
-               odr_sequence_end (o);
-}
-
-int z_ValueDescription (ODR o, Z_ValueDescription **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_ValueDescription_integer,
-                (Odr_fun) odr_integer, "integer"},
-               {-1, -1, -1, Z_ValueDescription_string,
-                (Odr_fun) z_InternationalString, "string"},
-               {-1, -1, -1, Z_ValueDescription_octets,
-                (Odr_fun) odr_octetstring, "octets"},
-               {-1, -1, -1, Z_ValueDescription_oid,
-                (Odr_fun) odr_oid, "oid"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ValueDescription_unit,
-               (Odr_fun) z_Unit, "unit"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ValueDescription_valueAndUnit,
-               (Odr_fun) z_IntUnit, "valueAndUnit"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_UnitInfo (ODR o, Z_UnitInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->unitSystem, ODR_CONTEXT, 1, 0, "unitSystem") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 2, 1, "description") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_UnitType, &(*p)->units,
-                 &(*p)->num_units, "units") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_UnitType (ODR o, Z_UnitType **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->unitType, ODR_CONTEXT, 2, 0, "unitType") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_Units, &(*p)->units,
-                 &(*p)->num_units, "units") &&
-               odr_sequence_end (o);
-}
-
-int z_Units (ODR o, Z_Units **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->unit, ODR_CONTEXT, 2, 0, "unit") &&
-               odr_sequence_end (o);
-}
-
-int z_CategoryList (ODR o, Z_CategoryList **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CommonInfo,
-                       &(*p)->commonInfo, ODR_CONTEXT, 0, 1, "commonInfo") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               odr_sequence_of(o, (Odr_fun) z_CategoryInfo, &(*p)->categories,
-                 &(*p)->num_categories, "categories") &&
-               odr_sequence_end (o);
-}
-
-int z_CategoryInfo (ODR o, Z_CategoryInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->category, ODR_CONTEXT, 1, 0, "category") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->originalCategory, ODR_CONTEXT, 2, 1, "originalCategory") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 3, 1, "description") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->asn1Module, ODR_CONTEXT, 4, 1, "asn1Module") &&
-               odr_sequence_end (o);
-}
-
-int z_CommonInfo (ODR o, Z_CommonInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->dateAdded, ODR_CONTEXT, 0, 1, "dateAdded") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->dateChanged, ODR_CONTEXT, 1, 1, "dateChanged") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->expiry, ODR_CONTEXT, 2, 1, "expiry") &&
-               odr_implicit_tag (o, z_LanguageCode,
-                       &(*p)->humanStringLanguage, ODR_CONTEXT, 3, 1, "humanStringLanguage") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_HumanStringUnit (ODR o, Z_HumanStringUnit **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_LanguageCode,
-                       &(*p)->language, ODR_CONTEXT, 0, 1, "language") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->text, ODR_CONTEXT, 1, 0, "text") &&
-               odr_sequence_end (o);
-}
-
-int z_HumanString (ODR o, Z_HumanString **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_HumanStringUnit, &(*p)->strings,
-               &(*p)->num_strings, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IconObjectUnit (ODR o, Z_IconObjectUnit **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IconObjectUnit_ianaType,
-               (Odr_fun) z_InternationalString, "ianaType"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IconObjectUnit_z3950type,
-               (Odr_fun) z_InternationalString, "z3950type"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IconObjectUnit_otherType,
-               (Odr_fun) z_InternationalString, "otherType"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "bodyType") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->content, ODR_CONTEXT, 2, 0, "content") &&
-               odr_sequence_end (o);
-}
-
-int z_IconObject (ODR o, Z_IconObject **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_IconObjectUnit, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_LanguageCode (ODR o, Z_LanguageCode **p, int opt, const char *name)
-{
-       return z_InternationalString (o, p, opt, name);
-}
-
-int z_ContactInfo (ODR o, Z_ContactInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 0, 1, "name") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->address, ODR_CONTEXT, 2, 1, "address") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->email, ODR_CONTEXT, 3, 1, "email") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->phone, ODR_CONTEXT, 4, 1, "phone") &&
-               odr_sequence_end (o);
-}
-
-int z_NetworkAddressIA (ODR o, Z_NetworkAddressIA **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->hostAddress, ODR_CONTEXT, 0, 0, "hostAddress") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->port, ODR_CONTEXT, 1, 0, "port") &&
-               odr_sequence_end (o);
-}
-
-int z_NetworkAddressOPA (ODR o, Z_NetworkAddressOPA **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->pSel, ODR_CONTEXT, 0, 0, "pSel") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->sSel, ODR_CONTEXT, 1, 1, "sSel") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->tSel, ODR_CONTEXT, 2, 1, "tSel") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->nSap, ODR_CONTEXT, 3, 0, "nSap") &&
-               odr_sequence_end (o);
-}
-
-int z_NetworkAddressOther (ODR o, Z_NetworkAddressOther **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->type, ODR_CONTEXT, 0, 0, "type") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->address, ODR_CONTEXT, 1, 0, "address") &&
-               odr_sequence_end (o);
-}
-
-int z_NetworkAddress (ODR o, Z_NetworkAddress **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_NetworkAddress_iA,
-               (Odr_fun) z_NetworkAddressIA, "internetAddress"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_NetworkAddress_oPA,
-               (Odr_fun) z_NetworkAddressOPA, "osiPresentationAddress"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_NetworkAddress_other,
-               (Odr_fun) z_NetworkAddressOther, "other"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AccessInfo (ODR o, Z_AccessInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 0) &&
-               (odr_sequence_of(o, (Odr_fun) z_QueryTypeDetails, &(*p)->queryTypesSupported,
-                 &(*p)->num_queryTypesSupported, "queryTypesSupported") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->diagnosticsSets,
-                 &(*p)->num_diagnosticsSets, "diagnosticsSets") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_AttributeSetId, &(*p)->attributeSetIds,
-                 &(*p)->num_attributeSetIds, "attributeSetIds") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->schemas,
-                 &(*p)->num_schemas, "schemas") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->recordSyntaxes,
-                 &(*p)->num_recordSyntaxes, "recordSyntaxes") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->resourceChallenges,
-                 &(*p)->num_resourceChallenges, "resourceChallenges") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_AccessRestrictions,
-                       &(*p)->restrictedAccess, ODR_CONTEXT, 6, 1, "restrictedAccess") &&
-               odr_implicit_tag (o, z_Costs,
-                       &(*p)->costInfo, ODR_CONTEXT, 8, 1, "costInfo") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 9) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->variantSets,
-                 &(*p)->num_variantSets, "variantSets") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 10) &&
-               (odr_sequence_of(o, (Odr_fun) z_ElementSetName, &(*p)->elementSetNames,
-                 &(*p)->num_elementSetNames, "elementSetNames") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 11) &&
-               odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->unitSystems,
-                 &(*p)->num_unitSystems, "unitSystems") &&
-               odr_sequence_end (o);
-}
-
-int z_QueryTypeDetails (ODR o, Z_QueryTypeDetails **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_QueryTypeDetails_private,
-               (Odr_fun) z_PrivateCapabilities, "zprivate"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_QueryTypeDetails_rpn,
-               (Odr_fun) z_RpnCapabilities, "rpn"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_QueryTypeDetails_iso8777,
-               (Odr_fun) z_Iso8777Capabilities, "iso8777"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 100, Z_QueryTypeDetails_z39_58,
-               (Odr_fun) z_HumanString, "z39_58"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 101, Z_QueryTypeDetails_erpn,
-               (Odr_fun) z_RpnCapabilities, "erpn"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 102, Z_QueryTypeDetails_rankedList,
-               (Odr_fun) z_HumanString, "rankedList"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PrivateCapOperator (ODR o, Z_PrivateCapOperator **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->roperator, ODR_CONTEXT, 0, 0, "roperator") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_sequence_end (o);
-}
-
-int z_PrivateCapabilities (ODR o, Z_PrivateCapabilities **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 0) &&
-               (odr_sequence_of(o, (Odr_fun) z_PrivateCapOperator, &(*p)->operators,
-                 &(*p)->num_operators, "operators") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) z_SearchKey, &(*p)->searchKeys,
-                 &(*p)->num_searchKeys, "searchKeys") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_HumanString, &(*p)->description,
-                 &(*p)->num_description, "description") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_RpnCapabilities (ODR o, Z_RpnCapabilities **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 0) &&
-               (odr_sequence_of(o, (Odr_fun) odr_integer, &(*p)->operators,
-                 &(*p)->num_operators, "operators") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->resultSetAsOperandSupported, ODR_CONTEXT, 1, 0, "resultSetAsOperandSupported") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->restrictionOperandSupported, ODR_CONTEXT, 2, 0, "restrictionOperandSupported") &&
-               odr_implicit_tag (o, z_ProximitySupport,
-                       &(*p)->proximity, ODR_CONTEXT, 3, 1, "proximity") &&
-               odr_sequence_end (o);
-}
-
-int z_Iso8777Capabilities (ODR o, Z_Iso8777Capabilities **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 0) &&
-               odr_sequence_of(o, (Odr_fun) z_SearchKey, &(*p)->searchKeys,
-                 &(*p)->num_searchKeys, "searchKeys") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->restrictions, ODR_CONTEXT, 1, 1, "restrictions") &&
-               odr_sequence_end (o);
-}
-
-int z_ProxSupportPrivate (ODR o, Z_ProxSupportPrivate **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->unit, ODR_CONTEXT, 0, 0, "unit") &&
-               odr_explicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_sequence_end (o);
-}
-
-int z_ProxSupportUnit (ODR o, Z_ProxSupportUnit **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxSupportUnit_known,
-               (Odr_fun) odr_integer, "known"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProxSupportUnit_private,
-               (Odr_fun) z_ProxSupportPrivate, "zprivate"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ProximitySupport (ODR o, Z_ProximitySupport **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->anySupport, ODR_CONTEXT, 0, 0, "anySupport") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) z_ProxSupportUnit, &(*p)->unitsSupported,
-                 &(*p)->num_unitsSupported, "unitsSupported") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_SearchKey (ODR o, Z_SearchKey **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->searchKey, ODR_CONTEXT, 0, 0, "searchKey") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->description, ODR_CONTEXT, 1, 1, "description") &&
-               odr_sequence_end (o);
-}
-
-int z_AccessRestrictionsUnit (ODR o, Z_AccessRestrictionsUnit **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, odr_integer,
-                       &(*p)->accessType, ODR_CONTEXT, 0, 0, "accessType") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->accessText, ODR_CONTEXT, 1, 1, "accessText") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) odr_oid, &(*p)->accessChallenges,
-                 &(*p)->num_accessChallenges, "accessChallenges") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_AccessRestrictions (ODR o, Z_AccessRestrictions **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_AccessRestrictionsUnit, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_CostsOtherCharge (ODR o, Z_CostsOtherCharge **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->forWhat, ODR_CONTEXT, 1, 0, "forWhat") &&
-               odr_implicit_tag (o, z_Charge,
-                       &(*p)->charge, ODR_CONTEXT, 2, 0, "charge") &&
-               odr_sequence_end (o);
-}
-
-int z_Costs (ODR o, Z_Costs **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_Charge,
-                       &(*p)->connectCharge, ODR_CONTEXT, 0, 1, "connectCharge") &&
-               odr_implicit_tag (o, z_Charge,
-                       &(*p)->connectTime, ODR_CONTEXT, 1, 1, "connectTime") &&
-               odr_implicit_tag (o, z_Charge,
-                       &(*p)->displayCharge, ODR_CONTEXT, 2, 1, "displayCharge") &&
-               odr_implicit_tag (o, z_Charge,
-                       &(*p)->searchCharge, ODR_CONTEXT, 3, 1, "searchCharge") &&
-               odr_implicit_tag (o, z_Charge,
-                       &(*p)->subscriptCharge, ODR_CONTEXT, 4, 1, "subscriptCharge") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_CostsOtherCharge, &(*p)->otherCharges,
-                 &(*p)->num_otherCharges, "otherCharges") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_Charge (ODR o, Z_Charge **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->cost, ODR_CONTEXT, 1, 0, "cost") &&
-               odr_implicit_tag (o, z_Unit,
-                       &(*p)->perWhat, ODR_CONTEXT, 2, 1, "perWhat") &&
-               odr_implicit_tag (o, z_HumanString,
-                       &(*p)->text, ODR_CONTEXT, 3, 1, "text") &&
-               odr_sequence_end (o);
-}
-
-int z_DatabaseList (ODR o, Z_DatabaseList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_DatabaseName, &(*p)->databases,
-               &(*p)->num_databases, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AttributeCombinations (ODR o, Z_AttributeCombinations **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_AttributeSetId,
-                       &(*p)->defaultAttributeSet, ODR_CONTEXT, 0, 0, "defaultAttributeSet") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               odr_sequence_of(o, (Odr_fun) z_AttributeCombination, &(*p)->legalCombinations,
-                 &(*p)->num_legalCombinations, "legalCombinations") &&
-               odr_sequence_end (o);
-}
-
-int z_AttributeCombination (ODR o, Z_AttributeCombination **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_AttributeOccurrence, &(*p)->occurrences,
-               &(*p)->num_occurrences, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AttributeValueList (ODR o, Z_AttributeValueList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_StringOrNumeric, &(*p)->attributes,
-               &(*p)->num_attributes, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_AttributeOccurrence (ODR o, Z_AttributeOccurrence **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_AttributeOcc_any_or_none,
-               (Odr_fun) odr_null, "any_or_none"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_AttributeOcc_specific,
-               (Odr_fun) z_AttributeValueList, "specific"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_AttributeSetId,
-                       &(*p)->attributeSet, ODR_CONTEXT, 0, 1, "attributeSet") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->attributeType, ODR_CONTEXT, 1, 0, "attributeType") &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->mustBeSupplied, ODR_CONTEXT, 2, 1, "mustBeSupplied") &&
-               odr_choice (o, arm, &(*p)->attributeValues, &(*p)->which, 0) &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-grs.c b/z39.50/z-grs.c
deleted file mode 100644 (file)
index 2ba930b..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: RecordSyntax-generic */
-
-#include <yaz/z-grs.h>
-
-int z_GenericRecord (ODR o, Z_GenericRecord **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_TaggedElement, &(*p)->elements,
-               &(*p)->num_elements, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_TaggedElement (ODR o, Z_TaggedElement **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagType, ODR_CONTEXT, 1, 1, "tagType") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->tagValue, ODR_CONTEXT, 2, 0, "tagValue") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagOccurrence, ODR_CONTEXT, 3, 1, "tagOccurrence") &&
-               odr_explicit_tag (o, z_ElementData,
-                       &(*p)->content, ODR_CONTEXT, 4, 0, "content") &&
-               odr_implicit_tag (o, z_ElementMetaData,
-                       &(*p)->metaData, ODR_CONTEXT, 5, 1, "metaData") &&
-               odr_implicit_tag (o, z_Variant,
-                       &(*p)->appliedVariant, ODR_CONTEXT, 6, 1, "appliedVariant") &&
-               odr_sequence_end (o);
-}
-
-int z_ElementData (ODR o, Z_ElementData **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_ElementData_octets,
-                (Odr_fun) odr_octetstring, "octets"},
-               {-1, -1, -1, Z_ElementData_numeric,
-                (Odr_fun) odr_integer, "numeric"},
-               {-1, -1, -1, Z_ElementData_date,
-                (Odr_fun) odr_generalizedtime, "date"},
-               {-1, -1, -1, Z_ElementData_ext,
-                (Odr_fun) z_External, "ext"},
-               {-1, -1, -1, Z_ElementData_string,
-                (Odr_fun) z_InternationalString, "string"},
-               {-1, -1, -1, Z_ElementData_trueOrFalse,
-                (Odr_fun) odr_bool, "trueOrFalse"},
-               {-1, -1, -1, Z_ElementData_oid,
-                (Odr_fun) odr_oid, "oid"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementData_intUnit,
-               (Odr_fun) z_IntUnit, "intUnit"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementData_elementNotThere,
-               (Odr_fun) odr_null, "elementNotThere"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ElementData_elementEmpty,
-               (Odr_fun) odr_null, "elementEmpty"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ElementData_noDataRequested,
-               (Odr_fun) odr_null, "noDataRequested"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ElementData_diagnostic,
-               (Odr_fun) z_External, "diagnostic"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_ElementData_subtree,
-               (Odr_fun) z_GenericRecord, "subtree"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ElementMetaData (ODR o, Z_ElementMetaData **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_Order,
-                       &(*p)->seriesOrder, ODR_CONTEXT, 1, 1, "seriesOrder") &&
-               odr_implicit_tag (o, z_Usage,
-                       &(*p)->usageRight, ODR_CONTEXT, 2, 1, "usageRight") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               (odr_sequence_of(o, (Odr_fun) z_HitVector, &(*p)->hits,
-                 &(*p)->num_hits, "hits") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->displayName, ODR_CONTEXT, 4, 1, "displayName") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 5) &&
-               (odr_sequence_of(o, (Odr_fun) z_Variant, &(*p)->supportedVariants,
-                 &(*p)->num_supportedVariants, "supportedVariants") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->message, ODR_CONTEXT, 6, 1, "message") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->elementDescriptor, ODR_CONTEXT, 7, 1, "elementDescriptor") &&
-               odr_implicit_tag (o, z_TagPath,
-                       &(*p)->surrogateFor, ODR_CONTEXT, 8, 1, "surrogateFor") &&
-               odr_implicit_tag (o, z_TagPath,
-                       &(*p)->surrogateElement, ODR_CONTEXT, 9, 1, "surrogateElement") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->other, ODR_CONTEXT, 99, 1, "other") &&
-               odr_sequence_end (o);
-}
-
-int z_TagPath_s (ODR o, Z_TagPath_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagType, ODR_CONTEXT, 1, 1, "tagType") &&
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->tagValue, ODR_CONTEXT, 2, 0, "tagValue") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->tagOccurrence, ODR_CONTEXT, 3, 1, "tagOccurrence") &&
-               odr_sequence_end (o);
-}
-
-int z_TagPath (ODR o, Z_TagPath **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_TagPath_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_Order (ODR o, Z_Order **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->ascending, ODR_CONTEXT, 1, 0, "ascending") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->order, ODR_CONTEXT, 2, 0, "order") &&
-               odr_sequence_end (o);
-}
-
-int z_Usage (ODR o, Z_Usage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->type, ODR_CONTEXT, 1, 0, "type") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->restriction, ODR_CONTEXT, 2, 1, "restriction") &&
-               odr_sequence_end (o);
-}
-
-int z_HitVector (ODR o, Z_HitVector **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_Term(o, &(*p)->satisfier, 1, "satisfier") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->offsetIntoElement, ODR_CONTEXT, 1, 1, "offsetIntoElement") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->length, ODR_CONTEXT, 2, 1, "length") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->hitRank, ODR_CONTEXT, 3, 1, "hitRank") &&
-               odr_implicit_tag (o, odr_octetstring,
-                       &(*p)->targetToken, ODR_CONTEXT, 4, 1, "targetToken") &&
-               odr_sequence_end (o);
-}
-
-int z_Triple (ODR o, Z_Triple **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {-1, -1, -1, Z_Triple_integer,
-                (Odr_fun) odr_integer, "integer"},
-               {-1, -1, -1, Z_Triple_internationalString,
-                (Odr_fun) z_InternationalString, "internationalString"},
-               {-1, -1, -1, Z_Triple_octetString,
-                (Odr_fun) odr_octetstring, "octetString"},
-               {-1, -1, -1, Z_Triple_objectIdentifier,
-                (Odr_fun) odr_oid, "objectIdentifier"},
-               {-1, -1, -1, Z_Triple_boolean,
-                (Odr_fun) odr_bool, "boolean"},
-               {-1, -1, -1, Z_Triple_null,
-                (Odr_fun) odr_null, "null"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Triple_unit,
-               (Odr_fun) z_Unit, "unit"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Triple_valueAndUnit,
-               (Odr_fun) z_IntUnit, "valueAndUnit"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->variantSetId, ODR_CONTEXT, 0, 1, "variantSetId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->zclass, ODR_CONTEXT, 1, 0, "zclass") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->type, ODR_CONTEXT, 2, 0, "type") &&
-               odr_constructed_begin (o, &(*p)->value, ODR_CONTEXT, 3, "value") &&
-               odr_choice (o, arm, &(*p)->value, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_sequence_end (o);
-}
-
-int z_Variant (ODR o, Z_Variant **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->globalVariantSetId, ODR_CONTEXT, 1, 1, "globalVariantSetId") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               odr_sequence_of(o, (Odr_fun) z_Triple, &(*p)->triples,
-                 &(*p)->num_triples, "triples") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-opac.c b/z39.50/z-opac.c
deleted file mode 100644 (file)
index b15ad2f..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: RecordSyntax-opac */
-
-#include <yaz/z-opac.h>
-
-int z_OPACRecord (ODR o, Z_OPACRecord **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_External,
-                       &(*p)->bibliographicRecord, ODR_CONTEXT, 1, 1, "bibliographicRecord") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_HoldingsRecord, &(*p)->holdingsData,
-                 &(*p)->num_holdingsData, "holdingsData") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_HoldingsRecord (ODR o, Z_HoldingsRecord **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_HoldingsRecord_marcHoldingsRecord,
-               (Odr_fun) z_External, "marcHoldingsRecord"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_HoldingsRecord_holdingsAndCirc,
-               (Odr_fun) z_HoldingsAndCircData, "holdingsAndCirc"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_HoldingsAndCircData (ODR o, Z_HoldingsAndCircData **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->typeOfRecord, ODR_CONTEXT, 1, 1, "typeOfRecord") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->encodingLevel, ODR_CONTEXT, 2, 1, "encodingLevel") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->format, ODR_CONTEXT, 3, 1, "format") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->receiptAcqStatus, ODR_CONTEXT, 4, 1, "receiptAcqStatus") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->generalRetention, ODR_CONTEXT, 5, 1, "generalRetention") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->completeness, ODR_CONTEXT, 6, 1, "completeness") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->dateOfReport, ODR_CONTEXT, 7, 1, "dateOfReport") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->nucCode, ODR_CONTEXT, 8, 1, "nucCode") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->localLocation, ODR_CONTEXT, 9, 1, "localLocation") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->shelvingLocation, ODR_CONTEXT, 10, 1, "shelvingLocation") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->callNumber, ODR_CONTEXT, 11, 1, "callNumber") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->shelvingData, ODR_CONTEXT, 12, 1, "shelvingData") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->copyNumber, ODR_CONTEXT, 13, 1, "copyNumber") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->publicNote, ODR_CONTEXT, 14, 1, "publicNote") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->reproductionNote, ODR_CONTEXT, 15, 1, "reproductionNote") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->termsUseRepro, ODR_CONTEXT, 16, 1, "termsUseRepro") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->enumAndChron, ODR_CONTEXT, 17, 1, "enumAndChron") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 18) &&
-               (odr_sequence_of(o, (Odr_fun) z_Volume, &(*p)->volumes,
-                 &(*p)->num_volumes, "volumes") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 19) &&
-               (odr_sequence_of(o, (Odr_fun) z_CircRecord, &(*p)->circulationData,
-                 &(*p)->num_circulationData, "circulationData") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_Volume (ODR o, Z_Volume **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->enumeration, ODR_CONTEXT, 1, 1, "enumeration") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->chronology, ODR_CONTEXT, 2, 1, "chronology") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->enumAndChron, ODR_CONTEXT, 3, 1, "enumAndChron") &&
-               odr_sequence_end (o);
-}
-
-int z_CircRecord (ODR o, Z_CircRecord **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->availableNow, ODR_CONTEXT, 1, 0, "availableNow") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->availablityDate, ODR_CONTEXT, 2, 1, "availablityDate") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->availableThru, ODR_CONTEXT, 3, 1, "availableThru") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->restrictions, ODR_CONTEXT, 4, 1, "restrictions") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->itemId, ODR_CONTEXT, 5, 1, "itemId") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->renewable, ODR_CONTEXT, 6, 0, "renewable") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->onHold, ODR_CONTEXT, 7, 0, "onHold") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->enumAndChron, ODR_CONTEXT, 8, 1, "enumAndChron") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->midspine, ODR_CONTEXT, 9, 1, "midspine") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->temporaryLocation, ODR_CONTEXT, 10, 1, "temporaryLocation") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-rrf1.c b/z39.50/z-rrf1.c
deleted file mode 100644 (file)
index a6501d1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ResourceReport-Format-Resource-1 */
-
-#include <yaz/z-rrf1.h>
-
-int z_ResourceReport1 (ODR o, Z_ResourceReport1 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               odr_sequence_of(o, (Odr_fun) z_Estimate1, &(*p)->estimates,
-                 &(*p)->num_estimates, "estimates") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->message, ODR_CONTEXT, 2, 0, "message") &&
-               odr_sequence_end (o);
-}
-
-int z_Estimate1 (ODR o, Z_Estimate1 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_EstimateType,
-                       &(*p)->type, ODR_CONTEXT, 1, 0, "type") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->value, ODR_CONTEXT, 2, 0, "value") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->currency_code, ODR_CONTEXT, 3, 1, "currency_code") &&
-               odr_sequence_end (o);
-}
-
-int z_EstimateType (ODR o, Z_EstimateType **p, int opt, const char *name)
-{
-       return odr_integer (o, p, opt, name);
-}
diff --git a/z39.50/z-rrf2.c b/z39.50/z-rrf2.c
deleted file mode 100644 (file)
index 3dedf65..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ResourceReport-Format-Resource-2 */
-
-#include <yaz/z-rrf2.h>
-
-int z_ResourceReport2 (ODR o, Z_ResourceReport2 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 1) &&
-               (odr_sequence_of(o, (Odr_fun) z_Estimate2, &(*p)->estimates,
-                 &(*p)->num_estimates, "estimates") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->message, ODR_CONTEXT, 2, 1, "message") &&
-               odr_sequence_end (o);
-}
-
-int z_Estimate2 (ODR o, Z_Estimate2 **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_StringOrNumeric,
-                       &(*p)->type, ODR_CONTEXT, 1, 0, "type") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->value, ODR_CONTEXT, 2, 0, "value") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-sum.c b/z39.50/z-sum.c
deleted file mode 100644 (file)
index a858685..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: RecordSyntax-summary */
-
-#include <yaz/z-sum.h>
-
-int z_BriefBib (ODR o, Z_BriefBib **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->title, ODR_CONTEXT, 1, 0, "title") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->author, ODR_CONTEXT, 2, 1, "author") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->callNumber, ODR_CONTEXT, 3, 1, "callNumber") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->recordType, ODR_CONTEXT, 4, 1, "recordType") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->bibliographicLevel, ODR_CONTEXT, 5, 1, "bibliographicLevel") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 6) &&
-               (odr_sequence_of(o, (Odr_fun) z_FormatSpec, &(*p)->format,
-                 &(*p)->num_format, "format") || odr_ok(o)) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->publicationPlace, ODR_CONTEXT, 7, 1, "publicationPlace") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->publicationDate, ODR_CONTEXT, 8, 1, "publicationDate") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->targetSystemKey, ODR_CONTEXT, 9, 1, "targetSystemKey") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->satisfyingElement, ODR_CONTEXT, 10, 1, "satisfyingElement") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->rank, ODR_CONTEXT, 11, 1, "rank") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->documentId, ODR_CONTEXT, 12, 1, "documentId") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->abstract, ODR_CONTEXT, 13, 1, "abstract") &&
-               z_OtherInformation(o, &(*p)->otherInfo, 1, "otherInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_FormatSpec (ODR o, Z_FormatSpec **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->type, ODR_CONTEXT, 1, 0, "type") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->size, ODR_CONTEXT, 2, 1, "size") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->bestPosn, ODR_CONTEXT, 3, 1, "bestPosn") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/z-sutrs.c b/z39.50/z-sutrs.c
deleted file mode 100644 (file)
index a95f8b5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: RecordSyntax-SUTRS */
-
-#include <yaz/z-sutrs.h>
-
-int z_SutrsRecord (ODR o, Z_SutrsRecord **p, int opt, const char *name)
-{
-       return z_InternationalString (o, p, opt, name);
-}
-
-int z_SUTRS (ODR o, Odr_oct **p, int opt)
-{
-    return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL,
-        ODR_GENERALSTRING, opt);
-}
-
diff --git a/z39.50/z-uifr1.c b/z39.50/z-uifr1.c
deleted file mode 100644 (file)
index 7cf44f0..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: UserInfoFormat-searchResult-1 */
-
-#include <yaz/z-uifr1.h>
-
-int z_SearchInfoReport_s (ODR o, Z_SearchInfoReport_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->subqueryId, ODR_CONTEXT, 1, 1, "subqueryId") &&
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->fullQuery, ODR_CONTEXT, 2, 0, "fullQuery") &&
-               odr_explicit_tag (o, z_QueryExpression,
-                       &(*p)->subqueryExpression, ODR_CONTEXT, 3, 1, "subqueryExpression") &&
-               odr_explicit_tag (o, z_QueryExpression,
-                       &(*p)->subqueryInterpretation, ODR_CONTEXT, 4, 1, "subqueryInterpretation") &&
-               odr_explicit_tag (o, z_QueryExpression,
-                       &(*p)->subqueryRecommendation, ODR_CONTEXT, 5, 1, "subqueryRecommendation") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->subqueryCount, ODR_CONTEXT, 6, 1, "subqueryCount") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->subqueryWeight, ODR_CONTEXT, 7, 1, "subqueryWeight") &&
-               odr_implicit_tag (o, z_ResultsByDB,
-                       &(*p)->resultsByDB, ODR_CONTEXT, 8, 1, "resultsByDB") &&
-               odr_sequence_end (o);
-}
-
-int z_SearchInfoReport (ODR o, Z_SearchInfoReport **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_SearchInfoReport_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ResultsByDB_sList (ODR o, Z_ResultsByDB_sList **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_DatabaseName, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ResultsByDB_s (ODR o, Z_ResultsByDB_s **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ResultsByDB_s_all,
-               (Odr_fun) odr_null, "all"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ResultsByDB_s_list,
-               (Odr_fun) z_ResultsByDB_sList, "list"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "databases") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->count, ODR_CONTEXT, 2, 1, "count") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->resultSetName, ODR_CONTEXT, 3, 1, "resultSetName") &&
-               odr_sequence_end (o);
-}
-
-int z_ResultsByDB (ODR o, Z_ResultsByDB **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_ResultsByDB_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_QueryExpressionTerm (ODR o, Z_QueryExpressionTerm **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_Term,
-                       &(*p)->queryTerm, ODR_CONTEXT, 1, 0, "queryTerm") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->termComment, ODR_CONTEXT, 2, 1, "termComment") &&
-               odr_sequence_end (o);
-}
-
-int z_QueryExpression (ODR o, Z_QueryExpression **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_QueryExpression_term,
-               (Odr_fun) z_QueryExpressionTerm, "term"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_QueryExpression_query,
-               (Odr_fun) z_Query, "query"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
diff --git a/z39.50/z-univ.c b/z39.50/z-univ.c
deleted file mode 100644 (file)
index 7c3a66e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ResourceReport-Format-Universe-1 */
-
-#include <yaz/z-univ.h>
-
-int z_UniverseReportHits (ODR o, Z_UniverseReportHits **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_StringOrNumeric(o, &(*p)->database, 0, "database") &&
-               z_StringOrNumeric(o, &(*p)->hits, 0, "hits") &&
-               odr_sequence_end (o);
-}
-
-int z_UniverseReportDuplicate (ODR o, Z_UniverseReportDuplicate **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               z_StringOrNumeric(o, &(*p)->hitno, 0, "hitno") &&
-               odr_sequence_end (o);
-}
-
-int z_UniverseReport (ODR o, Z_UniverseReport **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_UniverseReport_databaseHits,
-               (Odr_fun) z_UniverseReportHits, "databaseHits"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_UniverseReport_duplicate,
-               (Odr_fun) z_UniverseReportDuplicate, "duplicate"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_integer(o, &(*p)->totalHits, 0, "totalHits") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/zes-admin.c b/z39.50/zes-admin.c
deleted file mode 100644 (file)
index d865d45..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-Admin */
-
-#include <yaz/zes-admin.h>
-
-int z_AdminEsRequest (ODR o, Z_AdminEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_ESAdminOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_explicit_tag (o, z_ESAdminOriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_AdminTaskPackage (ODR o, Z_AdminTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_ESAdminOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_explicit_tag (o, z_ESAdminTargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_Admin (ODR o, Z_Admin **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Admin_esRequest,
-               (Odr_fun) z_AdminEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Admin_taskPackage,
-               (Odr_fun) z_AdminTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ESAdminOriginPartToKeep (ODR o, Z_ESAdminOriginPartToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_ESAdminOriginPartToKeep_reIndex,
-               (Odr_fun) odr_null, "reIndex"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ESAdminOriginPartToKeep_truncate,
-               (Odr_fun) odr_null, "truncate"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 3, Z_ESAdminOriginPartToKeep_drop,
-               (Odr_fun) odr_null, "drop"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 4, Z_ESAdminOriginPartToKeep_create,
-               (Odr_fun) odr_null, "create"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 5, Z_ESAdminOriginPartToKeep_import,
-               (Odr_fun) z_ImportParameters, "import"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_ESAdminOriginPartToKeep_refresh,
-               (Odr_fun) odr_null, "refresh"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 7, Z_ESAdminOriginPartToKeep_commit,
-               (Odr_fun) odr_null, "commit"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 8, Z_ESAdminOriginPartToKeep_shutdown,
-               (Odr_fun) odr_null, "shutdown"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 9, Z_ESAdminOriginPartToKeep_start,
-               (Odr_fun) odr_null, "start"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "action") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->databaseName, ODR_CONTEXT, 2, 1, "databaseName") &&
-               odr_sequence_end (o);
-}
-
-int z_ESAdminOriginPartNotToKeep (ODR o, Z_ESAdminOriginPartNotToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_ESAdminOriginPartNotToKeep_records,
-               (Odr_fun) z_Segment, "records"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_ESAdminOriginPartNotToKeep_recordsWillFollow,
-               (Odr_fun) odr_null, "recordsWillFollow"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ESAdminTargetPart (ODR o, Z_ESAdminTargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->updateStatus, ODR_CONTEXT, 1, 0, "updateStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->globalDiagnostics,
-                 &(*p)->num_globalDiagnostics, "globalDiagnostics") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_ImportParameters (ODR o, Z_ImportParameters **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->recordType, ODR_CONTEXT, 1, 0, "recordType") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/zes-expi.c b/z39.50/zes-expi.c
deleted file mode 100644 (file)
index 041dbb7..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-ExportInvocation */
-
-#include <yaz/zes-expi.h>
-
-int z_EIExportInvocationEsRequest (ODR o, Z_EIExportInvocationEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_EIOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_explicit_tag (o, z_EIOriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_EIExportInvocationTaskPackage (ODR o, Z_EIExportInvocationTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_EIOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_explicit_tag (o, z_EITargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 1, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_EIExportInvocation (ODR o, Z_EIExportInvocation **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_EIExportInvocation_esRequest,
-               (Odr_fun) z_EIExportInvocationEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_EIExportInvocation_taskPackage,
-               (Odr_fun) z_EIExportInvocationTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_EIOriginPartToKeep (ODR o, Z_EIOriginPartToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_EIOriginPartToKeep_packageName,
-               (Odr_fun) z_InternationalString, "packageName"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_EIOriginPartToKeep_packageSpec,
-               (Odr_fun) z_ESExportSpecification, "packageSpec"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "exportSpec") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfCopies, ODR_CONTEXT, 2, 0, "numberOfCopies") &&
-               odr_sequence_end (o);
-}
-
-int z_EIOriginPartNotToKeepRanges_s (ODR o, Z_EIOriginPartNotToKeepRanges_s **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->start, ODR_CONTEXT, 1, 0, "start") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->count, ODR_CONTEXT, 2, 1, "count") &&
-               odr_sequence_end (o);
-}
-
-int z_EIOriginPartNotToKeepRanges (ODR o, Z_EIOriginPartNotToKeepRanges **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_EIOriginPartNotToKeepRanges_s, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_EIOriginPartNotToKeep (ODR o, Z_EIOriginPartNotToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_EIOriginPartNotToKeep_all,
-               (Odr_fun) odr_null, "all"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_EIOriginPartNotToKeep_ranges,
-               (Odr_fun) z_EIOriginPartNotToKeepRanges, "ranges"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->resultSetId, ODR_CONTEXT, 1, 0, "resultSetId") &&
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 2, "records") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_sequence_end (o);
-}
-
-int z_EITargetPart (ODR o, Z_EITargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->estimatedQuantity, ODR_CONTEXT, 1, 1, "estimatedQuantity") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->quantitySoFar, ODR_CONTEXT, 2, 1, "quantitySoFar") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->estimatedCost, ODR_CONTEXT, 3, 1, "estimatedCost") &&
-               odr_implicit_tag (o, z_IntUnit,
-                       &(*p)->costSoFar, ODR_CONTEXT, 4, 1, "costSoFar") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/zes-exps.c b/z39.50/zes-exps.c
deleted file mode 100644 (file)
index 6fdfafd..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-ExportSpecification */
-
-#include <yaz/zes-exps.h>
-
-int z_ESExportSpecificationEsRequest (ODR o, Z_ESExportSpecificationEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_ESOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_ESExportSpecificationTaskPackage (ODR o, Z_ESExportSpecificationTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_ESOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_ESExportSpecification (ODR o, Z_ESExportSpecification **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ESExportSpecification_esRequest,
-               (Odr_fun) z_ESExportSpecificationEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ESExportSpecification_taskPackage,
-               (Odr_fun) z_ESExportSpecificationTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_ESOriginPartToKeep (ODR o, Z_ESOriginPartToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_CompSpec,
-                       &(*p)->composition, ODR_CONTEXT, 1, 0, "composition") &&
-               odr_explicit_tag (o, z_ESDestination,
-                       &(*p)->exportDestination, ODR_CONTEXT, 2, 0, "exportDestination") &&
-               odr_sequence_end (o);
-}
-
-int z_ESDestinationOther (ODR o, Z_ESDestinationOther **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->vehicle, ODR_CONTEXT, 1, 1, "vehicle") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->destination, ODR_CONTEXT, 2, 0, "destination") &&
-               odr_sequence_end (o);
-}
-
-int z_ESDestination (ODR o, Z_ESDestination **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ESDestination_phoneNumber,
-               (Odr_fun) z_InternationalString, "phoneNumber"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ESDestination_faxNumber,
-               (Odr_fun) z_InternationalString, "faxNumber"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ESDestination_x400address,
-               (Odr_fun) z_InternationalString, "x400address"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ESDestination_emailAddress,
-               (Odr_fun) z_InternationalString, "emailAddress"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ESDestination_pagerNumber,
-               (Odr_fun) z_InternationalString, "pagerNumber"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_ESDestination_ftpAddress,
-               (Odr_fun) z_InternationalString, "ftpAddress"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_ESDestination_ftamAddress,
-               (Odr_fun) z_InternationalString, "ftamAddress"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_ESDestination_printerAddress,
-               (Odr_fun) z_InternationalString, "printerAddress"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 100, Z_ESDestination_other,
-               (Odr_fun) z_ESDestinationOther, "other"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
diff --git a/z39.50/zes-order.c b/z39.50/zes-order.c
deleted file mode 100644 (file)
index 3972246..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-ItemOrder */
-
-#include <yaz/zes-order.h>
-
-int z_IORequest (ODR o, Z_IORequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_IOOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 1, "toKeep") &&
-               odr_explicit_tag (o, z_IOOriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_IOTaskPackage (ODR o, Z_IOTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_IOOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 1, "originPart") &&
-               odr_explicit_tag (o, z_IOTargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_IOItemOrder (ODR o, Z_IOItemOrder **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IOItemOrder_esRequest,
-               (Odr_fun) z_IORequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IOItemOrder_taskPackage,
-               (Odr_fun) z_IOTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IOContact (ODR o, Z_IOContact **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->name, ODR_CONTEXT, 1, 1, "name") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->phone, ODR_CONTEXT, 2, 1, "phone") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->email, ODR_CONTEXT, 3, 1, "email") &&
-               odr_sequence_end (o);
-}
-
-int z_IOBilling (ODR o, Z_IOBilling **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_IOBilling_billInvoice,
-               (Odr_fun) odr_null, "billInvoice"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IOBilling_prepay,
-               (Odr_fun) odr_null, "prepay"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IOBilling_depositAccount,
-               (Odr_fun) odr_null, "depositAccount"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IOBilling_creditCard,
-               (Odr_fun) z_IOCreditCardInfo, "creditCard"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_IOBilling_cardInfoPreviouslySupplied,
-               (Odr_fun) odr_null, "cardInfoPreviouslySupplied"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_IOBilling_privateKnown,
-               (Odr_fun) odr_null, "privateKnown"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_IOBilling_privateNotKnown,
-               (Odr_fun) z_External, "privateNotKnown"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "paymentMethod") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o) &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->customerReference, ODR_CONTEXT, 2, 1, "customerReference") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->customerPONumber, ODR_CONTEXT, 3, 1, "customerPONumber") &&
-               odr_sequence_end (o);
-}
-
-int z_IOOriginPartToKeep (ODR o, Z_IOOriginPartToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_External,
-                       &(*p)->supplDescription, ODR_CONTEXT, 1, 1, "supplDescription") &&
-               odr_implicit_tag (o, z_IOContact,
-                       &(*p)->contact, ODR_CONTEXT, 2, 1, "contact") &&
-               odr_implicit_tag (o, z_IOBilling,
-                       &(*p)->addlBilling, ODR_CONTEXT, 3, 1, "addlBilling") &&
-               odr_sequence_end (o);
-}
-
-int z_IOCreditCardInfo (ODR o, Z_IOCreditCardInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->nameOnCard, ODR_CONTEXT, 1, 0, "nameOnCard") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->expirationDate, ODR_CONTEXT, 2, 0, "expirationDate") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->cardNumber, ODR_CONTEXT, 3, 0, "cardNumber") &&
-               odr_sequence_end (o);
-}
-
-int z_IOResultSetItem (ODR o, Z_IOResultSetItem **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->resultSetId, ODR_CONTEXT, 1, 0, "resultSetId") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->item, ODR_CONTEXT, 2, 0, "item") &&
-               odr_sequence_end (o);
-}
-
-int z_IOOriginPartNotToKeep (ODR o, Z_IOOriginPartNotToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_IOResultSetItem,
-                       &(*p)->resultSetItem, ODR_CONTEXT, 1, 1, "resultSetItem") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->itemRequest, ODR_CONTEXT, 2, 1, "itemRequest") &&
-               odr_sequence_end (o);
-}
-
-int z_IOTargetPart (ODR o, Z_IOTargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_External,
-                       &(*p)->itemRequest, ODR_CONTEXT, 1, 1, "itemRequest") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->statusOrErrorReport, ODR_CONTEXT, 2, 1, "statusOrErrorReport") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->auxiliaryStatus, ODR_CONTEXT, 3, 1, "auxiliaryStatus") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/zes-pquery.c b/z39.50/zes-pquery.c
deleted file mode 100644 (file)
index 7a2a3a0..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-PersistentQuery */
-
-#include <yaz/zes-pquery.h>
-
-int z_PQueryPersistentQueryEsRequest (ODR o, Z_PQueryPersistentQueryEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PQueryOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 1, "toKeep") &&
-               odr_explicit_tag (o, z_PQueryOriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_PQueryPersistentQueryTaskPackage (ODR o, Z_PQueryPersistentQueryTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PQueryOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 1, "originPart") &&
-               odr_explicit_tag (o, z_PQueryTargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_PQueryPersistentQuery (ODR o, Z_PQueryPersistentQuery **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PQueryPersistentQuery_esRequest,
-               (Odr_fun) z_PQueryPersistentQueryEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PQueryPersistentQuery_taskPackage,
-               (Odr_fun) z_PQueryPersistentQueryTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PQueryOriginPartToKeep (ODR o, Z_PQueryOriginPartToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->dbNames,
-                 &(*p)->num_dbNames, "dbNames") || odr_ok(o)) &&
-               odr_explicit_tag (o, z_OtherInformation,
-                       &(*p)->additionalSearchInfo, ODR_CONTEXT, 3, 1, "additionalSearchInfo") &&
-               odr_sequence_end (o);
-}
-
-int z_PQueryOriginPartNotToKeep (ODR o, Z_PQueryOriginPartNotToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PQueryOriginPartNotToKeep_package,
-               (Odr_fun) z_InternationalString, "package"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_PQueryOriginPartNotToKeep_query,
-               (Odr_fun) z_Query, "query"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PQueryTargetPart (ODR o, Z_PQueryTargetPart **p, int opt, const char *name)
-{
-       return z_Query (o, p, opt, name);
-}
diff --git a/z39.50/zes-psched.c b/z39.50/zes-psched.c
deleted file mode 100644 (file)
index c484d49..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-PeriodicQuerySchedule */
-
-#include <yaz/zes-psched.h>
-
-int z_PQSPeriodicQueryScheduleEsRequest (ODR o, Z_PQSPeriodicQueryScheduleEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PQSOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_explicit_tag (o, z_PQSOriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_PQSPeriodicQueryScheduleTaskPackage (ODR o, Z_PQSPeriodicQueryScheduleTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_PQSOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_explicit_tag (o, z_PQSTargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_PQSPeriodicQuerySchedule (ODR o, Z_PQSPeriodicQuerySchedule **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PQSPeriodicQuerySchedule_esRequest,
-               (Odr_fun) z_PQSPeriodicQueryScheduleEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PQSPeriodicQuerySchedule_taskPackage,
-               (Odr_fun) z_PQSPeriodicQueryScheduleTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PQSOriginPartToKeep (ODR o, Z_PQSOriginPartToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PQSOriginPartToKeep_packageName,
-               (Odr_fun) z_InternationalString, "packageName"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_PQSOriginPartToKeep_exportPackage,
-               (Odr_fun) z_ESExportSpecification, "exportPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_bool,
-                       &(*p)->activeFlag, ODR_CONTEXT, 1, 0, "activeFlag") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_InternationalString, &(*p)->databaseNames,
-                 &(*p)->num_databaseNames, "databaseNames") || odr_ok(o)) &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->resultSetDisposition, ODR_CONTEXT, 3, 1, "resultSetDisposition") &&
-               odr_explicit_tag (o, z_ESDestination,
-                       &(*p)->alertDestination, ODR_CONTEXT, 4, 1, "alertDestination") &&
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 5, "exportParameters") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
-
-int z_PQSOriginPartNotToKeep (ODR o, Z_PQSOriginPartNotToKeep **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_PQSOriginPartNotToKeep_actualQuery,
-               (Odr_fun) z_Query, "actualQuery"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PQSOriginPartNotToKeep_packageName,
-               (Odr_fun) z_InternationalString, "packageName"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "querySpec") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_explicit_tag (o, z_PQSPeriod,
-                       &(*p)->originSuggestedPeriod, ODR_CONTEXT, 2, 1, "originSuggestedPeriod") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->expiration, ODR_CONTEXT, 3, 1, "expiration") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->resultSetPackage, ODR_CONTEXT, 4, 1, "resultSetPackage") &&
-               odr_sequence_end (o);
-}
-
-int z_PQSTargetPart (ODR o, Z_PQSTargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_Query,
-                       &(*p)->actualQuery, ODR_CONTEXT, 1, 0, "actualQuery") &&
-               odr_explicit_tag (o, z_PQSPeriod,
-                       &(*p)->targetStatedPeriod, ODR_CONTEXT, 2, 0, "targetStatedPeriod") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->expiration, ODR_CONTEXT, 3, 1, "expiration") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->resultSetPackage, ODR_CONTEXT, 4, 1, "resultSetPackage") &&
-               odr_implicit_tag (o, odr_generalizedtime,
-                       &(*p)->lastQueryTime, ODR_CONTEXT, 5, 0, "lastQueryTime") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->lastResultNumber, ODR_CONTEXT, 6, 0, "lastResultNumber") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberSinceModify, ODR_CONTEXT, 7, 1, "numberSinceModify") &&
-               odr_sequence_end (o);
-}
-
-int z_PQSPeriod (ODR o, Z_PQSPeriod **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PQSPeriod_unit,
-               (Odr_fun) z_IntUnit, "unit"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PQSPeriod_businessDaily,
-               (Odr_fun) odr_null, "businessDaily"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_PQSPeriod_continuous,
-               (Odr_fun) odr_null, "continuous"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_PQSPeriod_other,
-               (Odr_fun) z_InternationalString, "other"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
diff --git a/z39.50/zes-pset.c b/z39.50/zes-pset.c
deleted file mode 100644 (file)
index 5f7a71a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-PersistentResultSet */
-
-#include <yaz/zes-pset.h>
-
-int z_PRPersistentResultSetEsRequest (ODR o, Z_PRPersistentResultSetEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_explicit_tag (o, z_PROriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 1, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_PRPersistentResultSetTaskPackage (ODR o, Z_PRPersistentResultSetTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_null,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_explicit_tag (o, z_PRTargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 1, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_PRPersistentResultSet (ODR o, Z_PRPersistentResultSet **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PRPersistentResultSet_esRequest,
-               (Odr_fun) z_PRPersistentResultSetEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PRPersistentResultSet_taskPackage,
-               (Odr_fun) z_PRPersistentResultSetTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_PROriginPartNotToKeep (ODR o, Z_PROriginPartNotToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->originSuppliedResultSet, ODR_CONTEXT, 1, 1, "originSuppliedResultSet") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->replaceOrAppend, ODR_CONTEXT, 2, 1, "replaceOrAppend") &&
-               odr_sequence_end (o);
-}
-
-int z_PRTargetPart (ODR o, Z_PRTargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->targetSuppliedResultSet, ODR_CONTEXT, 1, 1, "targetSuppliedResultSet") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->numberOfRecords, ODR_CONTEXT, 2, 1, "numberOfRecords") &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/zes-update.c b/z39.50/zes-update.c
deleted file mode 100644 (file)
index 3671dc2..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-Update */
-
-#include <yaz/zes-update.h>
-
-int z_IUUpdateEsRequest (ODR o, Z_IUUpdateEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_IUOriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_explicit_tag (o, z_IUOriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_IUUpdateTaskPackage (ODR o, Z_IUUpdateTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_IUOriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_explicit_tag (o, z_IUTargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_IUUpdate (ODR o, Z_IUUpdate **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUUpdate_esRequest,
-               (Odr_fun) z_IUUpdateEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUUpdate_taskPackage,
-               (Odr_fun) z_IUUpdateTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IUOriginPartToKeep (ODR o, Z_IUOriginPartToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->action, ODR_CONTEXT, 1, 0, "action") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->databaseName, ODR_CONTEXT, 2, 0, "databaseName") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->schema, ODR_CONTEXT, 3, 1, "schema") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->elementSetName, ODR_CONTEXT, 4, 1, "elementSetName") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->actionQualifier, ODR_CONTEXT, 5, 1, "actionQualifier") &&
-               odr_sequence_end (o);
-}
-
-int z_IUOriginPartNotToKeep (ODR o, Z_IUOriginPartNotToKeep **p, int opt, const char *name)
-{
-       return z_IUSuppliedRecords (o, p, opt, name);
-}
-
-int z_IUTargetPart (ODR o, Z_IUTargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->updateStatus, ODR_CONTEXT, 1, 0, "updateStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->globalDiagnostics,
-                 &(*p)->num_globalDiagnostics, "globalDiagnostics") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_IUTaskPackageRecordStructure, &(*p)->taskPackageRecords,
-                 &(*p)->num_taskPackageRecords, "taskPackageRecords") &&
-               odr_sequence_end (o);
-}
-
-int z_IUSuppliedRecordsId (ODR o, Z_IUSuppliedRecordsId **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUSuppliedRecordsId_timeStamp,
-               (Odr_fun) odr_generalizedtime, "timeStamp"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUSuppliedRecordsId_versionNumber,
-               (Odr_fun) z_InternationalString, "versionNumber"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IUSuppliedRecordsId_previousVersion,
-               (Odr_fun) z_External, "previousVersion"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IUSuppliedRecords_elem (ODR o, Z_IUSuppliedRecords_elem **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUSuppliedRecords_elem_number,
-               (Odr_fun) odr_integer, "number"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUSuppliedRecords_elem_string,
-               (Odr_fun) z_InternationalString, "string"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IUSuppliedRecords_elem_opaque,
-               (Odr_fun) odr_octetstring, "opaque"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "recordId") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_explicit_tag (o, z_IUSuppliedRecordsId,
-                       &(*p)->supplementalId, ODR_CONTEXT, 2, 1, "supplementalId") &&
-               odr_implicit_tag (o, z_IUCorrelationInfo,
-                       &(*p)->correlationInfo, ODR_CONTEXT, 3, 1, "correlationInfo") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->record, ODR_CONTEXT, 4, 0, "record") &&
-               odr_sequence_end (o);
-}
-
-int z_IUSuppliedRecords (ODR o, Z_IUSuppliedRecords **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_IUSuppliedRecords_elem, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IUCorrelationInfo (ODR o, Z_IUCorrelationInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->note, ODR_CONTEXT, 1, 1, "note") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->id, ODR_CONTEXT, 2, 1, "id") &&
-               odr_sequence_end (o);
-}
-
-int z_IUTaskPackageRecordStructureSurrogateDiagnostics (ODR o, Z_IUTaskPackageRecordStructureSurrogateDiagnostics **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_DiagRec, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IUTaskPackageRecordStructure (ODR o, Z_IUTaskPackageRecordStructure **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUTaskPackageRecordStructure_record,
-               (Odr_fun) z_External, "record"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUTaskPackageRecordStructure_surrogateDiagnostics,
-               (Odr_fun) z_IUTaskPackageRecordStructureSurrogateDiagnostics, "surrogateDiagnostics"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "recordOrSurDiag") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, z_IUCorrelationInfo,
-                       &(*p)->correlationInfo, ODR_CONTEXT, 2, 1, "correlationInfo") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->recordStatus, ODR_CONTEXT, 3, 0, "recordStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 4) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->supplementalDiagnostics,
-                 &(*p)->num_supplementalDiagnostics, "supplementalDiagnostics") || odr_ok(o)) &&
-               odr_sequence_end (o);
-}
diff --git a/z39.50/zes-update0.c b/z39.50/zes-update0.c
deleted file mode 100644 (file)
index 3734b32..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Generated automatically by the YAZ ASN.1 Compiler 0.3 */
-/* Module-C: ESFormat-Update0 */
-
-#include <yaz/zes-update0.h>
-
-int z_IU0UpdateEsRequest (ODR o, Z_IU0UpdateEsRequest **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_IU0OriginPartToKeep,
-                       &(*p)->toKeep, ODR_CONTEXT, 1, 0, "toKeep") &&
-               odr_explicit_tag (o, z_IU0OriginPartNotToKeep,
-                       &(*p)->notToKeep, ODR_CONTEXT, 2, 0, "notToKeep") &&
-               odr_sequence_end (o);
-}
-
-int z_IU0UpdateTaskPackage (ODR o, Z_IU0UpdateTaskPackage **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_explicit_tag (o, z_IU0OriginPartToKeep,
-                       &(*p)->originPart, ODR_CONTEXT, 1, 0, "originPart") &&
-               odr_explicit_tag (o, z_IU0TargetPart,
-                       &(*p)->targetPart, ODR_CONTEXT, 2, 0, "targetPart") &&
-               odr_sequence_end (o);
-}
-
-int z_IU0Update (ODR o, Z_IU0Update **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IU0Update_esRequest,
-               (Odr_fun) z_IU0UpdateEsRequest, "esRequest"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IU0Update_taskPackage,
-               (Odr_fun) z_IU0UpdateTaskPackage, "taskPackage"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IU0OriginPartToKeep (ODR o, Z_IU0OriginPartToKeep **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->action, ODR_CONTEXT, 1, 0, "action") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->databaseName, ODR_CONTEXT, 2, 0, "databaseName") &&
-               odr_implicit_tag (o, odr_oid,
-                       &(*p)->schema, ODR_CONTEXT, 3, 1, "schema") &&
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->elementSetName, ODR_CONTEXT, 4, 1, "elementSetName") &&
-               odr_sequence_end (o);
-}
-
-int z_IU0OriginPartNotToKeep (ODR o, Z_IU0OriginPartNotToKeep **p, int opt, const char *name)
-{
-       return z_IU0SuppliedRecords (o, p, opt, name);
-}
-
-int z_IU0TargetPart (ODR o, Z_IU0TargetPart **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->updateStatus, ODR_CONTEXT, 1, 0, "updateStatus") &&
-               odr_implicit_settag (o, ODR_CONTEXT, 2) &&
-               (odr_sequence_of(o, (Odr_fun) z_DiagRec, &(*p)->globalDiagnostics,
-                 &(*p)->num_globalDiagnostics, "globalDiagnostics") || odr_ok(o)) &&
-               odr_implicit_settag (o, ODR_CONTEXT, 3) &&
-               odr_sequence_of(o, (Odr_fun) z_IU0TaskPackageRecordStructure, &(*p)->taskPackageRecords,
-                 &(*p)->num_taskPackageRecords, "taskPackageRecords") &&
-               odr_sequence_end (o);
-}
-
-int z_IU0SuppliedRecordsId (ODR o, Z_IU0SuppliedRecordsId **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IU0SuppliedRecordsId_timeStamp,
-               (Odr_fun) odr_generalizedtime, "timeStamp"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IU0SuppliedRecordsId_versionNumber,
-               (Odr_fun) z_InternationalString, "versionNumber"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IU0SuppliedRecordsId_previousVersion,
-               (Odr_fun) z_External, "previousVersion"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_initmember(o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_choice(o, arm, &(*p)->u, &(*p)->which, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IU0SuppliedRecords_elem (ODR o, Z_IU0SuppliedRecords_elem **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IU0SuppliedRecords_elem_number,
-               (Odr_fun) odr_integer, "number"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IU0SuppliedRecords_elem_string,
-               (Odr_fun) z_InternationalString, "string"},
-               {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IU0SuppliedRecords_elem_opaque,
-               (Odr_fun) odr_octetstring, "opaque"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "recordId") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_explicit_tag (o, z_IU0SuppliedRecordsId,
-                       &(*p)->supplementalId, ODR_CONTEXT, 2, 1, "supplementalId") &&
-               odr_implicit_tag (o, z_IU0CorrelationInfo,
-                       &(*p)->correlationInfo, ODR_CONTEXT, 3, 1, "correlationInfo") &&
-               odr_implicit_tag (o, z_External,
-                       &(*p)->record, ODR_CONTEXT, 4, 0, "record") &&
-               odr_sequence_end (o);
-}
-
-int z_IU0SuppliedRecords (ODR o, Z_IU0SuppliedRecords **p, int opt, const char *name)
-{
-       if (!odr_initmember (o, p, sizeof(**p)))
-               return opt && odr_ok(o);
-       if (odr_sequence_of (o, (Odr_fun) z_IU0SuppliedRecords_elem, &(*p)->elements,
-               &(*p)->num, name))
-               return 1;
-       *p = 0;
-       return opt && odr_ok(o);
-}
-
-int z_IU0CorrelationInfo (ODR o, Z_IU0CorrelationInfo **p, int opt, const char *name)
-{
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               odr_implicit_tag (o, z_InternationalString,
-                       &(*p)->note, ODR_CONTEXT, 1, 1, "note") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->id, ODR_CONTEXT, 2, 1, "id") &&
-               odr_sequence_end (o);
-}
-
-int z_IU0TaskPackageRecordStructure (ODR o, Z_IU0TaskPackageRecordStructure **p, int opt, const char *name)
-{
-       static Odr_arm arm[] = {
-               {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IU0TaskPackageRecordStructure_record,
-               (Odr_fun) z_External, "record"},
-               {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_IU0TaskPackageRecordStructure_diagnostic,
-               (Odr_fun) z_DiagRec, "diagnostic"},
-               {-1, -1, -1, -1, (Odr_fun) 0, 0}
-       };
-       if (!odr_sequence_begin (o, p, sizeof(**p), name))
-               return opt && odr_ok (o);
-       return
-               ((odr_constructed_begin (o, &(*p)->u, ODR_CONTEXT, 1, "recordOrSurDiag") &&
-               odr_choice (o, arm, &(*p)->u, &(*p)->which, 0) &&
-               odr_constructed_end (o)) || odr_ok(o)) &&
-               odr_implicit_tag (o, z_IU0CorrelationInfo,
-                       &(*p)->correlationInfo, ODR_CONTEXT, 2, 1, "correlationInfo") &&
-               odr_implicit_tag (o, odr_integer,
-                       &(*p)->recordStatus, ODR_CONTEXT, 3, 0, "recordStatus") &&
-               odr_sequence_end (o);
-}