projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update configure to generate config.h
[yazpp-moved-to-github.git]
/
src
/
yaz-cql2rpn.cpp
diff --git
a/src/yaz-cql2rpn.cpp
b/src/yaz-cql2rpn.cpp
index
8a9ce18
..
3a4b357
100644
(file)
--- 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-2011 Index Data and Mike Taylor
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: yaz-cql2rpn.cpp,v 1.11 2007-01-12 10:09:25 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/log.h>
#include <yaz/pquery.h>
#include <yazpp/cql2rpn.h>
#include <yaz/log.h>
#include <yaz/pquery.h>
#include <yazpp/cql2rpn.h>
@@
-49,7
+50,6
@@
int Yaz_cql2rpn::query_transform(const char *cql_query,
int r = cql_parser_string(cp, cql_query);
if (r)
{
int r = cql_parser_string(cp, cql_query);
if (r)
{
- yaz_log(YLOG_LOG, "CQL Parse Error");
r = 10;
}
else
r = 10;
}
else
@@
-66,9
+66,7
@@
int Yaz_cql2rpn::query_transform(const char *cql_query,
{
size_t off;
const char *pqf_msg;
{
size_t off;
const char *pqf_msg;
- int code = yaz_pqf_error(pp, &pqf_msg, &off);
- yaz_log(YLOG_WARN, "PQF Parser Error %s (code %d)",
- pqf_msg, code);
+ yaz_pqf_error(pp, &pqf_msg, &off);
r = -1;
}
yaz_pqf_destroy(pp);
r = -1;
}
yaz_pqf_destroy(pp);
@@
-76,8
+74,6
@@
int Yaz_cql2rpn::query_transform(const char *cql_query,
else
{
r = cql_transform_error(m_transform, &addinfo);
else
{
r = cql_transform_error(m_transform, &addinfo);
- yaz_log(YLOG_LOG, "CQL Transform Error %d %s", r,
- addinfo ? addinfo : "");
}
}
cql_parser_destroy(cp);
}
}
cql_parser_destroy(cp);
@@
-90,6
+86,7
@@
int Yaz_cql2rpn::query_transform(const char *cql_query,
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab