X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2B%2B%2Fz-assoc.h;h=1a6e673fed43f10ddaf3149ef915cd41e4230b70;hp=49b8a68de0d48a61b393426b10d6e45e07747687;hb=76d66b222afff97cf367a3e7b8bfe045a62d0d57;hpb=1cf760aa1600199b8a9acb4ccaded655f6903d62

diff --git a/include/yaz++/z-assoc.h b/include/yaz++/z-assoc.h
index 49b8a68..1a6e673 100644
--- a/include/yaz++/z-assoc.h
+++ b/include/yaz++/z-assoc.h
@@ -1,27 +1,29 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-assoc.h,v 1.5 2003-10-23 11:45:08 adam Exp $
+ * $Id: z-assoc.h,v 1.10 2005-06-25 15:53:19 adam Exp $
  */
 
 #ifndef YAZ_Z_ASSOC_INCLUDED
 #define YAZ_Z_ASSOC_INCLUDED
 
+#include <yaz/srw.h>
 #include <yaz/proto.h>
 #include <yaz/odr.h>
 #include <yaz++/pdu-observer.h>
 
+namespace yazpp_1 {
 /** Z39.50 Assocation.
     This object implements the client - and server role of a generic
     Z39.50 Association.
 */
-class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
+class YAZ_EXPORT Z_Assoc : public IPDU_Observer {
  public:
     /// Create object using the PDU Observer specified
-    Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable);
+    Z_Assoc(IPDU_Observable *the_PDU_Observable);
     /// Destroy assocation and close PDU Observer
-    virtual ~Yaz_Z_Assoc();
+    virtual ~Z_Assoc();
     /// Receive PDU
     void recv_PDU(const char *buf, int len);
     /// Connect notification
@@ -39,13 +41,14 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
     /// Close connection
     void close();
     /// Decode Z39.50 PDU.
-    Z_APDU *decode_Z_PDU(const char *buf, int len);
+    Z_GDU *decode_GDU(const char *buf, int len);
     /// Encode Z39.50 PDU.
-    int encode_Z_PDU(Z_APDU *apdu, char **buf, int *len);
+    int encode_GDU(Z_GDU *apdu, char **buf, int *len);
     /// Send Z39.50 PDU
     int send_Z_PDU(Z_APDU *apdu, int *len);
+    int send_GDU(Z_GDU *apdu, int *len);
     /// Receive Z39.50 PDU
-    virtual void recv_Z_PDU(Z_APDU *apdu, int len) = 0;
+    virtual void recv_GDU(Z_GDU *apdu, int len) = 0;
     /// Create Z39.50 PDU with reasonable defaults
     Z_APDU *create_Z_PDU(int type);
     /// Request Alloc
@@ -59,20 +62,20 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
     /// OtherInformation
     void get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip);
     Z_OtherInformationUnit *update_otherInformation (
-	Z_OtherInformation **otherInformationP, int createFlag,
-	int *oid, int categoryValue, int deleteFlag);
+        Z_OtherInformation **otherInformationP, int createFlag,
+        int *oid, int categoryValue, int deleteFlag);
     void set_otherInformationString (
-	Z_OtherInformation **otherInformationP,
-	int *oid, int categoryValue,
-	const char *str);
+        Z_OtherInformation **otherInformationP,
+        int *oid, int categoryValue,
+        const char *str);
     void set_otherInformationString (
-	Z_OtherInformation **otherInformation,
-	int oidval, int categoryValue,
-	const char *str);
+        Z_OtherInformation **otherInformation,
+        int oidval, int categoryValue,
+        const char *str);
     void set_otherInformationString (
-	Z_APDU *apdu,
-	int oidval, int categoryValue,
-	const char *str);
+        Z_APDU *apdu,
+        int oidval, int categoryValue,
+        const char *str);
 
     Z_ReferenceId *getRefID(char* str);
     Z_ReferenceId **get_referenceIdP(Z_APDU *apdu);
@@ -85,7 +88,7 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
  private:
     static int yaz_init_flag;
     static int yaz_init_func();
-    IYaz_PDU_Observable *m_PDU_Observable;
+    IPDU_Observable *m_PDU_Observable;
     ODR m_odr_in;
     ODR m_odr_out;
     ODR m_odr_print;
@@ -95,5 +98,14 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
     char *m_hostname;
     int m_APDU_yazlog;
 };
+};
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+