X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=95821e47ec842c505189a2ce264ebe9d496e2155;hb=3fb33dbcd9e57622aa094a83ad8283c8f306286a;hp=daf43f3f6df6144eb5b253462c1ea38b80deb1ab;hpb=9ac41f74e33f58fbbb507f0b3ae9ccdce306f525;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index daf43f3..95821e4 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,8 +1,20 @@
-/* $Id: filter_virt_db.cpp,v 1.47 2006-11-29 13:00:54 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2009 Index Data
 
-   See the LICENSE file for details
- */
+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
+*/
 
 #include "config.hpp"
 
@@ -98,6 +110,7 @@ namespace metaproxy_1 {
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
             std::map<mp::Session, FrontendPtr> m_clients;
+            bool pass_vhosts;
         };
     }
 }
@@ -133,15 +146,20 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases
         map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
         if (map_it == m_p->m_maps.end())  // database not found
         {
-            error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+            error_code = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
             addinfo = *db_it;
             BackendPtr ptr;
             return ptr;
         }
         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 +172,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;
 }
 
@@ -214,6 +228,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; 
@@ -458,6 +473,7 @@ yf::VirtualDB::Map::Map()
 
 yf::VirtualDB::VirtualDB() : m_p(new VirtualDB::Rep)
 {
+    m_p->pass_vhosts = false;
 }
 
 yf::VirtualDB::~VirtualDB() {
@@ -477,7 +493,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;
@@ -682,7 +699,12 @@ void yf::VirtualDB::process(mp::Package &package) const
         
         std::list<std::string> vhosts;
         mp::util::get_vhost_otherinfo(req->otherInfo, vhosts);
-        if (vhosts.size() == 0)
+
+        if (vhosts.size() > 0 && m_p->pass_vhosts)
+        {
+            package.move();
+        }
+        else
         {
             f->m_init_gdu = gdu;
             
@@ -717,8 +739,6 @@ void yf::VirtualDB::process(mp::Package &package) const
             package.response() = apdu;
             f->m_is_virtual = true;
         }
-        else
-            package.move();
     }
     else if (!f->m_is_virtual)
         package.move();
@@ -767,13 +787,17 @@ 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)
     {
         if (ptr->type != XML_ELEMENT_NODE)
             continue;
-        if (!strcmp((const char *) ptr->name, "virtual"))
+        if (!strcmp((const char *) ptr->name, "pass-vhosts"))
+        {
+            m_p->pass_vhosts = mp::xml::get_bool(ptr->children, false);
+        }
+        else if (!strcmp((const char *) ptr->name, "virtual"))
         {
             std::string database;
             std::list<std::string> targets;
@@ -824,8 +848,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
  */
+