X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=9f1709613f01d29ddf93445b38115de45a56a048;hb=4539a73116b14f53e3a0522ea45bd21c4d1a72f6;hp=cf4a0883078e0f81571751e34811e824804d2af8;hpb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index cf4a088..9f17096 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,4 +1,21 @@
-/* $Id: filter_virt_db.cpp,v 1.50 2007-01-25 14:05:54 adam Exp $
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+/* $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
@@ -140,8 +157,13 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases
         }
         std::list<std::string>::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)
@@ -154,10 +176,6 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases
         b->m_route = map_it->second.m_route;
         first_route = false;
     }
-    std::map<std::string,bool>::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;
 }
 
@@ -478,7 +496,8 @@ void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
         {
             // see which target it corresponds to.. (if any)
             std::map<std::string,VirtualDB::Map>::const_iterator map_it;
-            map_it = m_p->m_maps.find(*db_it);
+
+            map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
             if (map_it != m_p->m_maps.end())
             { 
                 VirtualDB::Map m = map_it->second;
@@ -768,7 +787,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)
     {