Towards 2.0.12

diff --git a/CHANGELOG b/CHANGELOG
index 1c2db3a..93799f0 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 2.0.12 2004/02/16
+
+Added member 'schema' to bend_explain_rr structure so that backend
+can specify explain record identifier. Defaults to Zeerex 2.0.
+
+Fix encoding of OID's of form 1.0.X. Bug introduced in 2.0.11.
+
 --- 2.0.11 2004/02/16
 
 * SRW/SRU 1.1 updates: updated diagnostic in srw.h to use uri instead

diff --git a/debian/changelog b/debian/changelog
index bbcbc07..b95ce4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (2.0.12-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@peanut.index>  Mon, 16 Feb 2004 18:52:25 +0100
+
 yaz (2.0.11-1) unstable; urgency=low
 
   * Upstream.

diff --git a/include/yaz/backend.h b/include/yaz/backend.h
index d6381dc..167c339 100644 (file)
--- a/include/yaz/backend.h
+++ b/include/yaz/backend.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: backend.h,v 1.23 2004-01-17 01:20:12 adam Exp $
+ * $Id: backend.h,v 1.24 2004-02-16 17:57:05 adam Exp $
  */
 
 #ifndef BACKEND_H
@@ -191,6 +191,7 @@ typedef struct {
     ODR print;
     char *explain_buf;
     char *database;
+    char *schema;
 } bend_explain_rr;
 
 typedef struct bend_initrequest

diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index 94d8b38..a1ebcc9 100644 (file)
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: yaz-version.h,v 1.36 2004-02-16 11:30:33 adam Exp $
+ * $Id: yaz-version.h,v 1.37 2004-02-16 17:57:05 adam Exp $
  */
 
 /*
@@ -12,8 +12,8 @@
 
 #include <yaz/yconfig.h>
 
-#define YAZ_VERSION "2.0.11"
-#define YAZ_VERSIONL 0x02000B
+#define YAZ_VERSION "2.0.12"
+#define YAZ_VERSIONL 0x02000C
 
 #define YAZ_DATE 1
 

diff --git a/src/ber_oid.c b/src/ber_oid.c
index 6a738e1..fa983bd 100644 (file)
--- a/src/ber_oid.c
+++ b/src/ber_oid.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: ber_oid.c,v 1.2 2004-02-11 23:49:28 adam Exp $
+ * $Id: ber_oid.c,v 1.3 2004-02-16 17:57:05 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -70,7 +70,7 @@ int ber_oidc(ODR o, Odr_oid *p)
         lenp = odr_tell(o);
         if (odr_putc(o, 0) < 0)   /* dummy */
             return 0;
-        if (p[0] < 0 || p[1] <= 0)
+        if (p[0] < 0 || p[1] < 0)
         {
             odr_seterror(o, ODATA, 23);
             return 0;

diff --git a/src/seshigh.c b/src/seshigh.c
index 9906fa4..eae2afa 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.20 2004-02-14 15:58:42 adam Exp $
+ * $Id: seshigh.c,v 1.21 2004-02-16 17:57:05 adam Exp $
  */
 
 /*
@@ -752,6 +752,7 @@ static void srw_bend_explain(association *assoc, request *req,
         rr.print = assoc->print;
         rr.explain_buf = 0;
        rr.database = srw_req->database;
+       rr.schema = "http://explain.z3950.org/dtd/2.0/";
         (*assoc->init->bend_explain)(assoc->backend, &rr);
         if (rr.explain_buf)
         {
@@ -1317,7 +1318,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                assoc->init->implementation_name,
                odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.20 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.21 $");
     if (strlen(version) > 10)  /* check for unexpanded CVS strings */
        version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,

diff --git a/win/yaz.nsi b/win/yaz.nsi
index ab85f5b..1a7074a 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.34 2004-02-16 11:30:34 adam Exp $
+; $Id: yaz.nsi,v 1.35 2004-02-16 17:57:05 adam Exp $
 
-!define VERSION "2.0.11"
+!define VERSION "2.0.12"
 
 Name "YAZ"
 Caption "Index Data YAZ ${VERSION} Setup"

diff --git a/win/yaz.rc b/win/yaz.rc
index 7c13539..22719a8 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,11,1
- PRODUCTVERSION 2,0,11,1
+ FILEVERSION 2,0,12,1
+ PRODUCTVERSION 2,0,12,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, 11, 1\0"
+            VALUE "FileVersion", "2, 0, 12, 1\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2004 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, 11, 1\0"
+            VALUE "ProductVersion", "2, 0, 12, 1\0"
             VALUE "SpecialBuild", "\0"
         END
     END