-## $Id: Makefile.am,v 1.13 2003-05-27 21:12:23 adam Exp $
+## $Id: Makefile.am,v 1.14 2003-07-18 19:53:28 mike Exp $
AM_CPPFLAGS=-I$(top_srcdir)/include
tabdatadir = $(pkgdatadir)/z39.50
tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
- esadmin.asn charneg-3.asn mterm2.asn
+ esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
EXTRA_DIST=$(tabdata_DATA)
YAZCOMP = $(top_srcdir)/util/yaz-asncomp
libz39_50_la_SOURCES = z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
- z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c \
+ z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c zes-admin.c \
z-charneg.c \
# UserInfoFormat-multipleSearchTerms-2
$(srcdir)/z-mterm2.c: $(srcdir)/z.tcl $(srcdir)/mterm2.asn
cd $(srcdir); $(YAZCOMPLINE) mterm2.asn
+
+# UserInfoFormat-multipleSearchTerms-2
+$(srcdir)/z-oclcui.c: $(srcdir)/z.tcl $(srcdir)/oclcui.asn
+ cd $(srcdir); $(YAZCOMPLINE) oclcui.asn
--- /dev/null
+UserInfoFormat-oclcUserInformation
+{Z39-50-userInfoFormat OCLCUserInformation (7)} DEFINITIONS ::=
+BEGIN
+
+-- $Id: oclcui.asn,v 1.1 2003-07-18 19:53:28 mike Exp $
+--
+-- This format is returned from the server at
+-- fsz3950test.oclc.org:210
+-- I found the definition at
+-- http://www.oclc.org/firstsearch/documentation/z3950/config_guide.htm
+--
+-- I have added OPTIONAL modifiers to the `dblist', `diagnosticSetId'
+-- and `code' elements because they appear to be admitted from the
+-- APDU returned as an Init diagnostic from fsz3950test.oclc.org:210
+-- but this still doesn't work yet: I get "Decoding incoming APDU:
+-- Length of constructed type different from sum of members (code
+-- 10:36)"
+
+OCLC-UserInformation ::= SEQUENCE {
+ motd [1] IMPLICIT VisibleString,
+ dblist SEQUENCE OF DBName OPTIONAL,
+ failReason [3] IMPLICIT SEQUENCE {
+ diagnosticSetId OBJECT IDENTIFIER OPTIONAL,
+ code [1] IMPLICIT INTEGER OPTIONAL,
+ text [2] IMPLICIT VisibleString OPTIONAL } OPTIONAL
+}
+
+DBName ::= [2] IMPLICIT VisibleString
+
+END
+
* Copyright (c) 1995-2003, Index Data.
* See the file LICENSE for details.
*
- * $Id: prt-ext.c,v 1.6 2003-06-02 12:53:28 adam Exp $
+ * $Id: prt-ext.c,v 1.7 2003-07-18 19:53:28 mike Exp $
*/
#include <yaz/proto.h>
{VAL_KRB1, Z_External_acfKrb1, (Odr_fun) z_KRBObject},
{VAL_MULTISRCH2, Z_External_multisrch2, (Odr_fun) z_MultipleSearchTerms_2},
{VAL_CQL, Z_External_CQL, (Odr_fun) z_InternationalString},
+ {VAL_OCLCUI, Z_External_OCLCUserInfo, (Odr_fun) z_OCLC_UserInformation},
{VAL_NONE, 0, 0}
};
(Odr_fun)z_MultipleSearchTerms_2, 0},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_CQL,
(Odr_fun)z_InternationalString, 0},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OCLCUserInfo,
+ (Odr_fun)z_OCLC_UserInformation, 0},
{-1, -1, -1, -1, 0, 0}
};
# YC Sample Config File for Z39.50
-# $Id: z.tcl,v 1.11 2003-05-20 19:55:30 adam Exp $
+# $Id: z.tcl,v 1.12 2003-07-18 19:53:28 mike Exp $
# ----------------------------------------------------------
# Prefix Specifications
#
set m ResourceReport-Format-Universe-1
set filename($m) z-univ
# ----
+set m UserInfoFormat-oclcUserInformation
+set filename($m) z-oclcui
+# ----
set m ESFormat-Admin
set filename($m) zes-admin
set map($m,EsRequest) ESAdminRequest