From 5e22c797a3b8155ec46e4680f2bc3b5ef163752b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 18 Feb 2003 11:57:58 +0000 Subject: [PATCH] Updated for YAZ 1.9.3 --- debian/changelog | 6 ++++++ debian/control | 2 +- recctrl/recgrs.c | 15 +++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5363ac4..ef180dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +idzebra (1.3.4-3) unstable; urgency=low + + * Updated for YAZ 1.9.3. + + -- Adam Dickmeiss Tue, 18 Feb 2003 13:05:19 +0100 + idzebra (1.3.4-2) unstable; urgency=low * Fixed bug in sort for unset entries at end of sort file. diff --git a/debian/control b/debian/control index ba2f932..e37832b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: idzebra Standards-Version: 2.5.0.0 Maintainer: Adam Dickmeiss Priority: extra -Build-Depends: yaz-devel (>= 1.9.2), libexpat1-dev, tcl8.3-dev, libbz2-dev +Build-Depends: yaz-devel (>= 1.9.3), libexpat1-dev, tcl8.3-dev, libbz2-dev Package: idzebra-doc Section: doc diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index ae5a782..613e8e3 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,4 +1,4 @@ -/* $Id: recgrs.c,v 1.72 2003-02-04 12:06:47 pop Exp $ +/* $Id: recgrs.c,v 1.73 2003-02-18 11:57:58 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -968,14 +968,25 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) #if 0 data1_pr_tree (p->dh, node, stdout); #endif +#if YAZ_VERSIONL >= 0x010903L if (p->comp && p->comp->which == Z_RecordComp_complex && p->comp->u.complex->generic && - p->comp->u.complex->generic->schema) + p->comp->u.complex->generic->which == Z_Schema_oid && + p->comp->u.complex->generic->schema.oid) + { + oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema.oid); + if (oe) + requested_schema = oe->value; + } +#else + if (p->comp && p->comp->which == Z_RecordComp_complex && + p->comp->u.complex->generic && p->comp->u.complex->generic->schema) { oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema); if (oe) requested_schema = oe->value; } +#endif /* If schema has been specified, map if possible, then check that * we got the right one -- 1.7.10.4