From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 18 Apr 2007 07:34:35 +0000 (+0000)
Subject: Added ASN.1 and CODEC for OCLC ILL Request Extension.
X-Git-Tag: YAZ.3.0.0~42
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=68832d0951d7f4707b6140b2001134c1a52b878c;p=yaz-moved-to-github.git

Added ASN.1 and CODEC for OCLC ILL Request Extension.
---

diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am
index 2e0bf02..19f5c43 100644
--- a/include/yaz/Makefile.am
+++ b/include/yaz/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.43 2007-04-17 20:26:18 adam Exp $
+## $Id: Makefile.am,v 1.44 2007-04-18 07:34:35 adam Exp $
 
 pkginclude_HEADERS= backend.h ccl.h ccl_xml.h cql.h comstack.h \
  diagbib1.h diagsrw.h diagsru_update.h sortspec.h log.h logrpn.h marcdisp.h \
@@ -10,7 +10,7 @@ pkginclude_HEADERS= backend.h ccl.h ccl_xml.h cql.h comstack.h \
  xmlquery.h libxml2_error.h xmltypes.h snprintf.h query-charset.h \
  mutex.h oid_db.h oid_util.h oid_std.h \
  \
- ill.h ill-core.h item-req.h z-accdes1.h z-accform1.h \
+ ill.h ill-core.h item-req.h oclc-ill-req-ext.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-mterm2.h z-opac.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h \
  z-univ.h z-oclcui.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h \
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ee4ef9..e63b368 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,10 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1995-2007, Index Data, All rights reserved.
-## $Id: Makefile.am,v 1.61 2007-04-17 20:26:18 adam Exp $
+## $Id: Makefile.am,v 1.62 2007-04-18 07:34:35 adam Exp $
 
 YAZ_VERSION_INFO=3:0:0
 
 lib_LTLIBRARIES = libyaz.la libyaz_server.la
-# noinst_PROGRAMS = cqlparse
 
 dist-hook:
 	test -f $(srcdir)/cql.c || exit 1
@@ -15,7 +14,7 @@ tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
  esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
 
 illdatadir=$(pkgdatadir)/ill
-illdata_DATA=ill9702.asn item-req.asn ill.tcl
+illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
 
 EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
  charconv.tcl codetables.xml \
@@ -65,7 +64,7 @@ GEN_FILES = oid_std.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 \
-  ill-core.c item-req.c 
+  ill-core.c item-req.c oclc-ill-req-ext.c
 
 libyaz_la_SOURCES=version.c options.c log.c \
  $(GEN_FILES) \
@@ -178,11 +177,15 @@ $(top_srcdir)/include/yaz/ill-core.h: \
 $(srcdir)/ill.tcl $(srcdir)/ill9702.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_I) $(srcdir)/ill9702.asn
 
+# OCLC ILL Request Extension
+oclc-ill-req-ext.c \
+$(top_srcdir)/include/yaz/oclc-ill-req-ext.h: \
+$(srcdir)/ill.tcl $(srcdir)/oclc-ill-req-ext.asn $(YAZCOMP)
+	$(TCLSH) $(YAZCOMP_I) $(srcdir)/oclc-ill-req-ext.asn
+
 # Item Request
 item-req.c \
 $(top_srcdir)/include/yaz/item-req.h: \
 $(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
 
-# cqlparse_SOURCES = cqlstd.y
-
diff --git a/src/ill.tcl b/src/ill.tcl
index f311497..f06421a 100644
--- a/src/ill.tcl
+++ b/src/ill.tcl
@@ -1,5 +1,5 @@
 # Config File for ILL
-# $Id: ill.tcl,v 1.1 2003-10-27 12:21:30 adam Exp $
+# $Id: ill.tcl,v 1.2 2007-04-18 07:34:35 adam Exp $
 # ----------------------------------------------------------
 # Prefix Specifications
 #  
@@ -49,6 +49,11 @@ set membermap($m,APDU,ILL-Request) {APDU_ILL_Request illRequest}
 set membermap($m,APDU,ILL-Answer) {APDU_ILL_Answer illAnswer}
 
 # ----------------------------------------------------------
+set m CLCILLRequestExtension
+# Filename
+set filename($m) oclc-ill-req-ext
+
+# ----------------------------------------------------------
 set m Z39.50-extendedService-ItemOrder-ItemRequest-1
 # Filename
 set filename($m) item-req
diff --git a/src/oclc-ill-req-ext.asn b/src/oclc-ill-req-ext.asn
new file mode 100644
index 0000000..6b44cbc
--- /dev/null
+++ b/src/oclc-ill-req-ext.asn
@@ -0,0 +1,17 @@
+CLCILLRequestExtension DEFINITIONS ::=
+--The object identifier is 1.0.10161.13.2
+BEGIN
+IMPORTS ILL-String FROM ISO-10161-ILL-1;
+
+OCLCILLRequestExtension ::=SEQUENCE {
+    clientDepartment [0] ILL-String OPTIONAL,
+    paymentMethod [1] ILL-String OPTIONAL,
+    uniformTitle [2] ILL-String OPTIONAL,
+    dissertation [3] ILL-String OPTIONAL,
+    issueNumber [4] ILL-String OPTIONAL,
+    volume [5] ILL-String OPTIONAL,
+    affiliations [6] ILL-String OPTIONAL,
+    source [7] ILL-String OPTIONAL
+}
+END
+