Year 2007.

[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 5d4d749..cf4a088 100644 (file)
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,5 +1,5 @@
-/* $Id: filter_virt_db.cpp,v 1.46 2006-09-29 08:42:47 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_virt_db.cpp,v 1.50 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -133,7 +133,7 @@ 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;
@@ -214,6 +214,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; 
@@ -783,9 +784,9 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr)
                 if (v_node->type != XML_ELEMENT_NODE)
                     continue;
                 
-                if (mp::xml::is_element_yp2(v_node, "database"))
+                if (mp::xml::is_element_mp(v_node, "database"))
                     database = mp::xml::get_text(v_node);
-                else if (mp::xml::is_element_yp2(v_node, "target"))
+                else if (mp::xml::is_element_mp(v_node, "target"))
                     targets.push_back(mp::xml::get_text(v_node));
                 else
                     throw mp::filter::FilterException