Fixed bug #1341: MetaProxy returning different results. Problem was that

[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 b3975ef..6b57b4f 100644 (file)
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,5 +1,25 @@
-/* $Id: filter_virt_db.cpp,v 1.48 2007-01-25 11:28:40 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_virt_db.cpp,v 1.52 2007-08-13 10:19:16 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+This file is part of Metaproxy.
+
+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 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 $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -214,6 +234,7 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
         }
         if (!*res->result)
         {
+            error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
             mp::util::get_init_diagnostics(res, error_code, addinfo);
             BackendPtr null;
             return null; 
@@ -477,7 +498,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;