Fix local attribute setting for pquery.

diff --git a/client/default.bib b/client/default.bib
index 735f095..4d2046f 100644 (file)
--- a/client/default.bib
+++ b/client/default.bib
@@ -1,5 +1,5 @@
 # CCL field mappings
-# $Id: default.bib,v 1.7 2001-02-12 15:35:19 adam Exp $
+# $Id: default.bib,v 1.8 2001-10-28 23:10:03 adam Exp $
 # 
 # The rule below is used when no fields are specified
 term t=l,r  s=al
@@ -23,12 +23,12 @@ note u=63   s=pw
 af   u=1006 s=pw
 #
 # Rules for a few GILS fields
-north  gils,u=2040 r=o
-south  gils,u=2041 r=o
-east  gils,u=2038 r=o
-west  gils,u=2039 r=o
-distributor gils,u=2000 s=pw
-distributorname gils,u=2001 s=pw
+north  gils-attset,u=2040 r=o
+south  gils-attset,u=2041 r=o
+east  gils-attset,u=2038 r=o
+west  gils-attest,u=2039 r=o
+distributor gils-attset,u=2000 s=pw
+distributorname gils-attset,u=2001 s=pw
 
 # Explain fields
 ExplainCategory      exp1,1=1

diff --git a/configure.in b/configure.in
index d8f16ee..a26030c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.51 2001-10-25 12:00:41 adam Exp $
+dnl $Id: configure.in,v 1.52 2001-10-28 23:10:02 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8)
+AM_INIT_AUTOMAKE(yaz, 1.8.1)
 dnl
 AC_SUBST(READLINE_LIBS)
 dnl ------ Checking programs

diff --git a/debian/rules b/debian/rules
index 4344344..ed26586 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ YAZSRCDIR=$(shell pwd)
 YAZ_VERSION=$(shell date -r$(YAZSRCDIR)/CVS +"CVS%Y%m%d")
 else
 YAZSRCDIR=$(shell pwd)
-YAZ_VERSION=1.8
+YAZ_VERSION=1.8.1
 endif
 
 configure: stamp-configure

diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index 358e770..4beea58 100644 (file)
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -1,11 +1,11 @@
 /*
  * Current software version.
  *
- * $Id: yaz-version.h,v 1.7 2001-10-25 12:00:41 adam Exp $
+ * $Id: yaz-version.h,v 1.8 2001-10-28 23:10:03 adam Exp $
  */
 #ifndef YAZ_VERSION
 
-#define YAZ_VERSION "1.8"
+#define YAZ_VERSION "1.8.1"
 #include <yaz/yaz-date.h>
 
 #ifdef WIN32

diff --git a/win/yaz.rc b/win/yaz.rc
index f542168..5f2b7a6 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,0,0
- PRODUCTVERSION 1,8,0,0
+ FILEVERSION 1,8,1,0
+ PRODUCTVERSION 1,8,1,0
  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", "1, 8, 0, 0\0"
+            VALUE "FileVersion", "1, 8, 1, 0\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1996-2001 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"
-            VALUE "ProductVersion", "1, 8, 0, 0\0"
+            VALUE "ProductVersion", "1, 8, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/yaz.spec b/yaz.spec
index bb4be9a..82434bb 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,5 +1,5 @@
 Name: yaz
-Version: 1.8
+Version: 1.8.1
 Release: 1
 Copyright: YAZ License
 Group: Development/Libraries

diff --git a/zutil/pquery.c b/zutil/pquery.c
index 65bcb5d..08cec42 100644 (file)
--- a/zutil/pquery.c
+++ b/zutil/pquery.c
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  *
  * $Log: pquery.c,v $
- * Revision 1.9  2001-09-24 21:51:56  adam
+ * Revision 1.10  2001-10-28 23:10:03  adam
+ * Fix local attribute setting for pquery.
+ *
+ * Revision 1.9  2001/09/24 21:51:56  adam
  * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
  * and yaz_z3950oid_to_str.
  *
@@ -353,7 +356,7 @@ static Z_AttributesPlusTerm *rpn_term (struct lex_info *li, ODR o,
                 (Z_AttributeElement*)odr_malloc (o,sizeof(**elements));
             elements[k]->attributeType = &attr_tmp[2*i];
            elements[k]->attributeSet =
-               yaz_oidval_to_z3950oid(o, attr_set[i], CLASS_ATTSET);
+               yaz_oidval_to_z3950oid(o, CLASS_ATTSET, attr_set[i]);
            if (attr_clist[i])
            {
                elements[k]->which = Z_AttributeValue_complex;