X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fcharneg.h;h=4c73e3fea820899da4dc098d67d9bb3c44b58454;hp=24d2154efe64973b7c1b3fe60829733de31bc266;hb=4b92c6833026a51cc391840d1157cd5fefede1df;hpb=05c274ef315384faafcc5900c17468f0ea2474e6

diff --git a/include/yaz/charneg.h b/include/yaz/charneg.h
index 24d2154..4c73e3f 100644
--- a/include/yaz/charneg.h
+++ b/include/yaz/charneg.h
@@ -1,31 +1,31 @@
-/*
- * Copyright (c) 2002-2004, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The name of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 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:
  *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
+ *     * 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: charneg.h,v 1.4 2004-10-15 00:18:59 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 charneg.h
  * \brief Header for Z39.50 Charset negotiation utilities
  *
@@ -45,40 +45,69 @@ YAZ_BEGIN_CDECL
  * client and server parts. At that moment the (*) is based on
  * Z_PrivateCharacterSet_externallySpecified method.
  *
- */  
+ */
 
 /*
  * Get (*) record from request
  */
-YAZ_EXPORT Z_CharSetandLanguageNegotiation *
-	yaz_get_charneg_record(Z_OtherInformation *p);
+YAZ_EXPORT
+Z_CharSetandLanguageNegotiation *yaz_get_charneg_record(Z_OtherInformation *p);
+
+/*
+ * Delete (*) record from request
+ */
+YAZ_EXPORT
+int yaz_del_charneg_record(Z_OtherInformation **p);
 
 /*
- * Client's part. 
+ * Client's part.
  */
-YAZ_EXPORT Z_External *yaz_set_proposal_charneg(ODR odr,
-	const char **charsets, int num_charsets, const char **langs,
-		int num_langs, int selected);
+YAZ_EXPORT
+Z_External *yaz_set_proposal_charneg(ODR odr,
+                                     const char **charsets, int num_charsets,
+                                     const char **langs,
+                                     int num_langs, int selected);
 
-YAZ_EXPORT void yaz_get_response_charneg(NMEM mem,
-	Z_CharSetandLanguageNegotiation *p, char **charset, char **lang,
-		int *selected);
+YAZ_EXPORT
+Z_External *yaz_set_proposal_charneg_list(ODR o,
+                                          const char *delim,
+                                          const char *charset_list,
+                                          const char *lang_list,
+                                          int selected);
+
+YAZ_EXPORT
+void yaz_get_response_charneg(NMEM mem,
+                              Z_CharSetandLanguageNegotiation *p,
+                              char **charset, char **lang,
+                              int *selected);
 
 /*
  * Server's part
  */
- 
-YAZ_EXPORT Z_External *yaz_set_response_charneg(ODR odr,
-	const char *charset, const char *lang, int selected);
+
+YAZ_EXPORT
+Z_External *yaz_set_response_charneg(ODR odr,
+                                     const char *charset, const char *lang,
+                                     int selected);
 
 
-YAZ_EXPORT void yaz_get_proposal_charneg(NMEM mem,
-	Z_CharSetandLanguageNegotiation *p,
-                                         char ***charsets, int *num_charsets,
-                                         char ***langs, int *num_langs,
-                                         int *selected);
+YAZ_EXPORT
+void yaz_get_proposal_charneg(NMEM mem,
+                              Z_CharSetandLanguageNegotiation *p,
+                              char ***charsets, int *num_charsets,
+                              char ***langs, int *num_langs,
+                              int *selected);
 
 
 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
+ */
+