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
Reformat
[metaproxy-moved-to-github.git]
/
src
/
filter_record_transform.cpp
diff --git
a/src/filter_record_transform.cpp
b/src/filter_record_transform.cpp
index
cf7af72
..
e3b1dd7
100644
(file)
--- a/
src/filter_record_transform.cpp
+++ b/
src/filter_record_transform.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2010 Index Data
+ Copyright (C) 2005-2012 Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-17,19
+17,15
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.hpp"
*/
#include "config.hpp"
-#include "filter.hpp"
#include "filter_record_transform.hpp"
#include "filter_record_transform.hpp"
-#include "package.hpp"
-#include "util.hpp"
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
#include "gduutil.hpp"
#include "gduutil.hpp"
-#include "xmlutil.hpp"
#include <yaz/diagbib1.h>
#include <yaz/zgdu.h>
#include <yaz/retrieval.h>
#include <yaz/diagbib1.h>
#include <yaz/zgdu.h>
#include <yaz/retrieval.h>
-//#include <boost/thread/mutex.hpp>
-
#include <iostream>
namespace mp = metaproxy_1;
#include <iostream>
namespace mp = metaproxy_1;
@@
-43,7
+39,7
@@
namespace metaproxy_1 {
Impl();
~Impl();
void process(metaproxy_1::Package & package) const;
Impl();
~Impl();
void process(metaproxy_1::Package & package) const;
- void configure(const xmlNode * xml_node);
+ void configure(const xmlNode * xml_node, const char *path);
private:
yaz_retrieval_t m_retrieval;
};
private:
yaz_retrieval_t m_retrieval;
};
@@
-60,9
+56,10
@@
yf::RecordTransform::~RecordTransform()
{ // must have a destructor because of boost::scoped_ptr
}
{ // must have a destructor because of boost::scoped_ptr
}
-void yf::RecordTransform::configure(const xmlNode *xmlnode, bool test_only)
+void yf::RecordTransform::configure(const xmlNode *xmlnode, bool test_only,
+ const char *path)
{
{
- m_p->configure(xmlnode);
+ m_p->configure(xmlnode, path);
}
void yf::RecordTransform::process(mp::Package &package) const
}
void yf::RecordTransform::process(mp::Package &package) const
@@
-87,11
+84,10
@@
yf::RecordTransform::Impl::~Impl()
yaz_retrieval_destroy(m_retrieval);
}
yaz_retrieval_destroy(m_retrieval);
}
-void yf::RecordTransform::Impl::configure(const xmlNode *xml_node)
+void yf::RecordTransform::Impl::configure(const xmlNode *xml_node,
+ const char *path)
{
{
- //const char *srcdir = getenv("srcdir");
- //if (srcdir)
- // yaz_retrieval_set_path(m_retrieval, srcdir);
+ yaz_retrieval_set_path(m_retrieval, path);
if (!xml_node)
throw mp::XMLError("RecordTransform filter config: empty XML DOM");
if (!xml_node)
throw mp::XMLError("RecordTransform filter config: empty XML DOM");
@@
-109,7
+105,8
@@
void yf::RecordTransform::Impl::configure(const xmlNode *xml_node)
}
// read configuration
}
// read configuration
- if ( 0 != yaz_retrieval_configure(m_retrieval, retrieval_node)){
+ if (0 != yaz_retrieval_configure(m_retrieval, retrieval_node))
+ {
std::string msg("RecordTransform filter config: ");
msg += yaz_retrieval_get_error(m_retrieval);
throw mp::XMLError(msg);
std::string msg("RecordTransform filter config: ");
msg += yaz_retrieval_get_error(m_retrieval);
throw mp::XMLError(msg);
@@
-144,11
+141,13
@@
void yf::RecordTransform::Impl::process(mp::Package &package) const
const char *input_schema = 0;
Odr_oid *input_syntax = 0;
const char *input_schema = 0;
Odr_oid *input_syntax = 0;
- if(pr_req->recordComposition){
+ if (pr_req->recordComposition)
+ {
input_schema
= mp_util::record_composition_to_esn(pr_req->recordComposition);
}
input_schema
= mp_util::record_composition_to_esn(pr_req->recordComposition);
}
- if(pr_req->preferredRecordSyntax){
+ if (pr_req->preferredRecordSyntax)
+ {
input_syntax = pr_req->preferredRecordSyntax;
}
input_syntax = pr_req->preferredRecordSyntax;
}
@@
-237,7
+236,6
@@
void yf::RecordTransform::Impl::process(mp::Package &package) const
|| !gdu_res->u.z3950->u.presentResponse)
{
|| !gdu_res->u.z3950->u.presentResponse)
{
- std::cout << "record-transform: error back present\n";
package.session().close();
return;
}
package.session().close();
return;
}