X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fxmlquery.h;h=154ae72446d0ffef8dc1218e42528c0e0d557fec;hp=35855a04a7061e44572db784d4d3706cb385483d;hb=4d95bcc1c92abde629616853b6a5d8e56444f5f3;hpb=964580242e2e0b2e570f652afa58bfb90ad0bb5e

diff --git a/include/yaz/xmlquery.h b/include/yaz/xmlquery.h
index 35855a0..154ae72 100644
--- a/include/yaz/xmlquery.h
+++ b/include/yaz/xmlquery.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2006, Index Data
+/* 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:
@@ -24,14 +24,6 @@
  * (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: xmlquery.h,v 1.6 2006-10-09 21:02:41 adam Exp $ */
-
-/*
- * Copyright (C) 1995-2006, Index Data ApS
- * See the file LICENSE for details.
- *
- * $Id: xmlquery.h,v 1.6 2006-10-09 21:02:41 adam Exp $
- */
 
 /** \file xmlquery.h
     \brief Query / XML conversions
@@ -40,28 +32,27 @@
 #ifndef YAZ_XMLQUERY_H
 #define YAZ_XMLQUERY_H
 
-#if YAZ_HAVE_XML2
 #include <yaz/yconfig.h>
 #include <yaz/proto.h>
-
-#include <libxml/parser.h>
+#include <yaz/xmltypes.h>
 
 YAZ_BEGIN_CDECL
 
+#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 void *xmlnodep, Z_Query **query, ODR odr,
-                              int *error_code, const char **addinfo);
-
+YAZ_EXPORT void yaz_xml2query(const xmlNode *xmlnodep, Z_Query **query,
+                              ODR odr, int *error_code, const char **addinfo);
+#endif
 YAZ_END_CDECL
 
 #endif
-#endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab