X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Ffilter_virt_db.cpp;h=bd142a0a8dd17ffa77ca20eca4c1ab0d72797a77;hb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;hp=6b57b4f4f89d1b8bd42f2fe1ea8e407d48853f99;hpb=82e00bfd387d08b7bb886f2f96e3651bba2167f5;p=metaproxy-moved-to-github.git diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 6b57b4f..bd142a0 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_virt_db.cpp,v 1.52 2007-08-13 10:19:16 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.54 2008-02-20 15:07:52 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -18,7 +18,7 @@ along with Metaproxy; see the file LICENSE. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: filter_virt_db.cpp,v 1.52 2007-08-13 10:19:16 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.54 2008-02-20 15:07:52 adam Exp $ Copyright (c) 2005-2007, Index Data. See the LICENSE file for details @@ -160,8 +160,13 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases } std::list::const_iterator t_it = map_it->second.m_targets.begin(); - for (; t_it != map_it->second.m_targets.end(); t_it++) - targets_dedup[*t_it] = true; + for (; t_it != map_it->second.m_targets.end(); t_it++) { + if (!targets_dedup[*t_it]) + { + targets_dedup[*t_it] = true; + b->m_targets.push_back(*t_it); + } + } // see if we have a route conflict. if (!first_route && b->m_route != map_it->second.m_route) @@ -174,10 +179,6 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases b->m_route = map_it->second.m_route; first_route = false; } - std::map::const_iterator tm_it = targets_dedup.begin(); - for (; tm_it != targets_dedup.end(); tm_it++) - b->m_targets.push_back(tm_it->first); - return b; } @@ -789,7 +790,7 @@ void yf::VirtualDB::process(mp::Package &package) const } -void mp::filter::VirtualDB::configure(const xmlNode * ptr) +void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only) { for (ptr = ptr->children; ptr; ptr = ptr->next) {