One line log: log HTTP as well

[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 46d037d..b84e087 100644 (file)
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 #include <yaz/match_glob.h>
-#include <yaz/query-charset.h>
 #include <yaz/log.h>
 
 #include <map>
@@ -59,15 +58,12 @@ namespace metaproxy_1 {
             std::string m_dbpattern;
             std::list<std::string> m_targets;
             std::string m_route;
-        public:
-            std::string query_encoding;
         };
         struct VirtualDB::Backend {
             mp::Session m_backend_session;
             std::list<std::string> m_frontend_databases;
             std::list<std::string> m_targets;
             std::string m_route;
-            std::string query_encoding;
             bool m_named_result_sets;
             int m_number_of_sets;
         };
@@ -187,14 +183,6 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases
             return ptr;
         }
         b->m_route = map_it->m_route;
-        if (!first_route && b->query_encoding != map_it->query_encoding)
-        {
-            // we have a conflict. query encoding must be same for all
-            error_code =  YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
-            BackendPtr ptr;
-            return ptr;
-        }
-        b->query_encoding = map_it->query_encoding;
         first_route = false;
     }
     return b;
@@ -245,7 +233,7 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
 
     Z_GDU *gdu = init_package.response().get();
     // we hope to get an init response
-    error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+    error_code = 0;
     if (gdu && gdu->which == Z_GDU_Z3950
         && gdu->u.z3950->which == Z_APDU_initResponse)
     {
@@ -261,6 +249,13 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
         }
         mp::util::get_init_diagnostics(res, error_code, addinfo);
     }
+    if (error_code == 0)
+    {
+        std::list<std::string>::const_iterator db_it = databases.begin();
+        error_code = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED;
+        if (db_it != databases.end())
+            addinfo = *db_it;
+    }
     if (!init_package.session().is_closed())
     {
         Package close_package(b->m_backend_session, package.origin());
@@ -274,7 +269,8 @@ yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
 
 void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
 {
-    Z_SearchRequest *req = apdu_req->u.searchRequest;
+    yazpp_1::GDU ngdu(apdu_req);
+    Z_SearchRequest *req = ngdu.get()->u.z3950->u.searchRequest;
     std::string vhost;
     std::string resultSetId = req->resultSetName;
     mp::odr odr;
@@ -361,24 +357,10 @@ void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
                                                 &req->databaseNames);
     }
 
-    if (b->query_encoding.length() && 
-        (req->query->which == Z_Query_type_1 ||
-         req->query->which == Z_Query_type_101))
-    {
-        yaz_iconv_t cd = yaz_iconv_open(b->query_encoding.c_str(), "UTF-8");
-        if (cd)
-        {
-            int r = yaz_query_charset_convert_rpnquery_check(
-                req->query->u.type_1, odr, cd);
-            yaz_iconv_close(cd);
-            if (r)
-                yaz_log(YLOG_LOG, "query could not be converted");
-        }
-    }
     *req->replaceIndicator = 1;
 
-    search_package.request() = yazpp_1::GDU(apdu_req);
-    
+    search_package.request() = ngdu;
+
     search_package.move(b->m_route);
 
     if (search_package.session().is_closed())
@@ -597,7 +579,8 @@ void yf::VirtualDB::Frontend::fixup_package(mp::Package &p, BackendPtr b)
 
 void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
 {
-    Z_PresentRequest *req = apdu_req->u.presentRequest;
+    yazpp_1::GDU ngdu(apdu_req);
+    Z_PresentRequest *req = ngdu.get()->u.z3950->u.presentRequest;
     std::string resultSetId = req->resultSetId;
     mp::odr odr;
 
@@ -621,7 +604,7 @@ void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
 
     req->resultSetId = odr_strdup(odr, sets_it->second.m_setname.c_str());
     
-    present_package.request() = yazpp_1::GDU(apdu_req);
+    present_package.request() = ngdu;
 
     present_package.move(sets_it->second.m_backend->m_route);
 
@@ -663,7 +646,8 @@ int yf::VirtualDB::Frontend::relay_apdu(mp::Package &package, Z_APDU *apdu_req)
 
 void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
 {
-    Z_ScanRequest *req = apdu_req->u.scanRequest;
+    yazpp_1::GDU ngdu(apdu_req);
+    Z_ScanRequest *req = ngdu.get()->u.z3950->u.scanRequest;
     std::string vhost;
     mp::odr odr;
 
@@ -714,17 +698,7 @@ void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
                                                 &req->databaseNames);
     }
 
-    if (b->query_encoding.length())
-    {
-        yaz_iconv_t cd = yaz_iconv_open(b->query_encoding.c_str(), "UTF-8");
-        if (cd)
-        {
-            yaz_query_charset_convert_apt(req->termListAndStartPoint, odr, cd);
-            yaz_iconv_close(cd);
-        }
-    }
-
-    scan_package.request() = yazpp_1::GDU(apdu_req);
+    scan_package.request() = ngdu;
     
     scan_package.move(b->m_route);
 
@@ -880,7 +854,6 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
         }
         else if (!strcmp((const char *) ptr->name, "virtual"))
         {
-            std::string query_encoding;
             std::string database;
             std::list<std::string> targets;
             xmlNode *v_node = ptr->children;
@@ -893,8 +866,6 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
                     database = mp::xml::get_text(v_node);
                 else if (mp::xml::is_element_mp(v_node, "target"))
                     targets.push_back(mp::xml::get_text(v_node));
-                else if (mp::xml::is_element_mp(v_node, "query-encoding"))
-                    targets.push_back(mp::xml::get_text(v_node));
                 else
                     throw mp::filter::FilterException
                         ("Bad element " 
@@ -906,7 +877,6 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only,
 
             VirtualDB::Map vmap(mp::util::database_name_normalize(database),
                                 targets, route);
-            vmap.query_encoding = query_encoding;
             m_p->m_maps.push_back(vmap);
         }
         else