X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyazpp%2Fz-assoc.h;h=9ce34db58fad4e7c338360e741cfdf1323d053b7;hb=de5a7aee52649279a11118f2b38c0f2763bf9cc6;hp=158ad9fd7534ed3725357bdd2d526bcd7f504bd3;hpb=d508100e993ab5c9a415bd1826b939875dcfe91c;p=yazpp-moved-to-github.git

diff --git a/include/yazpp/z-assoc.h b/include/yazpp/z-assoc.h
index 158ad9f..9ce34db 100644
--- 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.2 2007-04-12 15:00:33 adam Exp $
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2009 Index Data and Mike Taylor
+ * 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
@@ -63,20 +83,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,
-        const 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,
-        const int *oid, int categoryValue,
-        const char *str);
-    void set_otherInformationString (
-        Z_OtherInformation **otherInformation,
-        const char *oidname, int categoryValue,
+        const Odr_oid *oid, int categoryValue,
         const char *str);
-    void set_otherInformationString (
-        Z_APDU *apdu,
-        const char *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);
@@ -104,6 +118,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