-/* $Id: test_filter_query_rewrite.cpp,v 1.1 2006-01-19 12:18:09 marc Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_filter_query_rewrite.cpp,v 1.12 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
using namespace boost::unit_test;
-class FilterBounceZ3950: public yp2::filter::Base {
+namespace mp = metaproxy_1;
+using namespace mp::util;
+
+class FilterBounceZ3950: public mp::filter::Base {
public:
- void process(yp2::Package & package) const {
+ 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 && gdu->u.z3950->which ==
- Z_APDU_initRequest)
+ if (gdu && gdu->which == Z_GDU_Z3950
+ && gdu->u.z3950->which == Z_APDU_initRequest)
{
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 && gdu->u.z3950->which ==
- Z_APDU_searchRequest)
+ else if (gdu && gdu->which == Z_GDU_Z3950
+ && gdu->u.z3950->which == Z_APDU_searchRequest)
{
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 && gdu->u.z3950->which ==
- Z_APDU_scanRequest)
+ else if (gdu && gdu->which == Z_GDU_Z3950
+ && gdu->u.z3950->which == Z_APDU_scanRequest)
{
std::cout << "Got Z3950 Scan PDU\n";
//Z_ScanRequest *req = gdu->u.z3950->u.scanRequest;
//package.request() = gdu;
+ return;
}
package.move();
};
};
-void check_query_rewrite_init(yp2::RouterChain &router)
+void check_query_rewrite_init(mp::RouterChain &router)
{
- std::cout << "QUERY REWRITE INIT\n";
+ //std::cout << "QUERY REWRITE INIT\n";
// Create package with Z39.50 init request in it
- yp2::Package pack;
+ mp::Package pack;
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
pack.request() = apdu;
Z_GDU *z_gdu = gdu->get();
- std::cout << "Z_GDU " << z_gdu << "\n";
+ //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_initRequest);
}
}
-void check_query_rewrite_search(yp2::RouterChain &router,
+
+void check_query_rewrite_search(mp::RouterChain &router,
std::string query_in,
- std::string query_out)
+ std::string query_expect)
{
- std::cout << "QUERY REWRITE SEARCH "
- << query_in << " " << query_out << "\n";
+ //std::cout << "QUERY REWRITE SEARCH "
+ // << query_in << " " << query_expect << "\n";
// Create package with Z39.50 search request in it
- yp2::Package pack;
+ mp::Package pack;
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
// create package PQF query here
- yp2::util::pqf(odr, apdu, query_in);
+ mp::util::pqf(odr, apdu, query_in);
-
- //apdu->u.searchRequest->num_databaseNames = 1;
- //apdu->u.searchRequest->databaseNames = (char**)
- //odr_malloc(odr, sizeof(char *));
- //apdu->u.searchRequest->databaseNames[0] = odr_strdup(odr, "Default");
-
+ // create package PDF database info (needed!)
+ apdu->u.searchRequest->num_databaseNames = 1;
+ apdu->u.searchRequest->databaseNames
+ = (char**)odr_malloc(odr, sizeof(char *));
+ apdu->u.searchRequest->databaseNames[0] = odr_strdup(odr, "Default");
+ // Done creating request package
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();
Z_GDU *z_gdu = gdu->get();
//std::cout << "Z_GDU " << z_gdu << "\n";
- //BOOST_CHECK(z_gdu);
+ 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
- BOOST_CHECK_EQUAL(query_in, query_out);
+
+ // take query out of package again and check rewrite
+ std::string query_changed
+ = zQueryToString(z_gdu->u.z3950->u.searchRequest->query);
+ BOOST_CHECK_EQUAL(query_expect, query_changed);
}
}
{
try
{
- yp2::filter::QueryRewrite f_query_rewrite;
+ mp::filter::QueryRewrite f_query_rewrite;
}
catch ( ... ) {
BOOST_CHECK (false);
{
try
{
- yp2::RouterChain router;
+ mp::RouterChain router;
- yp2::filter::QueryRewrite f_query_rewrite;
+ 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, "@attr 1=4 the", "@attr 1=4 the");
+ check_query_rewrite_search(router,
+ "@attrset Bib-1 @attr 1=4 the",
+ "@attrset Bib-1 @attr 1=4 the");
+
+ }
+ catch ( ... ) {
+ BOOST_CHECK (false);
+ }
+}
+
+
+BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite3 )
+{
+
+
+ try
+ {
+ mp::RouterChain router;
+
+
+ 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
+ xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(), xmlconf.size());
+ BOOST_CHECK(doc);
+ xmlNode *root_element = xmlDocGetRootElement(doc);
+
+ // creating and configuring filter
+ mp::filter::QueryRewrite f_query_rewrite;
+ f_query_rewrite.configure(root_element);
+
+ // 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",
+ "@attrset Bib-1 @attr 1=4 the");
}
+
+ catch (std::exception &e) {
+ std::cout << e.what() << "\n";
+ BOOST_CHECK (false);
+ }
+
catch ( ... ) {
BOOST_CHECK (false);
}
projects / metaproxy-moved-to-github.git / blobdiff