Remove 'and Mike Taylor' clause from copyright

[yazpp-moved-to-github.git] / include / yazpp / z-assoc.h

diff --git a/include/yazpp/z-assoc.h b/include/yazpp/z-assoc.h
index 0796491..a13f379 100644 (file)
--- a/include/yazpp/z-assoc.h
+++ b/include/yazpp/z-assoc.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (c) 1998-2005, Index Data.
- * See the file LICENSE for details.
- * 
- * $Id: z-assoc.h,v 1.1 2006-03-29 13:14:15 adam Exp $
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data 
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef YAZ_Z_ASSOC_INCLUDED
@@ -14,13 +34,15 @@
 #include <yazpp/pdu-observer.h>
 
 namespace yazpp_1 {
+    class Z_Assoc_priv;
+
 /** Z39.50 Assocation.
     This object implements the client - and server role of a generic
     Z39.50 Association.
 */
 class YAZ_EXPORT Z_Assoc : public IPDU_Observer {
- public:
-    /// Create object using the PDU Observer specified
+  public:
+        /// Create object using the PDU Observer specified
     Z_Assoc(IPDU_Observable *the_PDU_Observable);
     /// Destroy assocation and close PDU Observer
     virtual ~Z_Assoc();
@@ -63,20 +85,14 @@ class YAZ_EXPORT Z_Assoc : public IPDU_Observer {
     void get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip);
     Z_OtherInformationUnit *update_otherInformation (
         Z_OtherInformation **otherInformationP, int createFlag,
-        int *oid, int categoryValue, int deleteFlag);
+        const Odr_oid *oid, int categoryValue, int deleteFlag);
+    void set_otherInformationString(
+        Z_APDU *apdu,
+        const Odr_oid *oid, int categoryValue, const char *str);
     void set_otherInformationString (
         Z_OtherInformation **otherInformationP,
-        int *oid, int categoryValue,
-        const char *str);
-    void set_otherInformationString (
-        Z_OtherInformation **otherInformation,
-        int oidval, int categoryValue,
+        const Odr_oid *oid, int categoryValue,
         const char *str);
-    void set_otherInformationString (
-        Z_APDU *apdu,
-        int oidval, int categoryValue,
-        const char *str);
-
     Z_ReferenceId *getRefID(char* str);
     Z_ReferenceId **get_referenceIdP(Z_APDU *apdu);
     void transfer_referenceId(Z_APDU *from, Z_APDU *to);
@@ -84,19 +100,8 @@ class YAZ_EXPORT Z_Assoc : public IPDU_Observer {
     const char *get_hostname();
 
     int set_APDU_yazlog(int v);
-
- private:
-    static int yaz_init_flag;
-    static int yaz_init_func();
-    IPDU_Observable *m_PDU_Observable;
-    ODR m_odr_in;
-    ODR m_odr_out;
-    ODR m_odr_print;
-    int m_log;
-    FILE *m_APDU_file;
-    char *m_APDU_fname;
-    char *m_hostname;
-    int m_APDU_yazlog;
+  private:
+    Z_Assoc_priv *m_p;
 };
 };
 
@@ -104,6 +109,7 @@ class YAZ_EXPORT Z_Assoc : public IPDU_Observer {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab