X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fxmlquery.h;h=154ae72446d0ffef8dc1218e42528c0e0d557fec;hp=ff5d5fb7b562a1d314e1c675beea86b9e0179e35;hb=c78f61142413410e88ed2a83627516bb4fa24b33;hpb=3086f0e19e38428814c7da92fcaf21eba2bc9a64

diff --git a/include/yaz/xmlquery.h b/include/yaz/xmlquery.h
index ff5d5fb..154ae72 100644
--- a/include/yaz/xmlquery.h
+++ b/include/yaz/xmlquery.h
@@ -1,27 +1,58 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 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: xmlquery.h,v 1.2 2006-01-30 14:02:06 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 xmlquery.h
+    \brief Query / XML conversions
+*/
+
 #ifndef YAZ_XMLQUERY_H
 #define YAZ_XMLQUERY_H
 
 #include <yaz/yconfig.h>
 #include <yaz/proto.h>
+#include <yaz/xmltypes.h>
 
 YAZ_BEGIN_CDECL
 
-YAZ_EXPORT void yaz_query2xml(const Z_Query *q, void *docp_void);
-YAZ_EXPORT void yaz_rpnquery2xml(const Z_RPNQuery *rpn, void *docp_void);
+#if YAZ_HAVE_XML2
+YAZ_EXPORT void yaz_query2xml(const Z_Query *q, xmlDocPtr *docp);
+YAZ_EXPORT void yaz_rpnquery2xml(const Z_RPNQuery *rpn, xmlDocPtr *docp);
 
+YAZ_EXPORT void yaz_xml2query(const xmlNode *xmlnodep, Z_Query **query,
+                              ODR odr, int *error_code, const char **addinfo);
+#endif
 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