From 9c4d6a0006e8c99412865e3f3b924345ae782a77 Mon Sep 17 00:00:00 2001 From: Marc Cromme Date: Tue, 16 Jan 2007 08:49:05 +0000 Subject: [PATCH] throwing out 9 unused header files and many lines of out-commented unused code --- src/filter_cql_to_rpn.cpp | 134 ++------------------------------------------- 1 file changed, 4 insertions(+), 130 deletions(-) diff --git a/src/filter_cql_to_rpn.cpp b/src/filter_cql_to_rpn.cpp index 1089403..9b3e20b 100644 --- a/src/filter_cql_to_rpn.cpp +++ b/src/filter_cql_to_rpn.cpp @@ -1,24 +1,18 @@ -/* $Id: filter_cql_to_rpn.cpp,v 1.3 2007-01-15 15:07:59 marc Exp $ +/* $Id: filter_cql_to_rpn.cpp,v 1.4 2007-01-16 08:49:05 marc Exp $ Copyright (c) 2005-2006, Index Data. See the LICENSE file for details */ #include "config.hpp" +#include "util.hpp" #include "filter.hpp" #include "package.hpp" -#include -#include -#include -#include -#include -#include - -#include "util.hpp" #include "filter_cql_to_rpn.hpp" + #include #include #include @@ -27,9 +21,7 @@ #include #include #include -#include -#include -#include + namespace mp = metaproxy_1; namespace yf = metaproxy_1::filter; @@ -37,7 +29,6 @@ namespace yf = metaproxy_1::filter; namespace metaproxy_1 { namespace filter { class CQLtoRPN::Impl { - //friend class CQLtoRPN; public: Impl(); ~Impl(); @@ -182,123 +173,6 @@ void yf::CQLtoRPN::Impl::process(mp::Package &package) } -// yf::CQLtoRPN::Rep::Rep() -// { - -// } - -// yf::CQLtoRPN::CQLtoRPN() : m_p(new CQLtoRPN::Rep) -// { -// } - -// yf::CQLtoRPN::~CQLtoRPN() -// { - -// } - -// void yf::CQLtoRPN::process(mp::Package &package) const -// { -// Z_GDU *gdu = package.request().get(); - -// if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which == -// Z_APDU_searchRequest) -// { -// Z_APDU *apdu_req = gdu->u.z3950; -// Z_SearchRequest *sr = gdu->u.z3950->u.searchRequest; -// if (sr->query && sr->query->which == Z_Query_type_104 && -// sr->query->u.type_104->which == Z_External_CQL) -// { -// char *addinfo = 0; -// Z_RPNQuery *rpnquery = 0; -// mp::odr odr; - -// int r = m_p->cql2rpn.query_transform(sr->query->u.type_104->u.cql, -// &rpnquery, odr, -// &addinfo); -// if (r == -3) -// { -// yaz_log(YLOG_LOG, "No CQL to RPN table"); -// Z_APDU *f_apdu = -// odr.create_searchResponse( -// apdu_req, -// YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, -// "Missing CQL to RPN spec"); -// package.response() = f_apdu; -// return; -// } -// else if (r) -// { -// int error_code = yaz_diag_srw_to_bib1(r); - -// yaz_log(YLOG_LOG, "CQL Conversion error %d", r); -// Z_APDU *f_apdu = -// odr.create_searchResponse(apdu_req, error_code, addinfo); -// package.response() = f_apdu; -// return; -// } -// else -// { // conversion OK - -// sr->query->which = Z_Query_type_1; -// sr->query->u.type_1 = rpnquery; -// package.request() = gdu; -// } -// } -// } -// package.move(); -// } - -// void yf::CQLtoRPN::configure(const xmlNode *ptr) -// { - -// /* -// -// -// -// */ - -// std::string fname; -// for (ptr = ptr->children; ptr; ptr = ptr->next) -// { -// if (ptr->type != XML_ELEMENT_NODE) -// continue; -// if (!strcmp((const char *) ptr->name, "conversion")) -// { -// const struct _xmlAttr *attr; -// for (attr = ptr->properties; attr; attr = attr->next) -// { -// if (!strcmp((const char *) attr->name, "file")) -// fname = mp::xml::get_text(attr); -// else -// throw mp::filter::FilterException( -// "Bad attribute " + std::string((const char *) -// attr->name)); -// } -// } -// else -// { -// throw mp::filter::FilterException("Bad element " -// + std::string((const char *) -// ptr->name)); -// } -// } -// if (fname.length() == 0) -// { -// throw mp::filter::FilterException("Missing conversion spec for " -// "filter cql_rpn"); -// } - -// int error = 0; -// if (!m_p->cql2rpn.parse_spec_file(fname.c_str(), &error)) -// { -// throw mp::filter::FilterException("Bad or missing CQL to RPN spec " -// + fname); -// } -// } - - - - static mp::filter::Base* filter_creator() { return new mp::filter::CQLtoRPN; -- 1.7.10.4