From: Adam Dickmeiss Date: Mon, 28 Apr 2003 21:02:14 +0000 (+0000) Subject: Towards 2.0.2 X-Git-Tag: YAZ.2.0.2~1 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=a4500a53ecbff46db730bcaa8703d2c9a0e6328b;p=yaz-moved-to-github.git Towards 2.0.2 --- diff --git a/CHANGELOG b/CHANGELOG index 0e60dbb..58ac343 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ Possible compatibility problems with earlier versions marked with '*'. +--- 2.0.2 2003/04/28 + +New Debian package layout similar to the Redhat Package layout. + New ZOOM events ZOOM_EVENT_RECV_{RECORD,SEARCH} for receiving a record and search result respectively. diff --git a/configure.in b/configure.in index ba73726..db7da1a 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2003 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.111 2003-03-25 09:58:13 adam Exp $ +dnl $Id: configure.in,v 1.112 2003-04-28 21:02:15 adam Exp $ AC_INIT(include/yaz/yaz-version.h) -AM_INIT_AUTOMAKE(yaz, 2.0.1) +AM_INIT_AUTOMAKE(yaz, 2.0.2) AM_MAINTAINER_MODE dnl AC_SUBST(READLINE_LIBS) diff --git a/debian/changelog b/debian/changelog index 4e88286..4fa37b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yaz (2.0.2-1) unstable; urgency=low + + * Upstream. + + -- Adam Dickmeiss Mon, 28 Apr 2003 19:58:06 +0100 + yaz (2.0.1-2) unstable; urgency=low * Event extensions. diff --git a/debian/control b/debian/control index d4aad46..949dd71 100644 --- a/debian/control +++ b/debian/control @@ -1,37 +1,45 @@ Source: yaz -Standards-Version: 3.5.7.0 +Standards-Version: 3.5.9.0 Maintainer: Adam Dickmeiss Priority: extra -Build-Depends: docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev +Build-Depends: docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev, libssl-dev -Package: yaz-runtime +Package: yaz +Section: utils +Architecture: any +Depends: libyaz, ${shlibs:Depends} +Conflicts: yaz-runtime, yaz-ssl +Description: The YAZ Z39.50 toolkit (utilities) + YAZ is a toolkit that allows you to develop software using the + ANSI Z39.50/ISO23950 standard for information retrieval. + . + This packages includes utility programs. + +Package: libyaz Section: libs Architecture: any -Depends: ${shlibs:Depends} -Conflicts: idzebra (<= 1.3.4-2), php4-yaz (<= 4.1.2-5) +Depends: libssl0.9.6, ${shlibs:Depends} +Replaces: yaz-runtime, yaz-ssl +Conflicts: yaz-runtime, yaz-ssl, idzebra (<= 1.3.4-2), php4-yaz (<= 4.1.2-5) Description: The YAZ Z39.50 toolkit (runtime files) YAZ is a toolkit that allows you to develop software using the ANSI Z39.50/ISO23950 standard for information retrieval. . - Besides development libraries and header files YAZ includes - sample clients - and server. - . This packages includes runtime files. Package: yaz-doc Section: doc -Architecture: any +Architecture: all Description: The YAZ Z39.50 toolkit (documentation) YAZ is a toolkit that allows you to develop software using the Z39.50/ISO23950 standard for information retrieval. . - Besides development libraries and header files YAZ includes - sample clients - and server. - . This packages includes documentation for YAZ in HTML and PDF. -Package: yaz-devel -Depends: yaz-runtime +Package: libyaz-dev +Depends: libyaz +Replaces: yaz-devel +Conflicts: yaz-devel Section: devel Architecture: any Recommends: yaz-doc, libxml2-dev @@ -39,20 +47,5 @@ Description: The YAZ Z39.50 toolkit (development files) YAZ is a toolkit that allows you to develop software using the ANSI Z39.50/ISO23950 standard for information retrieval. . - Besides development libraries and header files YAZ includes - sample clients - and server. - . This packages includes development libraries and C/C++ header files. -Package: yaz-ssl -Depends: ${shlibs:Depends} -Section: libs -Architecture: any -Description: The YAZ Z39.50 toolkit (SSL support) - YAZ is a toolkit that allows you to develop software using the - ANSI Z39.50/ISO23950 standard for information retrieval. - . - Besides development libraries and header files YAZ includes - sample clients - and server. - . - This packages includes SSL support (Z39.50 protocol over SSL). diff --git a/debian/rules b/debian/rules index 650080f..c133c34 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,7 @@ # This is the debhelper compatability version to use. export DH_COMPAT=2 -YAZ_WITH_SSL?=1 -CONFIG_FLAGS=--with-xml2=/usr --enable-static --enable-shared --enable-tcpd --prefix=/usr +CONFIG_FLAGS=--with-xml2=/usr --enable-static --enable-shared --enable-tcpd --prefix=/usr --with-openssl # Enable parallel builds if CONCURRENCY_LEVEL is set ifdef CONCURRENCY_LEVEL @@ -21,17 +20,10 @@ else MCFLAGS= endif -ifeq ($(YAZ_WITH_SSL),1) -export BUILD_SSL=1 -SSL_FLAGS=--with-openssl -else -SSL_FLAGS= -endif - YAZSRCDIR?=$(shell pwd) # Local library path for linking with right dependencies -LOCAL_LINK=-ldebian/yaz-runtime/usr/lib:debian/yaz-ssl/usr/lib +LOCAL_LINK=-ldebian/libyaz/usr/lib $(YAZSRCDIR)/configure: $(YAZSRCDIR)/configure.in cd $(YAZSRCDIR); sh buildconf.sh @@ -41,7 +33,7 @@ stamp-configure: $(YAZSRCDIR)/configure -rm -rf build mkdir build - cd build; $(YAZSRCDIR)/configure $(CONFIG_FLAGS) $(SSL_FLAGS) + cd build; $(YAZSRCDIR)/configure $(CONFIG_FLAGS) touch stamp-configure build: stamp-build @@ -60,8 +52,8 @@ clean: -rm -rf build dh_clean - -rm -rf debian/yaz-runtime debian/yaz-ssl debian/yaz-devel \ - debian/with-ssl debian/*.debhelper debian/substvars debian/shlibs.yaz-* + -rm -rf debian/libyaz debian/libyaz-dev \ + debian/*.debhelper debian/substvars debian/shlibs.yaz-* install: stamp-install stamp-install: stamp-build @@ -95,12 +87,10 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot -ifeq ($(YAZ_WITH_SSL),1) - dh_movefiles -p yaz-ssl usr/bin/*ssl usr/lib/libyazssl* -endif - dh_movefiles -p yaz-devel usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include usr/bin/yaz-config usr/bin/yaz-comp - dh_movefiles -p yaz-runtime usr/lib usr/share/yaz usr/bin - dh_installexamples -p yaz-devel + dh_movefiles -p libyaz-dev usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include usr/bin/yaz-config usr/bin/yaz-comp usr/share/yaz + dh_movefiles -p yaz usr/bin + dh_movefiles -p libyaz usr/lib + dh_installexamples -p libyaz-dev cp LICENSE debian/copyright cp CHANGELOG changelog @@ -112,56 +102,47 @@ endif dh_compress -a dh_fixperms -a - dh_installdeb -p yaz-runtime - dh_installdeb -p yaz-devel - dh_installman -p yaz-devel doc/yaz-config.1 - dh_undocumented -p yaz-devel yaz-comp.1 - dh_installman -p yaz-runtime doc/yaz-client.1 doc/yaz-ztest.8 doc/yaz.7 doc/zoomsh.1 - echo "libyaz 2 yaz-runtime (>= 1.9.3)" > debian/yaz-runtime/DEBIAN/shlibs - echo "libyazthread 2 yaz-runtime (>= 1.9.3)" >> debian/yaz-runtime/DEBIAN/shlibs - echo "libyazmalloc 2 yaz-runtime (>= 1.9.3)" >> debian/yaz-runtime/DEBIAN/shlibs - chmod 644 debian/yaz-runtime/DEBIAN/shlibs - dh_shlibdeps -p yaz-runtime $(LOCAL_LINK) -ifeq ($(YAZ_WITH_SSL),1) - dh_installdeb -p yaz-ssl - dh_installman -p yaz-ssl doc/yaz-client-ssl.1 doc/yaz-ztest-ssl.8 - echo "libyazssl 2 yaz-ssl (>= 1.9.3)" >> debian/yaz-ssl/DEBIAN/shlibs - chmod 644 debian/yaz-ssl/DEBIAN/shlibs - dh_shlibdeps -p yaz-ssl $(LOCAL_LINK) - cat debian/postinst >> debian/yaz-ssl/DEBIAN/postinst -endif - cat debian/postinst >> debian/yaz-runtime/DEBIAN/postinst + dh_installdeb -p libyaz + dh_installdeb -p libyaz-dev + dh_installdeb -p yaz - dh_gencontrol -p yaz-runtime - dh_md5sums -p yaz-runtime + dh_installman -p libyaz-dev doc/yaz-config.8 + dh_undocumented -p libyaz-dev yaz-comp.1 + dh_installman -p yaz doc/yaz-client.1 doc/yaz-ztest.8 doc/yaz.7 doc/zoomsh.1 + dh_installman -p yaz doc/yaz-client-ssl.1 doc/yaz-ztest-ssl.8 - dh_gencontrol -p yaz-devel - dh_md5sums -p yaz-devel + echo "libyaz 2 libyaz (>= 2.0.2)" > debian/libyaz/DEBIAN/shlibs + echo "libyazthread 2 libyaz (>= 2.0.2)" >> debian/libyaz/DEBIAN/shlibs + echo "libyazmalloc 2 libyaz (>= 2.0.2)" >> debian/libyaz/DEBIAN/shlibs + echo "libyazssl 2 libyaz (>= 2.0.2)" >> debian/libyaz/DEBIAN/shlibs + chmod 644 debian/libyaz/DEBIAN/shlibs + dh_shlibdeps -p libyaz $(LOCAL_LINK) + cat debian/postinst >> debian/libyaz/DEBIAN/postinst + + dh_gencontrol -p libyaz + dh_md5sums -p libyaz + + dh_gencontrol -p libyaz-dev + dh_md5sums -p libyaz-dev + + dh_gencontrol -p yaz + dh_md5sums -p yaz -ifeq ($(YAZ_WITH_SSL),1) - dh_gencontrol -p yaz-ssl - dh_md5sums -p yaz-ssl -endif # Go kill those CVS-dirs before build -find debian/tmp -type d -name CVS | xargs rm -rf # For some reason it is necessary to remove empty-dirs in yaz-doc -rm -rf debian/tmp/usr/include debian/tmp/usr/share/aclocal debian/tmp/usr/lib debian/tmp/usr/bin \ debian/tmp/usr/share/yaz - dh_builddeb -p yaz-runtime - dh_builddeb -p yaz-devel -ifeq ($(YAZ_WITH_SSL),1) - dh_builddeb -p yaz-ssl -endif + dh_builddeb -p libyaz + dh_builddeb -p libyaz-dev + dh_builddeb -p yaz binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install install-stamp configure yazrelease: - # Conveniency target for building both SSL and non-ssl versions + # Conveniency target for building YAZ dh_testdir - # Non-ssl version and source dpkg-buildpackage $(EXTRA_OPTS) -rfakeroot - # SSL version - -YAZ_WITH_SSL=1 dpkg-buildpackage $(EXTRA_OPTS) -rfakeroot -B diff --git a/doc/Makefile.am b/doc/Makefile.am index 35784c2..24e5432 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.43 2003-04-24 13:29:50 adam Exp $ +## $Id: Makefile.am,v 1.44 2003-04-28 21:02:16 adam Exp $ docdir=$(datadir)/doc/@PACKAGE@ @@ -24,7 +24,7 @@ HTMLFILES = \ zoom.records.html zoom.resultsets.html zoom.scan.html MANFILES=yaz-client.1 yaz-client-ssl.1 yaz-ztest.8 \ - yaz-ztest-ssl.8 yaz-config.1 yaz.7 zoomsh.1 + yaz-ztest-ssl.8 yaz-config.8 yaz.7 zoomsh.1 REFFILES=yaz-client.sgml yaz-ztest.sgml yaz-config.sgml \ yaz-man.sgml zoomsh.sgml @@ -46,7 +46,7 @@ yaz-ztest.8: yaz-ztest.sgml ztest-options.xml if test ! -f ztest-options.xml ; then ln -s $(srcdir)/ztest-options .; fi docbook2man $(srcdir)/yaz-ztest.sgml -yaz-config.1: yaz-config.sgml +yaz-config.8: yaz-config.sgml docbook2man $(srcdir)/yaz-config.sgml yaz.7: yaz-man.sgml diff --git a/doc/apilayer.obj b/doc/apilayer.obj index a2e423f..a447b86 100644 --- a/doc/apilayer.obj +++ b/doc/apilayer.obj @@ -1,7 +1,7 @@ %TGIF 4.1.42-QPL -state(1,37,100.000,0,0,0,16,1,9,0,0,0,0,3,0,1,0,'Helvetica',0,80640,0,0,1,5,0,0,1,1,0,16,0,0,1,1,1,0,1485,1050,0,0,2880,0). +state(1,37,100.000,0,78,1,16,1,9,0,0,0,0,3,1,1,0,'Helvetica',0,80640,0,0,1,5,0,1,1,1,0,16,0,0,1,1,1,0,1485,1050,0,0,2880,0). % -% @(#)$Header: /home/cvsroot/yaz/doc/apilayer.obj,v 1.1 2003-02-23 14:25:34 adam Exp $ +% @(#)$Header: /home/cvsroot/yaz/doc/apilayer.obj,v 1.2 2003-04-28 21:02:16 adam Exp $ % %W% % unit("1 pixel/pixel"). @@ -145,3 +145,5 @@ str_seg('black','Helvetica',0,80640,41,14,3,0,-3,0,0,0,0,0, ])]). box('black','',35,115,100,165,0,1,1,305,0,0,0,0,0,'1',0,[ ]). +box('black','',240,115,305,165,0,1,1,306,0,0,0,0,0,'1',0,[ +]). diff --git a/doc/frontend.xml b/doc/frontend.xml index dbd2104..cbb533a 100644 --- a/doc/frontend.xml +++ b/doc/frontend.xml @@ -1,4 +1,4 @@ - + Generic server Introduction @@ -44,8 +44,7 @@ - The &yaz; server does not provide full SRW functionality. - However, it provides an adapter for SRW (to Z39.50). + The &yaz; server does not support XCQL. @@ -333,8 +332,8 @@ bend_initresult (*bend_init)(bend_initrequest *r); - This handler is also called when operating in SRW mode - when - a connection has been made (even though SRW does not offer + This handler is also called when operating in SRW/SRU mode - when + a connection has been made (even though SRW/SRU does not offer this service). @@ -497,8 +496,8 @@ typedef struct { The bend_search handler is also called when - the frontend server receives a SRW SearchRetrieveRequest. - For SRW, a CQL query is usually provided by the client. + the frontend server receives a SRW/SRU SearchRetrieveRequest. + For SRW/SRU, a CQL query is usually provided by the client. The CQL query is available as part of Z_Query structure (note that CQL is now part of Z39.50 via an external). To support CQL in existing implementations that only do Type-1, @@ -509,8 +508,8 @@ typedef struct { To maintain backwards compatibility, the frontend server of yaz always assume that error codes are BIB-1 diagnostics. - For SRW operation, a Bib-1 diagnostic code is mapped to - SRW diagnostic. + For SRW/SRU operation, a Bib-1 diagnostic code is mapped to + SRW/SRU diagnostic. @@ -535,13 +534,14 @@ typedef struct bend_fetch_rr { int errcode; /* 0==success */ char *errstring; /* system error string or NULL */ int surrogate_flag; /* surrogate diagnostic */ + char *schema; /* string record schema input/output */ } bend_fetch_rr; The frontend server calls the bend_fetch handler when it needs database records to fulfill a Z39.50 Search Request, a - Z39.50 Present Request or a SRW SearchRetrieveRequest. + Z39.50 Present Request or a SRW SearchRetrieveRequest. The setname is simply the name of the result set that holds the reference to the desired record. The number is the offset into the set (with 1 @@ -559,13 +559,13 @@ typedef struct bend_fetch_rr { - If a SRW SearchRetrieveRequest is received by the frontend server, - the referenceId is NULL, the request_format - (transfer syntax) is XML (OID name + If a SRW/SRU SearchRetrieveRequest is received by the frontend server, + the referenceId is NULL and the + request_format (transfer syntax) is XML (OID name VAL_TEXT_XML). - The schema for SRW is stored in the + The schema for SRW/SRU is stored in both the Z_RecordComposition - structure. + structure and schema (simple string). @@ -573,7 +573,7 @@ typedef struct bend_fetch_rr { database that holds the record. len is the length of the record returned, in bytes, and record is a pointer to the record. - Last_in_set should be nonzero only if the record + last_in_set should be nonzero only if the record returned is the last one in the given result set. errcode and errstring, if given, will be interpreted as a global error pertaining to the diff --git a/doc/introduction.xml b/doc/introduction.xml index 4d2b25b..a2fb762 100644 --- a/doc/introduction.xml +++ b/doc/introduction.xml @@ -1,9 +1,9 @@ - + Introduction &yaz; is a C/C++ library for information retrieval applications - using the Z39.50/SRW protocols for information retrieval. + using the Z39.50/SRW/SRU protocols for information retrieval. @@ -17,7 +17,7 @@ Supports - SRW + SRW/SRU version 1.0 (over HTTP and HTTPS). @@ -82,13 +82,13 @@ - + describes the ZOOM API of &yaz;. This is definitely worth a read if you wish to develop a Z39.50/SRW client. - + describes the generic frontend server @@ -126,7 +126,7 @@ contains sections for the various tools offered by &yaz;. Scan through the material quickly - and see what's relevant to you! SRW implementors + and see what's relevant to you! SRW/SRU implementors might find the CQL section particularly useful. diff --git a/doc/yaz-config.sgml b/doc/yaz-config.sgml index 69b2d28..5234fa1 100644 --- a/doc/yaz-config.sgml +++ b/doc/yaz-config.sgml @@ -1,9 +1,9 @@ - + yaz-config - 1 + 8 diff --git a/doc/yaz-man.sgml b/doc/yaz-man.sgml index 313a056..8b4df2a 100644 --- a/doc/yaz-man.sgml +++ b/doc/yaz-man.sgml @@ -1,5 +1,5 @@ - + yaz @@ -73,7 +73,7 @@ , yaz-config - 1 + 8 , zoomsh diff --git a/doc/yaz.xml.in b/doc/yaz.xml.in index a066d7d..ffe2fac 100644 --- a/doc/yaz.xml.in +++ b/doc/yaz.xml.in @@ -25,7 +25,7 @@ COMSTACK"> ZOOM"> ]> - + YAZ User's Guide and Reference @@ -39,8 +39,9 @@ This document is the programmer's guide and reference to the &yaz; package version @VERSION@. &yaz; is a compact toolkit that provides - access to the Z39.50 and SRW protocols, as well as a set of higher-level - tools for implementing the server and client roles, respectively. + access to the Z39.50 and SRW/SRU protocols, as well as a set of + higher-level tools for implementing the server and client + roles, respectively. The documentation can be used on its own, or as a reference when looking at the example applications provided with the package. diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h index e3601fa..a02f568 100644 --- a/include/yaz/yaz-version.h +++ b/include/yaz/yaz-version.h @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-version.h,v 1.25 2003-03-25 09:57:26 adam Exp $ + * $Id: yaz-version.h,v 1.26 2003-04-28 21:02:16 adam Exp $ */ /* @@ -12,8 +12,8 @@ #include -#define YAZ_VERSION "2.0.1" -#define YAZ_VERSIONL 0x020001 +#define YAZ_VERSION "2.0.2" +#define YAZ_VERSIONL 0x020002 #define YAZ_DATE 1 diff --git a/win/yaz.nsi b/win/yaz.nsi index 30d67d0..614d6e1 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -1,6 +1,6 @@ -; $Id: yaz.nsi,v 1.20 2003-04-24 20:00:15 adam Exp $ +; $Id: yaz.nsi,v 1.21 2003-04-28 21:02:17 adam Exp $ -!define VERSION "2.0.1" +!define VERSION "2.0.2" Name "YAZ" Caption "Index Data YAZ ${VERSION} Setup" diff --git a/win/yaz.rc b/win/yaz.rc index 75705e8..c8194c7 100644 --- a/win/yaz.rc +++ b/win/yaz.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,1,1 - PRODUCTVERSION 2,0,1,1 + FILEVERSION 2,0,2,1 + PRODUCTVERSION 2,0,2,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,14 +73,14 @@ BEGIN VALUE "Comments", "Z39.50 C Library\0" VALUE "CompanyName", "Index Data\0" VALUE "FileDescription", "YAZ Toolkit\0" - VALUE "FileVersion", "2, 0, 1, 1\0" + VALUE "FileVersion", "2, 0, 2, 1\0" VALUE "InternalName", "YAZ\0" VALUE "LegalCopyright", "Copyright © 1995-2003 Index Data\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "yaz.rc\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Index Data YAZ Toolkit\0" - VALUE "ProductVersion", "2, 0, 1, 1\0" + VALUE "ProductVersion", "2, 0, 2, 1\0" VALUE "SpecialBuild", "\0" END END diff --git a/yaz.spec.in b/yaz.spec.in index 007d82c..c34c852 100644 --- a/yaz.spec.in +++ b/yaz.spec.in @@ -1,7 +1,7 @@ Summary: Z39.50 Programs Name: yaz Version: @VERSION@ -Release: 2 +Release: 1 Requires: libxml2 openssl readline libyaz = %{version} Copyright: YAZ License Group: Other @@ -63,8 +63,6 @@ rm -fr ${RPM_BUILD_ROOT} %files -n lib%{name} /usr/lib/*.so.* -/usr/share/yaz/z39.50 -/usr/share/yaz/ill /usr/share/man/man7/yaz.* %files -n lib%{name}-devel @@ -75,5 +73,7 @@ rm -fr ${RPM_BUILD_ROOT} /usr/lib/*.a /usr/lib/*.la /usr/share/aclocal/yaz.m4 -/usr/share/man/man1/yaz-config.* +/usr/share/man/man8/yaz-config.* /usr/share/doc/yaz +/usr/share/yaz/z39.50 +/usr/share/yaz/ill