X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=cd7046bd919f8454f1f5eda58df3820afebe12a5;hp=2761220d6b5c69e9917c139ddcc80a7e21de7f93;hb=82d0b6ce2accdbe9987d0b8b4e6e818514455e22;hpb=ceb226cb18d96a6b3aa2dd6cff94aa27850362cf

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 2761220..cd7046b 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,293 +1,386 @@
-/*
- * Copyright (c) 1998-2001, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data 
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-assoc.cpp,v 1.25 2002-10-09 12:50:26 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <signal.h>
 
 #include <yaz/log.h>
-#include <yaz++/z-assoc.h>
+#include <yazpp/z-assoc.h>
 #include <yaz/otherinfo.h>
+#include <yaz/oid_db.h>
 
-int Yaz_Z_Assoc::yaz_init_func()
+namespace yazpp_1
+{
+    class Z_Assoc_priv
+    {
+        friend class Z_Assoc;
+    private:
+        Z_Assoc_priv(IPDU_Observable *the_PDU_Observable);
+        ~Z_Assoc_priv();
+        static int yaz_init_flag;
+        static int yaz_init_func();
+        IPDU_Observable *PDU_Observable;
+        ODR odr_in;
+        ODR odr_out;
+        ODR odr_print;
+        int log;
+        FILE *APDU_file;
+        char *APDU_fname;
+        char *hostname;
+        int APDU_yazlog;
+    };
+};
+
+using namespace yazpp_1;
+
+int Z_Assoc_priv::yaz_init_func()
 {
 #ifndef WIN32
-    signal (SIGPIPE, SIG_IGN);
+    signal(SIGPIPE, SIG_IGN);
 #endif
     return 1;
 }
 
-int Yaz_Z_Assoc::yaz_init_flag =  Yaz_Z_Assoc::yaz_init_func();  
+int Z_Assoc_priv::yaz_init_flag =  Z_Assoc_priv::yaz_init_func();
+
+Z_Assoc_priv::Z_Assoc_priv(IPDU_Observable *the_PDU_Observable)
+{
+    PDU_Observable = the_PDU_Observable;
+    odr_in = odr_createmem(ODR_DECODE);
+    odr_out = odr_createmem(ODR_ENCODE);
+    odr_print = odr_createmem(ODR_PRINT);
+    log = YLOG_DEBUG;
+    APDU_file = 0;
+    APDU_fname = 0;
+    hostname = 0;
+    APDU_yazlog = 0;
+}
+
+Z_Assoc_priv::~Z_Assoc_priv()
+{
+    PDU_Observable->destroy();
+    delete PDU_Observable;
+    odr_destroy(odr_print);     // note: also runs fclose on APDU_file ..
+    odr_destroy(odr_out);
+    odr_destroy(odr_in);
+    delete [] APDU_fname;
+    delete [] hostname;
+}
 
-Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
+Z_Assoc::Z_Assoc(IPDU_Observable *the_PDU_Observable)
 {
-    m_PDU_Observable = the_PDU_Observable;
-    m_odr_in = odr_createmem (ODR_DECODE);
-    m_odr_out = odr_createmem (ODR_ENCODE);
-    m_odr_print = odr_createmem (ODR_PRINT);
-    m_log = LOG_DEBUG;
-    m_APDU_file = 0;
-    m_APDU_fname = 0;
-    m_hostname = 0;
+    m_p = new Z_Assoc_priv(the_PDU_Observable);
 }
 
-void Yaz_Z_Assoc::set_APDU_log(const char *fname)
+Z_Assoc::~Z_Assoc()
 {
-    if (m_APDU_file && m_APDU_file != stderr)
+    delete m_p;
+}
+
+void Z_Assoc::set_APDU_log(const char *fname)
+{
+    if (m_p->APDU_file && m_p->APDU_file != stderr)
     {
-	fclose (m_APDU_file);
-	m_APDU_file = 0;
+        fclose(m_p->APDU_file);
+        m_p->APDU_file = 0;
     }
-    delete [] m_APDU_fname;
-    m_APDU_fname = 0;
+    delete [] m_p->APDU_fname;
+    m_p->APDU_fname = 0;
 
-    if (fname) 
+    if (fname)
     {
-	m_APDU_fname = new char[strlen(fname)+1];
-	strcpy (m_APDU_fname, fname);
-	if (*fname && strcmp(fname, "-"))
-	    m_APDU_file = fopen (fname, "a");
-	else
-	    m_APDU_file = stderr;
-	odr_setprint(m_odr_print, m_APDU_file);
+        m_p->APDU_fname = new char[strlen(fname)+1];
+        strcpy(m_p->APDU_fname, fname);
+        if (!strcmp(fname, "-"))
+            m_p->APDU_file = stderr;
+        else if (*fname == '\0')
+            m_p->APDU_file = 0;
+        else
+            m_p->APDU_file = fopen(fname, "a");
+        odr_setprint(m_p->odr_print, m_p->APDU_file);
     }
 }
 
-const char *Yaz_Z_Assoc::get_APDU_log()
+int Z_Assoc::set_APDU_yazlog(int v)
 {
-    return m_APDU_fname;
+    int old = m_p->APDU_yazlog;
+    m_p->APDU_yazlog = v;
+    return old;
 }
 
-Yaz_Z_Assoc::~Yaz_Z_Assoc()
+const char *Z_Assoc::get_APDU_log()
 {
-    m_PDU_Observable->destroy();  
-    delete m_PDU_Observable;
-    odr_destroy (m_odr_print);     // note: also runs fclose on m_APDU_file ..
-    odr_destroy (m_odr_out);
-    odr_destroy (m_odr_in);
-    delete [] m_APDU_fname;
-    delete [] m_hostname;
+    return m_p->APDU_fname;
 }
 
-void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
+void Z_Assoc::recv_PDU(const char *buf, int len)
 {
-    yaz_log (m_log, "recv_PDU len=%d", len);
-    Z_APDU *apdu = decode_Z_PDU (buf, len);
+    yaz_log(m_p->log, "recv_PDU len=%d", len);
+    Z_GDU *apdu = decode_GDU(buf, len);
     if (apdu)
     {
-	recv_Z_PDU (apdu);
+        recv_GDU(apdu, len);
     }
     else
     {
-	close();
+        m_p->PDU_Observable->shutdown();
+        failNotify();
     }
 }
 
-Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type)
+Z_APDU *Z_Assoc::create_Z_PDU(int type)
 {
-    Z_APDU *apdu = zget_APDU(m_odr_out, type);
+    Z_APDU *apdu = zget_APDU(m_p->odr_out, type);
     if (apdu->which == Z_APDU_initRequest)
     {
-	Z_InitRequest * p = apdu->u.initRequest;
-	char *newName = (char*) odr_malloc(m_odr_out, 50);
-	strcpy (newName, p->implementationName);
-	strcat (newName, " YAZ++");
-	p->implementationName = newName;
+        Z_InitRequest * p = apdu->u.initRequest;
+        char *newName = (char*) odr_malloc(m_p->odr_out, 50);
+        strcpy(newName, p->implementationName);
+        strcat(newName, " YAZ++");
+        p->implementationName = newName;
     }
     return apdu;
 }
 
-Z_ReferenceId **Yaz_Z_Assoc::get_referenceIdP(Z_APDU *apdu)
+Z_ReferenceId **Z_Assoc::get_referenceIdP(Z_APDU *apdu)
 {
     switch (apdu->which)
     {
     case  Z_APDU_initRequest:
-	return &apdu->u.initRequest->referenceId; 
+        return &apdu->u.initRequest->referenceId;
     case  Z_APDU_initResponse:
-	return &apdu->u.initResponse->referenceId;
+        return &apdu->u.initResponse->referenceId;
     case  Z_APDU_searchRequest:
-	return &apdu->u.searchRequest->referenceId;
+        return &apdu->u.searchRequest->referenceId;
     case  Z_APDU_searchResponse:
-	return &apdu->u.searchResponse->referenceId;
+        return &apdu->u.searchResponse->referenceId;
     case  Z_APDU_presentRequest:
-	return &apdu->u.presentRequest->referenceId;
+        return &apdu->u.presentRequest->referenceId;
     case  Z_APDU_presentResponse:
-	return &apdu->u.presentResponse->referenceId;
+        return &apdu->u.presentResponse->referenceId;
     case  Z_APDU_deleteResultSetRequest:
-	return &apdu->u.deleteResultSetRequest->referenceId;
+        return &apdu->u.deleteResultSetRequest->referenceId;
     case  Z_APDU_deleteResultSetResponse:
-	return &apdu->u.deleteResultSetResponse->referenceId;
+        return &apdu->u.deleteResultSetResponse->referenceId;
     case  Z_APDU_accessControlRequest:
-	return &apdu->u.accessControlRequest->referenceId;
+        return &apdu->u.accessControlRequest->referenceId;
     case  Z_APDU_accessControlResponse:
-	return &apdu->u.accessControlResponse->referenceId;
+        return &apdu->u.accessControlResponse->referenceId;
     case  Z_APDU_resourceControlRequest:
-	return &apdu->u.resourceControlRequest->referenceId;
+        return &apdu->u.resourceControlRequest->referenceId;
     case  Z_APDU_resourceControlResponse:
-	return &apdu->u.resourceControlResponse->referenceId;
+        return &apdu->u.resourceControlResponse->referenceId;
     case  Z_APDU_triggerResourceControlRequest:
-	return &apdu->u.triggerResourceControlRequest->referenceId;
+        return &apdu->u.triggerResourceControlRequest->referenceId;
     case  Z_APDU_resourceReportRequest:
-	return &apdu->u.resourceReportRequest->referenceId;
+        return &apdu->u.resourceReportRequest->referenceId;
     case  Z_APDU_resourceReportResponse:
-	return &apdu->u.resourceReportResponse->referenceId;
+        return &apdu->u.resourceReportResponse->referenceId;
     case  Z_APDU_scanRequest:
-	return &apdu->u.scanRequest->referenceId;
+        return &apdu->u.scanRequest->referenceId;
     case  Z_APDU_scanResponse:
-	return &apdu->u.scanResponse->referenceId;
+        return &apdu->u.scanResponse->referenceId;
     case  Z_APDU_sortRequest:
-	return &apdu->u.sortRequest->referenceId;
+        return &apdu->u.sortRequest->referenceId;
     case  Z_APDU_sortResponse:
-	return &apdu->u.sortResponse->referenceId;
+        return &apdu->u.sortResponse->referenceId;
     case  Z_APDU_segmentRequest:
-	return &apdu->u.segmentRequest->referenceId;
+        return &apdu->u.segmentRequest->referenceId;
     case  Z_APDU_extendedServicesRequest:
-	return &apdu->u.extendedServicesRequest->referenceId;
+        return &apdu->u.extendedServicesRequest->referenceId;
     case  Z_APDU_extendedServicesResponse:
-	return &apdu->u.extendedServicesResponse->referenceId;
+        return &apdu->u.extendedServicesResponse->referenceId;
     case  Z_APDU_close:
-	return &apdu->u.close->referenceId;
+        return &apdu->u.close->referenceId;
     }
     return 0;
 }
 
-void Yaz_Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to)
+void Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to)
 {
     Z_ReferenceId **id_from = get_referenceIdP(from);
     Z_ReferenceId **id_to = get_referenceIdP(to);
-    if (id_from && *id_from && id_to)
+    if (id_to)
     {
-	*id_to = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(**id_to));
-	(*id_to)->size = (*id_to)->len = (*id_from)->len;
-	(*id_to)->buf = (unsigned char*) odr_malloc (m_odr_out, (*id_to)->len);
-	memcpy ((*id_to)->buf, (*id_from)->buf, (*id_to)->len);
+        if (id_from && *id_from)
+            *id_to = odr_create_Odr_oct(m_p->odr_out, (*id_from)->buf,
+                                        (*id_from)->len);
+        else
+            *id_to = 0;
     }
-    else if (id_to)
-	*id_to = 0;
 }
 
-int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu)
+int Z_Assoc::send_Z_PDU(Z_APDU *apdu, int *plen)
+{
+    Z_GDU *gdu = (Z_GDU*) odr_malloc(odr_encode(), sizeof(*gdu));
+    gdu->which = Z_GDU_Z3950;
+    gdu->u.z3950 = apdu;
+    return send_GDU(gdu, plen);
+}
+
+int Z_Assoc::send_GDU(Z_GDU *apdu, int *plen)
 {
     char *buf;
     int len;
-    if (encode_Z_PDU(apdu, &buf, &len) > 0)
-	return m_PDU_Observable->send_PDU(buf, len);
+    if (encode_GDU(apdu, &buf, &len) > 0)
+    {
+        if (plen)
+            *plen = len;
+        return m_p->PDU_Observable->send_PDU(buf, len);
+    }
     return -1;
 }
 
-Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
+Z_GDU *Z_Assoc::decode_GDU(const char *buf, int len)
 {
-    Z_APDU *apdu;
+    Z_GDU *apdu;
 
-    odr_reset (m_odr_in);
-    odr_setbuf (m_odr_in, (char*) buf, len, 0);
+    odr_reset(m_p->odr_in);
+    odr_setbuf(m_p->odr_in, (char*) buf, len, 0);
 
-    if (!z_APDU(m_odr_in, &apdu, 0, 0))
+    if (!z_GDU(m_p->odr_in, &apdu, 0, 0))
     {
-        yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
-             odr_errmsg(odr_geterror(m_odr_in)),
-             odr_offset(m_odr_in));
-        yaz_log(LOG_LOG, "PDU dump:");
+        const char *element = odr_getelement(m_p->odr_in);
+        yaz_log(YLOG_LOG, "PDU decode failed '%s' near byte %ld. Element %s",
+                odr_errmsg(odr_geterror(m_p->odr_in)),
+                (long) odr_offset(m_p->odr_in),
+                element && *element ? element : "unknown");
+        yaz_log(YLOG_LOG, "Buffer length: %d", (int) len);
+        if (len > 0)
+        {
+            WRBUF w = wrbuf_alloc();
+            wrbuf_write_escaped(w, buf, len > 1024 ? 1024 : len);
+            yaz_log(YLOG_LOG, "Buffer bytes: %s", wrbuf_cstr(w));
+            wrbuf_destroy(w);
+        }
+        yaz_log(YLOG_LOG, "PDU dump:");
         odr_dumpBER(yaz_log_file(), buf, len);
         return 0;
     }
     else
     {
-	if (m_APDU_file)
+        if (m_p->APDU_yazlog)
+        {   // use YAZ log FILE
+            FILE *save = m_p->APDU_file;
+
+            odr_setprint(m_p->odr_print, yaz_log_file());
+            z_GDU(m_p->odr_print, &apdu, 0, "decode");
+            m_p->APDU_file = save;
+            odr_setprint(m_p->odr_print, save);
+        }
+        if (m_p->APDU_file)
         {
-	    z_APDU(m_odr_print, &apdu, 0, "decode");
-	    fflush(m_APDU_file);
-	}
+            z_GDU(m_p->odr_print, &apdu, 0, "decode");
+            fflush(m_p->APDU_file);
+        }
         return apdu;
     }
 }
 
-int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
+int Z_Assoc::encode_GDU(Z_GDU *apdu, char **buf, int *len)
 {
-    if (m_APDU_file)
+    const char *element = 0;
+    int r = z_GDU(m_p->odr_out, &apdu, 0, 0);
+
+    if (!r) // decoding failed. Get the failed element
+        element = odr_getelement(m_p->odr_out);
+
+    if (m_p->APDU_yazlog || !r)
     {
-	z_APDU(m_odr_print, &apdu, 0, "encode");
-	fflush(m_APDU_file);
+        if (!r)
+            yaz_log(YLOG_LOG, "PDU encode failed. Element %s",
+                    element ? element : "unknown");
+        FILE *save = m_p->APDU_file;
+        FILE *yazf = yaz_log_file();
+        odr_setprint(m_p->odr_print, yazf); // use YAZ log FILE
+        z_GDU(m_p->odr_print, &apdu, 0, "encode");
+        m_p->APDU_file = save;
+        odr_setprint(m_p->odr_print, save);
     }
-    if (!z_APDU(m_odr_out, &apdu, 0, 0))
+    if (m_p->APDU_file)
     {
-	if (m_APDU_file)
-	    fprintf (m_APDU_file, "PDU encode failed (above)");
-	yaz_log (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
-        return -1;
+        if (!r)
+            fprintf(m_p->APDU_file, "PDU encode failed. Element %s",
+                    element ? element : "unknown");
+        z_GDU(m_p->odr_print, &apdu, 0, "encode");
+        fflush(m_p->APDU_file);
     }
-    *buf = odr_getbuf (m_odr_out, len, 0);
-    odr_reset (m_odr_out);
+    if (!r)  // encoding failed
+        return -1;
+    *buf = odr_getbuf(m_p->odr_out, len, 0);
+    odr_reset(m_p->odr_out);
     return *len;
 }
 
-const char *Yaz_Z_Assoc::get_hostname()
+const char *Z_Assoc::get_hostname()
 {
-    return m_hostname;
+    return m_p->hostname;
 }
 
-void Yaz_Z_Assoc::client(const char *addr)
+int Z_Assoc::client(const char *addr)
 {
-    delete [] m_hostname;
-    m_hostname = new char[strlen(addr)+1];
-    strcpy (m_hostname, addr);
-    m_PDU_Observable->connect (this, addr);
+    delete [] m_p->hostname;
+    m_p->hostname = new char[strlen(addr)+1];
+    strcpy(m_p->hostname, addr);
+    return m_p->PDU_Observable->connect(this, addr);
 }
 
-void Yaz_Z_Assoc::close()
+void Z_Assoc::close()
 {
-    m_PDU_Observable->close ();
+    m_p->PDU_Observable->close_session();
 }
 
-void Yaz_Z_Assoc::server(const char *addr)
+int Z_Assoc::server(const char *addr)
 {
-    delete [] m_hostname;
-    m_hostname = new char[strlen(addr)+1];
-    strcpy (m_hostname, addr);
-    m_PDU_Observable->listen (this, addr);
+    delete [] m_p->hostname;
+    m_p->hostname = new char[strlen(addr)+1];
+    strcpy(m_p->hostname, addr);
+    return m_p->PDU_Observable->listen(this, addr);
 }
 
-ODR Yaz_Z_Assoc::odr_encode()
+ODR Z_Assoc::odr_encode()
 {
-    return m_odr_out;
+    return m_p->odr_out;
 }
 
-ODR Yaz_Z_Assoc::odr_decode()
+ODR Z_Assoc::odr_decode()
 {
-    return m_odr_in;
+    return m_p->odr_in;
 }
-ODR Yaz_Z_Assoc::odr_print()
+ODR Z_Assoc::odr_print()
 {
-    return m_odr_print;
+    return m_p->odr_print;
 }
 
-void Yaz_Z_Assoc::timeout(int timeout)
+void Z_Assoc::timeout(int timeout)
 {
-    m_PDU_Observable->idleTime(timeout);
+    m_p->PDU_Observable->idleTime(timeout);
 }
 
-void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
+void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
 {
     switch (apdu->which)
     {
     case Z_APDU_initRequest:
-	*oip = &apdu->u.initRequest->otherInfo;
-	break;
+        *oip = &apdu->u.initRequest->otherInfo;
+        break;
     case Z_APDU_searchRequest:
-	*oip = &apdu->u.searchRequest->otherInfo;
-	break;
+        *oip = &apdu->u.searchRequest->otherInfo;
+        break;
     case Z_APDU_presentRequest:
-	*oip = &apdu->u.presentRequest->otherInfo;
-	break;
+        *oip = &apdu->u.presentRequest->otherInfo;
+        break;
     case Z_APDU_sortRequest:
-	*oip = &apdu->u.sortRequest->otherInfo;
-	break;
+        *oip = &apdu->u.sortRequest->otherInfo;
+        break;
     case Z_APDU_scanRequest:
-	*oip = &apdu->u.scanRequest->otherInfo;
-	break;
+        *oip = &apdu->u.scanRequest->otherInfo;
+        break;
     case Z_APDU_extendedServicesRequest:
         *oip = &apdu->u.extendedServicesRequest->otherInfo;
         break;
@@ -295,20 +388,20 @@ void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
         *oip = &apdu->u.deleteResultSetRequest->otherInfo;
         break;
     case Z_APDU_initResponse:
-	*oip = &apdu->u.initResponse->otherInfo;
-	break;
+        *oip = &apdu->u.initResponse->otherInfo;
+        break;
     case Z_APDU_searchResponse:
-	*oip = &apdu->u.searchResponse->otherInfo;
-	break;
+        *oip = &apdu->u.searchResponse->otherInfo;
+        break;
     case Z_APDU_presentResponse:
-	*oip = &apdu->u.presentResponse->otherInfo;
-	break;
+        *oip = &apdu->u.presentResponse->otherInfo;
+        break;
     case Z_APDU_sortResponse:
-	*oip = &apdu->u.sortResponse->otherInfo;
-	break;
+        *oip = &apdu->u.sortResponse->otherInfo;
+        break;
     case Z_APDU_scanResponse:
-	*oip = &apdu->u.scanResponse->otherInfo;
-	break;
+        *oip = &apdu->u.scanResponse->otherInfo;
+        break;
     case Z_APDU_extendedServicesResponse:
         *oip = &apdu->u.extendedServicesResponse->otherInfo;
         break;
@@ -316,68 +409,62 @@ void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
         *oip = &apdu->u.deleteResultSetResponse->otherInfo;
         break;
     default:
-	*oip = 0;
-	break;
+        *oip = 0;
+        break;
     }
 }
 
-void Yaz_Z_Assoc::set_otherInformationString (
+void Z_Assoc::set_otherInformationString(
     Z_APDU *apdu,
-    int oidval, int categoryValue,
-    const char *str)
+    const Odr_oid *oid, int categoryValue, const char *str)
 {
     Z_OtherInformation **otherInformation;
     get_otherInfoAPDU(apdu, &otherInformation);
     if (!otherInformation)
-	return;
-    set_otherInformationString(otherInformation, oidval, categoryValue, str);
-}
-
-void Yaz_Z_Assoc::set_otherInformationString (
-    Z_OtherInformation **otherInformation,
-    int oidval, int categoryValue,
-    const char *str)
-{
-    int oid[OID_SIZE];
-    struct oident ent;
-    ent.proto = PROTO_Z3950;
-    ent.oclass = CLASS_USERINFO;
-    ent.value = (oid_value) oidval;
-    if (!oid_ent_to_oid (&ent, oid))
-	return ;
+        return;
     set_otherInformationString(otherInformation, oid, categoryValue, str);
 }
 
-void Yaz_Z_Assoc::set_otherInformationString (
+
+void Z_Assoc::set_otherInformationString (
     Z_OtherInformation **otherInformation,
-    int *oid, int categoryValue, const char *str)
+    const Odr_oid *oid, int categoryValue, const char *str)
 {
     Z_OtherInformationUnit *oi =
-	update_otherInformation(otherInformation, 1, oid, categoryValue, 0);
+        update_otherInformation(otherInformation, 1, oid, categoryValue, 0);
     if (!oi)
-	return;
-    oi->information.characterInfo = odr_strdup (odr_encode(), str);
+        return;
+    oi->information.characterInfo = odr_strdup(odr_encode(), str);
 }
 
-Z_OtherInformationUnit *Yaz_Z_Assoc::update_otherInformation (
+Z_OtherInformationUnit *Z_Assoc::update_otherInformation (
     Z_OtherInformation **otherInformationP, int createFlag,
-    int *oid, int categoryValue, int deleteFlag)
+    const Odr_oid *oid, int categoryValue, int deleteFlag)
 {
-    return yaz_oi_update (otherInformationP,
-			  (createFlag ? odr_encode() : 0),
-			  oid, categoryValue, deleteFlag);
+    return yaz_oi_update(otherInformationP,
+                         (createFlag ? odr_encode() : 0),
+                         oid, categoryValue, deleteFlag);
 }
 
-Z_ReferenceId* Yaz_Z_Assoc::getRefID(char* str)
+Z_ReferenceId* Z_Assoc::getRefID(char* str)
 {
     Z_ReferenceId* id = NULL;
 
     if (str)
-    {
-        id = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(*id));
-        id->size = id->len = strlen(str);
-        id->buf = (unsigned char *) str;
-    }
+        id = odr_create_Odr_oct(m_p->odr_out, 
+#if YAZ_VERSIONL < 0x50000
+                                (unsigned char *)
+#endif
+                                str, strlen(str));
     return id;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+