X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-cql2rpn.cpp;h=ce0e18a94a1ec5ec2bd1c24391b89feee4e36673;hb=562ea2b80ffd1bd24aa6b6250b5b9dd61f3e468d;hp=777c818f1d12378644f6bca9a30346b07e50a524;hpb=6d8928c9ef4a00aa732a2ee7bdc42c4646f8fc32;p=yazpp-moved-to-github.git diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp index 777c818..ce0e18a 100644 --- a/src/yaz-cql2rpn.cpp +++ b/src/yaz-cql2rpn.cpp @@ -1,10 +1,11 @@ -/* - * Copyright (c) 1998-2004, Index Data. +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2012 Index Data and Mike Taylor * See the file LICENSE for details. - * - * $Id: yaz-cql2rpn.cpp,v 1.13 2007-01-16 11:54:55 adam Exp $ */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -37,7 +38,7 @@ bool Yaz_cql2rpn::parse_spec_file(const char *fname, int *error) return m_transform ? true : false; } -int Yaz_cql2rpn::query_transform(const char *cql_query, +int Yaz_cql2rpn::query_transform(const char *cql_query, Z_RPNQuery **rpnquery, ODR o, char **addinfop) { @@ -54,7 +55,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query, else { char rpn_buf[10240]; - r = cql_transform_buf(m_transform, cql_parser_result(cp), + r = cql_transform_buf(m_transform, cql_parser_result(cp), rpn_buf, sizeof(rpn_buf)-1); if (!r) { @@ -65,7 +66,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query, { size_t off; const char *pqf_msg; - int code = yaz_pqf_error(pp, &pqf_msg, &off); + yaz_pqf_error(pp, &pqf_msg, &off); r = -1; } yaz_pqf_destroy(pp); @@ -74,7 +75,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query, { r = cql_transform_error(m_transform, &addinfo); } - } + } cql_parser_destroy(cp); if (addinfo) *addinfop = odr_strdup(o, addinfo); @@ -85,6 +86,7 @@ int Yaz_cql2rpn::query_transform(const char *cql_query, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab