/* This file is part of Metaproxy.
- Copyright (C) 2005-2009 Index Data
+ Copyright (C) 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
#include <stdexcept>
#include "filter_query_rewrite.hpp"
-#include "util.hpp"
-#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/util.hpp>
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/package.hpp>
#define BOOST_AUTO_TEST_MAIN
#define BOOST_TEST_DYN_LINK
class FilterBounceZ3950: public mp::filter::Base {
public:
void process(mp::Package & package) const {
-
+
if (package.session().is_closed())
{
std::cout << "Got Close.\n";
return;
}
-
+
Z_GDU *gdu = package.request().get();
-
- if (gdu && gdu->which == Z_GDU_Z3950
+
+ if (gdu && gdu->which == Z_GDU_Z3950
&& gdu->u.z3950->which == Z_APDU_initRequest)
{
- std::cout << "Got Z3950 Init PDU\n";
+ std::cout << "Got Z3950 Init PDU\n";
//Z_InitRequest *req = gdu->u.z3950->u.initRequest;
//package.request() = gdu;
return;
- }
- else if (gdu && gdu->which == Z_GDU_Z3950
+ }
+ else if (gdu && gdu->which == Z_GDU_Z3950
&& gdu->u.z3950->which == Z_APDU_searchRequest)
{
- std::cout << "Got Z3950 Search PDU\n";
+ std::cout << "Got Z3950 Search PDU\n";
//Z_SearchRequest *req = gdu->u.z3950->u.searchRequest;
//package.request() = gdu;
return;
- }
- else if (gdu && gdu->which == Z_GDU_Z3950
+ }
+ else if (gdu && gdu->which == Z_GDU_Z3950
&& gdu->u.z3950->which == Z_APDU_scanRequest)
{
- std::cout << "Got Z3950 Scan PDU\n";
+ std::cout << "Got Z3950 Scan PDU\n";
//Z_ScanRequest *req = gdu->u.z3950->u.scanRequest;
//package.request() = gdu;
return;
- }
-
+ }
+
package.move();
};
};
// Create package with Z39.50 init request in it
mp::Package pack;
-
+
mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
-
+
pack.request() = apdu;
// Done creating query.
// Put it in router
- pack.router(router).move();
-
+ pack.router(router).move();
+
// Inspect bounced back request
//yazpp_1::GDU *gdu = &pack.response();
yazpp_1::GDU *gdu = &pack.request();
-
+
Z_GDU *z_gdu = gdu->get();
//std::cout << "Z_GDU " << z_gdu << "\n";
}
}
-void check_query_rewrite_search(mp::RouterChain &router,
+void check_query_rewrite_search(mp::RouterChain &router,
std::string query_in,
std::string query_expect)
{
- //std::cout << "QUERY REWRITE SEARCH "
+ //std::cout << "QUERY REWRITE SEARCH "
// << query_in << " " << query_expect << "\n";
-
+
// Create package with Z39.50 search request in it
mp::Package pack;
-
+
mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
- // create package PQF query here
+ // create package PQF query here
mp::util::pqf(odr, apdu, query_in);
// create package PDF database info (needed!)
apdu->u.searchRequest->num_databaseNames = 1;
- apdu->u.searchRequest->databaseNames
+ apdu->u.searchRequest->databaseNames
= (char**)odr_malloc(odr, sizeof(char *));
apdu->u.searchRequest->databaseNames[0] = odr_strdup(odr, "Default");
- // Done creating request package
+ // Done creating request package
pack.request() = apdu;
-
+
// Put it in router
- pack.router(router).move();
-
+ pack.router(router).move();
+
// Inspect bounced back request
//yazpp_1::GDU *gdu = &pack.response();
yazpp_1::GDU *gdu = &pack.request();
-
+
Z_GDU *z_gdu = gdu->get();
//std::cout << "Z_GDU " << z_gdu << "\n";
-
+
BOOST_CHECK(z_gdu);
if (z_gdu) {
BOOST_CHECK_EQUAL(z_gdu->which, Z_GDU_Z3950);
BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_searchRequest);
// take query out of package again and check rewrite
- std::string query_changed
+ std::string query_changed
= zQueryToString(z_gdu->u.z3950->u.searchRequest->query);
BOOST_CHECK_EQUAL(query_expect, query_changed);
}
BOOST_AUTO_TEST_CASE( test_filter_query_rewrite_1 )
{
- try
+ try
{
mp::filter::QueryRewrite f_query_rewrite;
}
BOOST_AUTO_TEST_CASE( test_filter_query_rewrite2 )
{
- try
+ try
{
mp::RouterChain router;
-
+
mp::filter::QueryRewrite f_query_rewrite;
//FilterBounceZ3950 f_bounce_z3950;
-
+
router.append(f_query_rewrite);
//router.append(f_bounce_z3950);
check_query_rewrite_init(router);
- check_query_rewrite_search(router,
- "@attrset Bib-1 @attr 1=4 the",
+ check_query_rewrite_search(router,
+ "@attrset Bib-1 @attr 1=4 the",
"@attrset Bib-1 @attr 1=4 the");
}
BOOST_AUTO_TEST_CASE( test_filter_query_rewrite3 )
{
-
- try
+
+ try
{
mp::RouterChain router;
-
- std::string xmlconf =
+
+ std::string xmlconf =
"<?xml version='1.0'?>\n"
"<filter xmlns='http://indexdata.com/metaproxy'\n"
" id='qrw1' type='query_rewrite'>\n"
"</filter>\n"
;
-
+
//std::cout << xmlconf << std::endl;
// reading and parsing XML conf
// creating and configuring filter
mp::filter::QueryRewrite f_query_rewrite;
- f_query_rewrite.configure(root_element, true);
-
+ f_query_rewrite.configure(root_element, true, 0);
+
// remeber to free XML DOM
xmlFreeDoc(doc);
-
+
// add only filter to router
router.append(f_query_rewrite);
// start testing
check_query_rewrite_init(router);
- check_query_rewrite_search(router,
- "@attrset Bib-1 @attr 1=4 the",
+ check_query_rewrite_search(router,
+ "@attrset Bib-1 @attr 1=4 the",
"@attrset Bib-1 @attr 1=4 the");
}
projects / metaproxy-moved-to-github.git / blobdiff