X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fotherinfo.h;h=3c936ee3361b5eeb1b1b96a3412c815fac02be9c;hp=d7d6d26f742ed44105de32f711799e1306e8d037;hb=a856c901f082e75a18f21734b47e89fa5534c8f7;hpb=d9ee01635f03f9095a66f71b73580560d48798e8

diff --git a/include/yaz/otherinfo.h b/include/yaz/otherinfo.h
index d7d6d26..3c936ee 100644
--- a/include/yaz/otherinfo.h
+++ b/include/yaz/otherinfo.h
@@ -1,39 +1,80 @@
-/*
- * Copyright (c) 1999, Index Data
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 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.
  *
- * $Id: otherinfo.h,v 1.1 1999-11-30 13:47:11 adam Exp $
+ * 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.
+ */
+
+/**
+ * \file otherinfo.h
+ * \brief Header for Z39.50 OtherInfo utilities
  */
 #ifndef OTHERINFO_H
 #define OTHERINFO_H
 
 #include <yaz/proto.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
-YAZ_EXPORT void yaz_oi_APDU(Z_APDU *apdu, Z_OtherInformation ***oip);
-YAZ_EXPORT    Z_OtherInformationUnit *yaz_oi_update (
+YAZ_EXPORT
+void yaz_oi_APDU(Z_APDU *apdu, Z_OtherInformation ***oip);
+
+YAZ_EXPORT
+Z_OtherInformationUnit *yaz_oi_update (
     Z_OtherInformation **otherInformationP, ODR odr,
-    int *oid, int categoryValue, int delete_flag);
-YAZ_EXPORT void yaz_oi_set_string_oid (
+    const Odr_oid *oid, int categoryValue, int delete_flag);
+
+YAZ_EXPORT
+void yaz_oi_set_facetlist_oid (
     Z_OtherInformation **otherInformation, ODR odr,
-    int *oid, int categoryValue,
-    const char *str);
-YAZ_EXPORT void yaz_oi_set_string_oidval (
+    const Odr_oid *oid, int categoryValue,
+    Z_FacetList *facet_list);
+
+YAZ_EXPORT
+Z_FacetList *yaz_oi_get_facetlist_oid (
     Z_OtherInformation **otherInformation, ODR odr,
-    int oidval, int categoryValue,
+    const Odr_oid *oid, int categoryValue, int delete_flag);
+
+YAZ_EXPORT
+void yaz_oi_set_string_oid (
+    Z_OtherInformation **otherInformation, ODR odr,
+    const Odr_oid *oid, int categoryValue,
     const char *str);
-YAZ_EXPORT char *yaz_oi_get_string_oid (
-    Z_OtherInformation **otherInformation,
-    int *oid, int categoryValue, int delete_flag);
-YAZ_EXPORT char *yaz_oi_get_string_oidval(
+
+YAZ_EXPORT
+char *yaz_oi_get_string_oid (
     Z_OtherInformation **otherInformation,
-    int oidval, int categoryValue, int delete_flag);
-#ifdef __cplusplus
-}
-#endif
+    const Odr_oid *oid, int categoryValue, int delete_flag);
+
+YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+