Bump year in copyright msg in source

[metaproxy-moved-to-github.git] / src / filter_virt_db.cpp

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index 250d395..bd013e1 100644 (file)
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,7 +1,5 @@
-/* $Id: filter_virt_db.cpp,v 1.51 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2009 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
@@ -14,15 +12,9 @@ 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 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.51 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-   See the LICENSE file for details
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 
@@ -160,8 +152,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)
@@ -174,10 +171,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;
 }
 
@@ -498,7 +491,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;
@@ -788,7 +782,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)
     {
@@ -845,8 +839,9 @@ extern "C" {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+