Use Odr_oid for OIDs. Require yazpp 1.0.3 (YAZ 3.0.2)

diff --git a/configure.ac b/configure.ac
index 4e75cf1..576c1d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl yazproxy, Index Data 1994-2007
 dnl See the file LICENSE for details.
 dnl yazproxy, Index Data 1994-2007
 dnl See the file LICENSE for details.

-dnl $Id: configure.ac,v 1.15 2007-03-20 16:23:42 adam Exp $
+dnl $Id: configure.ac,v 1.16 2007-05-08 12:05:08 adam Exp $

 AC_PREREQ(2.59)
 AC_INIT([yazproxy],[1.3.0],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_PREREQ(2.59)
 AC_INIT([yazproxy],[1.3.0],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)

@@ -13,7 +13,7 @@ AC_PROG_CXX
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 

-YAZPP_INIT(threads,1.0.1)
+YAZPP_INIT([threads],[1.0.3])

 if test -z "$YAZPPLIB"; then
        AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
 if test -z "$YAZPPLIB"; then
        AC_MSG_ERROR([YAZ++ development libraries missing])
 fi

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index e8aff93..25ef079 100644 (file)
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,4 +1,4 @@
-/* $Id: proxy.h,v 1.38 2007-04-12 18:18:42 adam Exp $
+/* $Id: proxy.h,v 1.39 2007-05-08 12:05:08 adam Exp $

    Copyright (c) 1998-2007, Index Data.
 
 This file is part of the yazproxy.
    Copyright (c) 1998-2007, Index Data.
 
 This file is part of the yazproxy.

@@ -146,7 +146,7 @@ class YAZ_EXPORT Yaz_Proxy : public yazpp_1::Z_Assoc {
     char *m_schema;
     char *m_backend_type;
     char *m_backend_charset;
     char *m_schema;
     char *m_backend_type;
     char *m_backend_charset;

-    int m_frontend_type[OID_SIZE];
+    Odr_oid m_frontend_type[OID_SIZE];

     void convert_to_frontend_type(Z_NamePlusRecordList *p);
     void convert_to_marcxml(Z_NamePlusRecordList *p, const char *charset);
     void convert_records_charset(Z_NamePlusRecordList *p, const char *charset);
     void convert_to_frontend_type(Z_NamePlusRecordList *p);
     void convert_to_marcxml(Z_NamePlusRecordList *p, const char *charset);
     void convert_records_charset(Z_NamePlusRecordList *p, const char *charset);

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index bb08a1a..b59d88a 100644 (file)
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy-config.cpp,v 1.36 2007-04-12 20:50:10 adam Exp $
+/* $Id: yaz-proxy-config.cpp,v 1.37 2007-05-08 12:05:09 adam Exp $

    Copyright (c) 1998-2007, Index Data.
 
 This file is part of the yazproxy.
    Copyright (c) 1998-2007, Index Data.
 
 This file is part of the yazproxy.

@@ -823,7 +823,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
                 }
                 else if (syntax)
                 {
                 }
                 else if (syntax)
                 {

-                    int *match_oid 
+                    Odr_oid *match_oid 

                         = yaz_string_to_oid_odr(yaz_oid_std(),
                                                 CLASS_RECSYN, match_type,
                                                 odr);
                         = yaz_string_to_oid_odr(yaz_oid_std(),
                                                 CLASS_RECSYN, match_type,
                                                 odr);

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index f1bc35f..a9ca482 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.76 2007-05-02 09:18:27 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.77 2007-05-08 12:05:09 adam Exp $

    Copyright (c) 1998-2007, Index Data.
 
 This file is part of the yazproxy.
    Copyright (c) 1998-2007, Index Data.
 
 This file is part of the yazproxy.

@@ -1011,7 +1011,7 @@ void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p,
             if (npr->which == Z_NamePlusRecord_databaseRecord)
             {
                 Z_External *r = npr->u.databaseRecord;
             if (npr->which == Z_NamePlusRecord_databaseRecord)
             {
                 Z_External *r = npr->u.databaseRecord;

-                const int *oid = r->direct_reference;
+                const Odr_oid *oid = r->direct_reference;

                 if (!oid)
                     continue;
 
                 if (!oid)
                     continue;