X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=038178d2279536882a8c8584d97e1dacd4d7b344;hb=89be62ddbcc2d526ee46d3276124344a090ba20f;hp=df2e2145cd0c6bbd85713c1d51ade7b02fff4987;hpb=7467b072bb64f5c8575daa9917cce7df62d832f1;p=metaproxy-moved-to-github.git

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index df2e214..038178d 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,9 +1,11 @@
-/* $Id: ex_filter_frontend_net.cpp,v 1.15 2005-10-29 22:23:36 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: ex_filter_frontend_net.cpp,v 1.26 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
 
+#include "config.hpp"
+
 #include <cstdlib>
 #include <iostream>
 #include <stdexcept>
@@ -11,20 +13,23 @@
 #include <boost/program_options.hpp>
 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_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
-class HTTPFilter: public yp2::filter::Base {
+namespace mp = metaproxy_1;
+
+class HTTPFilter: public mp::filter::Base {
 public:
-    void process(yp2::Package & package) const {
+    void process(mp::Package & package) const {
         if (package.session().is_closed())
         {
             // std::cout << "Got Close.\n";
@@ -33,7 +38,7 @@ public:
         Z_GDU *gdu = package.request().get();
         if (gdu && gdu->which == Z_GDU_HTTP_Request)
         {
-            ODR odr = odr_createmem(ODR_ENCODE);
+            mp::odr odr;
             Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
             Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
             
@@ -45,13 +50,9 @@ public:
             http_res->content_len = strlen(http_res->content_buf);
             
             package.response() = gdu;
-            odr_destroy(odr);
         }
         return package.move();
     };
-    const std::string type() const {
-        return "HTTPFilter";
-    };
 };
 
 int main(int argc, char **argv)
@@ -87,10 +88,10 @@ int main(int argc, char **argv)
             for (size_t i = 0; i<ports.size(); i++)
                 std::cout << "port " << i << " " << ports[i] << "\n";
 
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
 
             // put frontend filter in router
-            yp2::filter::FrontendNet filter_front;
+            mp::filter::FrontendNet filter_front;
             filter_front.ports() = ports;
 
             // 0=no time, >0 timeout in seconds
@@ -100,17 +101,22 @@ int main(int argc, char **argv)
 	    router.append(filter_front);
 
             // put log filter in router
-            yp2::filter::Log filter_log_front("FRONT");
+            mp::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("Default", "indexdata.dk/gils");
-            filter_virt_db.add_map_db2vhost("Local", "localhost:9100/Default");
-
+            mp::filter::Virt_db filter_virt_db;
+            filter_virt_db.add_map_db2target("gils", "indexdata.dk/gils",
+                                            "");
+            filter_virt_db.add_map_db2target("Default", "localhost:9999/Default",
+                                            "");
+            filter_virt_db.add_map_db2target("2", "localhost:9999/Slow", "");
 	    router.append(filter_virt_db);
 
-            yp2::filter::Log filter_log_back("BACK");
+            mp::filter::SessionShared filter_session_shared;
+            //router.append(filter_session_shared);
+
+            mp::filter::Log filter_log_back("BACK");
             router.append(filter_log_back);
 
             // put HTTP backend filter in router
@@ -118,12 +124,12 @@ int main(int argc, char **argv)
 	    router.append(filter_init);
 
             // put Z39.50 backend filter in router
-            yp2::filter::Z3950Client z3950_client;
+            mp::filter::Z3950Client z3950_client;
 	    router.append(z3950_client);
 
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack(session, origin);
+            mp::Session session;
+            mp::Origin origin;
+	    mp::Package pack(session, origin);
 	    
 	    pack.router(router).move(); 
         }