X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fmarcdisp.h;h=97fad09dc0a1336c4b6ce287c4002e4a151a3a0a;hp=b86f95e966d9dd40a4ac84accda87139f6bed7d2;hb=8f8560e0ab3b370263683d8aea81b839c5927091;hpb=e8ac1e56929fe175624fb63e619c184b58ef63b9

diff --git a/include/yaz/marcdisp.h b/include/yaz/marcdisp.h
index b86f95e..97fad09 100644
--- a/include/yaz/marcdisp.h
+++ b/include/yaz/marcdisp.h
@@ -1,30 +1,30 @@
 /*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (c) 1995-2006, 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:
  *
- * 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:
+ *     * 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.
  *
- * 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 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.
- *
- * $Id: marcdisp.h,v 1.18 2006-08-28 14:18:20 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.
  */
+/* $Id: marcdisp.h,v 1.21 2006-12-13 11:25:17 adam Exp $ */
 
 /**
  * \file marcdisp.h
@@ -38,6 +38,8 @@
 #include <stdio.h>
 #include <yaz/wrbuf.h>
 
+#include <yaz/xmltypes.h>
+
 YAZ_BEGIN_CDECL
 
 /** \brief a yaz_marc_t handle (private content) */
@@ -64,6 +66,8 @@ YAZ_EXPORT void yaz_marc_xml(yaz_marc_t mt, int xmlmode);
 #define YAZ_MARC_ISO2709   4
 /** \brief Output format: MarcXchange */
 #define YAZ_MARC_XCHANGE   5
+/** \brief Output format: check only (no marc output) */
+#define YAZ_MARC_CHECK  6
 
 /** \brief supply iconv handle for character set conversion .. */
 YAZ_EXPORT void yaz_marc_iconv(yaz_marc_t mt, yaz_iconv_t cd);
@@ -145,11 +149,11 @@ YAZ_EXPORT int yaz_marc_read_iso2709(yaz_marc_t mt,
 
 /** \brief parses MARCXML/MarcXchange record from xmlNode pointer 
     \param mt handle
-    \param xmlnode is a pointer to root xmlNode pointer 
+    \param ptr is a pointer to root xml node 
 
     Returns 0=OK, -1=ERROR
 */
-YAZ_EXPORT int yaz_marc_read_xml(yaz_marc_t mt, const void *xmlnode);
+YAZ_EXPORT int yaz_marc_read_xml(yaz_marc_t mt, const xmlNode *ptr);
 
 /** \brief writes record in line format
     \param mt handle
@@ -165,7 +169,6 @@ YAZ_EXPORT int yaz_marc_write_line(yaz_marc_t mt, WRBUF wrbuf);
 
     Sets leader[9]='a' . Returns 0=OK, -1=ERROR . 
 */
-
 YAZ_EXPORT int yaz_marc_write_marcxml(yaz_marc_t mt, WRBUF wrbuf);
 
 /** \brief writes record in MarcXchange XML