X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Flogrpn.h;h=8ec26ea4710b10689cd69f5ef8fcb7603bc3bb89;hp=7b1ea55ee339a05ea30f07f5e9862d0e05d694b5;hb=a3e65bcd3250b107397675bc65b35b5939355025;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505

diff --git a/include/yaz/logrpn.h b/include/yaz/logrpn.h
index 7b1ea55..8ec26ea 100644
--- a/include/yaz/logrpn.h
+++ b/include/yaz/logrpn.h
@@ -1,8 +1,28 @@
-/*
- * 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: logrpn.h,v 1.8 2005-06-25 15:46:03 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.
  */
 
 /**
@@ -10,29 +30,24 @@
  * \brief Header for Z39.50 Query Printing
  */
 
-#ifndef LOG_RPN_H
-#define LOG_RPN_H
+#ifndef YAZ_LOGRPN_H
+#define YAZ_LOGRPN_H
 
 #include <yaz/yconfig.h>
 #include <yaz/proto.h>
-#include <yaz/wrbuf.h>
 
 YAZ_BEGIN_CDECL
 
-YAZ_EXPORT void log_rpn_query (Z_RPNQuery *rpn);
-YAZ_EXPORT void log_rpn_query_level (int loglevel, Z_RPNQuery *rpn);
-
-YAZ_EXPORT void log_scan_term (Z_AttributesPlusTerm *zapt, oid_value ast);
-YAZ_EXPORT void log_scan_term_level (int loglevel, 
-        Z_AttributesPlusTerm *zapt, oid_value ast);
-
-YAZ_EXPORT void yaz_log_zquery (Z_Query *q);
-YAZ_EXPORT void yaz_log_zquery_level (int loglevel, Z_Query *q);
+YAZ_EXPORT char *yaz_prox_unit_name(Z_ProximityOperator *op);
+YAZ_EXPORT void log_rpn_query(Z_RPNQuery *rpn);
+YAZ_EXPORT void log_rpn_query_level(int loglevel, Z_RPNQuery *rpn);
 
-YAZ_EXPORT void wrbuf_put_zquery(WRBUF b, Z_Query *q);
-YAZ_EXPORT void wrbuf_scan_term (WRBUF b,
-        Z_AttributesPlusTerm *zapt, oid_value ast);
-YAZ_EXPORT void wrbuf_diags(WRBUF b, int num_diagnostics,Z_DiagRec **diags);
+YAZ_EXPORT void log_scan_term(Z_AttributesPlusTerm *zapt, const Odr_oid *ast);
+YAZ_EXPORT void log_scan_term_level(int loglevel, 
+                                    Z_AttributesPlusTerm *zapt,
+                                    const Odr_oid *ast);
+YAZ_EXPORT void yaz_log_zquery(Z_Query *q);
+YAZ_EXPORT void yaz_log_zquery_level(int loglevel, Z_Query *q);
 
 YAZ_END_CDECL
 
@@ -40,6 +55,7 @@ YAZ_END_CDECL
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab