X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=a124e6a10ce5e7183a5093244496d4545fa95a55;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=58d4a53214e6323d97acca1bd9509d61fa2ee4cb;hpb=ced440c14eaf1e9408f994ef1e7be2deb8a7db0b;p=metaproxy-moved-to-github.git

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index 58d4a53..a124e6a 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,4 +1,4 @@
-/* $Id: ex_filter_frontend_net.cpp,v 1.8 2005-10-16 16:05:44 adam Exp $
+/* $Id: ex_filter_frontend_net.cpp,v 1.18 2005-11-14 23:35:22 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -13,11 +13,14 @@ namespace po = boost::program_options;
 
 #include "config.hpp"
 
+#include "util.hpp"
 #include "filter_frontend_net.hpp"
 #include "filter_z3950_client.hpp"
+#include "filter_virt_db.hpp"
+#include "filter_session_shared.hpp"
 #include "filter_log.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
@@ -32,7 +35,7 @@ public:
         Z_GDU *gdu = package.request().get();
         if (gdu && gdu->which == Z_GDU_HTTP_Request)
         {
-            ODR odr = odr_createmem(ODR_ENCODE);
+            yp2::odr odr;
             Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
             Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
             
@@ -44,7 +47,6 @@ public:
             http_res->content_len = strlen(http_res->content_buf);
             
             package.response() = gdu;
-            odr_destroy(odr);
         }
         return package.move();
     };
@@ -93,19 +95,31 @@ int main(int argc, char **argv)
             if (vm.count("duration")) {
                 filter_front.listen_duration() = vm["duration"].as<int>();
             }
-	    router.rule(filter_front);
+	    router.append(filter_front);
 
             // put log filter in router
-            yp2::filter::Log filter_log;
-            router.rule(filter_log);
+            yp2::filter::Log filter_log_front("FRONT");
+            router.append(filter_log_front);
+
+            // put Virt db filter in router
+            yp2::filter::Virt_db filter_virt_db;
+            filter_virt_db.add_map_db2vhost("gils", "indexdata.dk/gils");
+            filter_virt_db.add_map_db2vhost("Default", "localhost:9100/Default");
+//	    router.append(filter_virt_db);
+
+            yp2::filter::Session_shared filter_session_shared;
+	    router.append(filter_session_shared);
+
+            yp2::filter::Log filter_log_back("BACK");
+            router.append(filter_log_back);
 
             // put HTTP backend filter in router
             HTTPFilter filter_init;
-	    router.rule(filter_init);
+	    router.append(filter_init);
 
             // put Z39.50 backend filter in router
             yp2::filter::Z3950Client z3950_client;
-	    router.rule(z3950_client);
+	    router.append(z3950_client);
 
             yp2::Session session;
             yp2::Origin origin;