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.
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)
+yaz (2.0.2-1) unstable; urgency=low
+
+ * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk> Mon, 28 Apr 2003 19:58:06 +0100
+
yaz (2.0.1-2) unstable; urgency=low
* Event extensions.
Source: yaz
-Standards-Version: 3.5.7.0
+Standards-Version: 3.5.9.0
Maintainer: Adam Dickmeiss <adam@indexdata.dk>
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
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).
# 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
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
-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
-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
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
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
-## $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@
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
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
%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").
])]).
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,[
+]).
-<!-- $Id: frontend.xml,v 1.16 2003-02-23 20:40:01 adam Exp $ -->
+<!-- $Id: frontend.xml,v 1.17 2003-04-28 21:02:16 adam Exp $ -->
<chapter id="server"><title>Generic server</title>
<sect1><title>Introduction</title>
<note>
<para>
- 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.
</para>
</note>
</sect1>
</para>
<para>
- 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).
</para>
<para>
The <function>bend_search</function> 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 <literal>Z_Query</literal>
structure (note that CQL is now part of Z39.50 via an external).
To support CQL in existing implementations that only do Type-1,
<para>
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.
</para>
<synopsis>
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;
</synopsis>
<para>
The frontend server calls the <function>bend_fetch</function> 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 <literal>setname</literal> is simply the name of the result set
that holds the reference to the desired record.
The <literal>number</literal> is the offset into the set (with 1
</para>
<para>
- If a SRW SearchRetrieveRequest is received by the frontend server,
- the <literal>referenceId</literal> is NULL, the <literal>request_format
- </literal> (transfer syntax) is XML (OID name
+ If a SRW/SRU SearchRetrieveRequest is received by the frontend server,
+ the <literal>referenceId</literal> is NULL and the
+ <literal>request_format</literal> (transfer syntax) is XML (OID name
<literal>VAL_TEXT_XML</literal>).
- The schema for SRW is stored in the
+ The schema for SRW/SRU is stored in both the
<literal>Z_RecordComposition</literal>
- structure.
+ structure and <literal>schema</literal> (simple string).
</para>
<para>
database that holds the
record. <literal>len</literal> is the length of the record returned, in
bytes, and <literal>record</literal> is a pointer to the record.
- <literal>Last_in_set</literal> should be nonzero only if the record
+ <literal>last_in_set</literal> should be nonzero only if the record
returned is the last one in the given result set.
<literal>errcode</literal> and <literal>errstring</literal>, if
given, will be interpreted as a global error pertaining to the
-<!-- $Id: introduction.xml,v 1.13 2003-03-07 08:39:40 adam Exp $ -->
+<!-- $Id: introduction.xml,v 1.14 2003-04-28 21:02:16 adam Exp $ -->
<chapter id="introduction"><title>Introduction</title>
<para>
&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.
</para>
<para>
</para></listitem>
<listitem><para>
Supports
- <ulink url="http://www.loc.gov/z3950/agency/zing/srw/">SRW</ulink>
+ <ulink url="http://www.loc.gov/z3950/agency/zing/srw/">SRW/SRU</ulink>
version 1.0 (over HTTP and HTTPS).
</para></listitem>
<listitem><para>
</listitem>
<listitem>
- <para>
+ <para>
<xref linkend="zoom"/> describes the ZOOM API of &yaz;.
This is definitely worth a read if you wish to develop a Z39.50/SRW
client.
</para>
</listitem>
-
+
<listitem>
<para>
<xref linkend="server"/> describes the generic frontend server
<para>
<xref linkend="tools"/> 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 <link linkend="tools.cql">CQL</link> section
particularly useful.
</para>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<!-- $Id: yaz-config.sgml,v 1.2 2002-10-08 09:07:29 adam Exp $ -->
+<!-- $Id: yaz-config.sgml,v 1.3 2003-04-28 21:02:16 adam Exp $ -->
<refentry id="yaz-config">
<refmeta>
<refentrytitle>yaz-config</refentrytitle>
- <manvolnum>1</manvolnum>
+ <manvolnum>8</manvolnum>
</refmeta>
<refnamediv>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<!-- $Id: yaz-man.sgml,v 1.4 2002-10-08 09:07:29 adam Exp $ -->
+<!-- $Id: yaz-man.sgml,v 1.5 2003-04-28 21:02:16 adam Exp $ -->
<refentry id="yaz">
<refmeta>
<refentrytitle>yaz</refentrytitle>
</citerefentry>,
<citerefentry>
<refentrytitle>yaz-config</refentrytitle>
- <manvolnum>1</manvolnum>
+ <manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>zoomsh</refentrytitle>
<!ENTITY comstack "<acronym>COMSTACK</acronym>">
<!ENTITY zoom "<acronym>ZOOM</acronym>">
]>
-<!-- $Id: yaz.xml.in,v 1.9 2003-02-21 12:06:05 adam Exp $ -->
+<!-- $Id: yaz.xml.in,v 1.10 2003-04-28 21:02:16 adam Exp $ -->
<book id="yaz">
<bookinfo>
<title>YAZ User's Guide and Reference</title>
<abstract><simpara>
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.
</simpara>
* 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 $
*/
/*
#include <yaz/yconfig.h>
-#define YAZ_VERSION "2.0.1"
-#define YAZ_VERSIONL 0x020001
+#define YAZ_VERSION "2.0.2"
+#define YAZ_VERSIONL 0x020002
#define YAZ_DATE 1
-; $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"
//
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
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
Summary: Z39.50 Programs
Name: yaz
Version: @VERSION@
-Release: 2
+Release: 1
Requires: libxml2 openssl readline libyaz = %{version}
Copyright: YAZ License
Group: Other
%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
/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
projects / yaz-moved-to-github.git / commitdiff