X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-cql2rpn.cpp;h=dfbcd4be6c1fd22ceb428a0b6c47c0aae8a83d8d;hb=805b4fdf7b70b0e9b298064f24ceff0c1d38e05b;hp=2093e2a020856b480f9b89c170ce49ba44c32314;hpb=9fef1c618f2f936041b3b58d61e406182033ab30;p=yazpp-moved-to-github.git diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp index 2093e2a..dfbcd4b 100644 --- a/src/yaz-cql2rpn.cpp +++ b/src/yaz-cql2rpn.cpp @@ -1,8 +1,11 @@ /* This file is part of the yazpp toolkit. - * Copyright (C) 1998-2009 Index Data and Mike Taylor + * Copyright (C) 1998-2013 Index Data and Mike Taylor * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -35,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) { @@ -52,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) { @@ -72,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); @@ -83,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