projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zoom: relay facets MP-490
[metaproxy-moved-to-github.git]
/
src
/
filter_cql_to_rpn.cpp
diff --git
a/src/filter_cql_to_rpn.cpp
b/src/filter_cql_to_rpn.cpp
index
38fb0e0
..
322eb46
100644
(file)
--- a/
src/filter_cql_to_rpn.cpp
+++ b/
src/filter_cql_to_rpn.cpp
@@
-30,7
+30,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/zgdu.h>
#include <yaz/diagbib1.h>
#include <yaz/srw.h>
#include <yaz/zgdu.h>
#include <yaz/diagbib1.h>
#include <yaz/srw.h>
-
+#include <yaz/tpath.h>
namespace mp = metaproxy_1;
namespace yf = metaproxy_1::filter;
namespace mp = metaproxy_1;
namespace yf = metaproxy_1::filter;
@@
-42,7
+42,7
@@
namespace metaproxy_1 {
Impl();
~Impl();
void process(metaproxy_1::Package & package);
Impl();
~Impl();
void process(metaproxy_1::Package & package);
- void configure(const xmlNode * ptr);
+ void configure(const xmlNode *ptr, const char *path);
private:
yazpp_1::Yaz_cql2rpn m_cql2rpn;
};
private:
yazpp_1::Yaz_cql2rpn m_cql2rpn;
};
@@
-63,7
+63,7
@@
yf::CQLtoRPN::~CQLtoRPN()
void yf::CQLtoRPN::configure(const xmlNode *xmlnode, bool test_only,
const char *path)
{
void yf::CQLtoRPN::configure(const xmlNode *xmlnode, bool test_only,
const char *path)
{
- m_p->configure(xmlnode);
+ m_p->configure(xmlnode, path);
}
void yf::CQLtoRPN::process(mp::Package &package) const
}
void yf::CQLtoRPN::process(mp::Package &package) const
@@
-82,7
+82,7
@@
yf::CQLtoRPN::Impl::~Impl()
{
}
{
}
-void yf::CQLtoRPN::Impl::configure(const xmlNode *xmlnode)
+void yf::CQLtoRPN::Impl::configure(const xmlNode *xmlnode, const char *path)
{
/*
{
/*
@@
-122,8
+122,14
@@
void yf::CQLtoRPN::Impl::configure(const xmlNode *xmlnode)
"for filter cql_rpn");
}
"for filter cql_rpn");
}
+
+ char fullpath[1024];
+ if (!yaz_filepath_resolve(fname.c_str(), path, 0, fullpath))
+ {
+ throw mp::filter::FilterException("Could not open " + fname);
+ }
int error = 0;
int error = 0;
- if (!m_cql2rpn.parse_spec_file(fname.c_str(), &error))
+ if (!m_cql2rpn.parse_spec_file(fullpath, &error))
{
throw mp::filter::FilterException("Bad or missing "
"CQL to RPN configuration "
{
throw mp::filter::FilterException("Bad or missing "
"CQL to RPN configuration "
@@
-188,7
+194,7
@@
static mp::filter::Base* filter_creator()
}
extern "C" {
}
extern "C" {
- struct metaproxy_1_filter_struct metaproxy_1_filter_cql_to_rpn = {
+ struct metaproxy_1_filter_struct metaproxy_1_filter_cql_rpn = {
0,
"cql_rpn",
filter_creator
0,
"cql_rpn",
filter_creator