X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=04bea5b361e14374e1ad4c3236727542fc8794f3;hb=10bef8a44467b3fbd7e023cd995a9607941dddec;hp=3764293bf131344c120e70e7ab143bb65133718b;hpb=7411ed6df7fc0b535f83503f73d70e80f390e295;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 3764293..04bea5b 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,16 +1,15 @@
-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2008 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-z-assoc.cpp,v 1.38 2005-06-25 15:53:19 adam Exp $
  */
 
 #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>
 
 using namespace yazpp_1;
 
@@ -94,7 +93,7 @@ void Z_Assoc::recv_PDU(const char *buf, int len)
     }
     else
     {
-        close();
+        m_PDU_Observable->shutdown();
         failNotify();
     }
 }
@@ -213,9 +212,9 @@ Z_GDU *Z_Assoc::decode_GDU(const char *buf, int len)
     if (!z_GDU(m_odr_in, &apdu, 0, 0))
     {
         const char *element = odr_getelement(m_odr_in);
-        yaz_log(YLOG_LOG, "PDU decode failed '%s' near byte %d. Element %s",
+        yaz_log(YLOG_LOG, "PDU decode failed '%s' near byte %ld. Element %s",
                 odr_errmsg(odr_geterror(m_odr_in)),
-                odr_offset(m_odr_in),
+                (long) odr_offset(m_odr_in),
                 element ? element : "unknown");
         yaz_log(YLOG_LOG, "PDU dump:");
         odr_dumpBER(yaz_log_file(), buf, len);
@@ -291,7 +290,7 @@ int Z_Assoc::client(const char *addr)
 
 void Z_Assoc::close()
 {
-    m_PDU_Observable->close ();
+    m_PDU_Observable->close_session();
 }
 
 int Z_Assoc::server(const char *addr)
@@ -373,36 +372,21 @@ void Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
     }
 }
 
-void 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 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 ;
     set_otherInformationString(otherInformation, oid, categoryValue, str);
 }
 
+
 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);
@@ -413,7 +397,7 @@ void Z_Assoc::set_otherInformationString (
 
 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),