-/* $Id: filter_multi.cpp,v 1.16 2006-05-15 11:40:26 adam Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_multi.cpp,v 1.25 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
friend class Multi;
friend struct Frontend;
+ Rep();
FrontendPtr get_frontend(Package &package);
void release_frontend(Package &package);
private:
- std::map<std::string, Multi::Map>m_maps;
std::map<std::string,std::string> m_target_route;
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
std::map<mp::Session, FrontendPtr> m_clients;
+ bool m_hide_unavailable;
};
}
}
+yf::Multi::Rep::Rep()
+{
+ m_hide_unavailable = false;
+}
+
bool yf::Multi::BackendSet::operator < (const BackendSet &k) const
{
return m_count < k.m_count;
{
}
-yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(Package &package)
+yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
return f;
}
-void yf::Multi::Rep::release_frontend(Package &package)
+void yf::Multi::Rep::release_frontend(mp::Package &package)
{
boost::mutex::scoped_lock lock(m_mutex);
std::map<mp::Session,yf::Multi::FrontendPtr>::iterator it;
}
-void yf::Multi::add_map_host2hosts(std::string host,
- std::list<std::string> hosts,
- std::string route)
-{
- m_p->m_maps[host] = Multi::Map(hosts, route);
-}
-
void yf::Multi::Backend::operator() (void)
{
m_package->move(m_route);
}
-void yf::Multi::Frontend::close(Package &package)
+void yf::Multi::Frontend::close(mp::Package &package)
{
std::list<BackendPtr>::const_iterator bit;
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
}
}
-void yf::Multi::Frontend::init(Package &package, Z_GDU *gdu)
+void yf::Multi::Frontend::init(mp::Package &package, Z_GDU *gdu)
{
Z_InitRequest *req = gdu->u.z3950->u.initRequest;
std::list<std::string> targets;
- mp::util::get_vhost_otherinfo(&req->otherInfo, false, targets);
+ mp::util::get_vhost_otherinfo(req->otherInfo, targets);
if (targets.size() < 1)
{
m_is_multi = true;
// create init request
- std::list<BackendPtr>::const_iterator bit;
+ std::list<BackendPtr>::iterator bit;
for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
{
mp::odr odr;
ODR_MASK_SET(f_resp->protocolVersion, Z_ProtocolVersion_2);
ODR_MASK_SET(f_resp->protocolVersion, Z_ProtocolVersion_3);
- for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++)
+ int no_failed = 0;
+ int no_succeeded = 0;
+ for (bit = m_backend_list.begin(); bit != m_backend_list.end(); )
{
PackagePtr p = (*bit)->m_package;
- if (p->session().is_closed()) // if any backend closes, close frontend
- package.session().close();
+ if (p->session().is_closed())
+ {
+ // failed. Remove from list and increment number of failed
+ no_failed++;
+ bit = m_backend_list.erase(bit);
+ continue;
+ }
+ no_succeeded++;
+
Z_GDU *gdu = p->response().get();
if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
Z_APDU_initResponse)
package.response() = p->response();
return;
}
+ bit++;
+ }
+ if (m_p->m_hide_unavailable)
+ {
+ if (no_succeeded == 0)
+ package.session().close();
+ }
+ else
+ {
+ if (no_failed)
+ package.session().close();
}
package.response() = f_apdu;
}
-void yf::Multi::Frontend::search(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
{
// create search request
Z_SearchRequest *req = apdu_req->u.searchRequest;
package.response() = f_apdu; // in this scope because of p
}
-void yf::Multi::Frontend::present(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
{
// create present request
Z_PresentRequest *req = apdu_req->u.presentRequest;
odr_malloc(odr, sizeof(Z_NamePlusRecord *) * nprl->num_records);
int i = 0;
std::list<Multi::FrontendSet::PresentJob>::const_iterator jit;
- for (jit = jobs.begin(); jit != jobs.end(); jit++)
+ for (jit = jobs.begin(); jit != jobs.end(); jit++, i++)
{
PackagePtr p = jit->m_backend->m_package;
Z_APDU *b_apdu = gdu->u.z3950;
Z_PresentResponse *b_resp = b_apdu->u.presentResponse;
- nprl->records[i++] =
- b_resp->records->u.databaseOrSurDiagnostics->
- records[jit->m_inside_pos];
+ nprl->records[i] = (Z_NamePlusRecord*)
+ odr_malloc(odr, sizeof(Z_NamePlusRecord));
+ *nprl->records[i] = *b_resp->records->
+ u.databaseOrSurDiagnostics->records[jit->m_inside_pos];
+ nprl->records[i]->databaseName =
+ odr_strdup(odr, jit->m_backend->m_vhost.c_str());
}
*f_resp->nextResultSetPosition = start + i;
*f_resp->numberOfRecordsReturned = i;
package.response() = f_apdu;
}
-void yf::Multi::Frontend::scan1(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::scan1(mp::Package &package, Z_APDU *apdu_req)
{
if (m_backend_list.size() > 1)
{
return e;
}
-void yf::Multi::Frontend::scan2(Package &package, Z_APDU *apdu_req)
+void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req)
{
Z_ScanRequest *req = apdu_req->u.scanRequest;
}
-void yf::Multi::process(Package &package) const
+void yf::Multi::process(mp::Package &package) const
{
FrontendPtr f = m_p->get_frontend(package);
std::cout << "route=" << route << " target=" << target << "\n";
m_p->m_target_route[target] = route;
}
- else if (!strcmp((const char *) ptr->name, "virtual"))
+ else if (!strcmp((const char *) ptr->name, "hideunavailable"))
{
- std::list<std::string> targets;
- std::string vhost;
- xmlNode *v_node = ptr->children;
- for (; v_node; v_node = v_node->next)
- {
- if (v_node->type != XML_ELEMENT_NODE)
- continue;
-
- if (mp::xml::is_element_yp2(v_node, "vhost"))
- vhost = mp::xml::get_text(v_node);
- else if (mp::xml::is_element_yp2(v_node, "target"))
- targets.push_back(mp::xml::get_text(v_node));
- else
- throw mp::filter::FilterException
- ("Bad element "
- + std::string((const char *) v_node->name)
- + " in virtual section"
- );
- }
- std::string route = mp::xml::get_route(ptr);
- add_map_host2hosts(vhost, targets, route);
- std::list<std::string>::const_iterator it;
- for (it = targets.begin(); it != targets.end(); it++)
- {
- std::cout << "Add " << vhost << "->" << *it
- << "," << route << "\n";
- }
+ m_p->m_hide_unavailable = true;
}
else
{
projects / metaproxy-moved-to-github.git / blobdiff