X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=e402e68f5efd96cbd9aa4e9405fd2e6d110a745a;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=23c5aa19d48f22bb7e7a159b5d268aa91e2026e3;hpb=941d13b6a4dc2c2dd0e4bda89d380bfd8991b03b;p=metaproxy-moved-to-github.git

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index 23c5aa1..e402e68 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,3 +1,25 @@
+/* $Id: ex_filter_frontend_net.cpp,v 1.30 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
+
+#include "config.hpp"
 
 #include <cstdlib>
 #include <iostream>
@@ -6,54 +28,43 @@
 #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.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
-class FilterInit: public yp2::Filter {
-public:
-    void process(yp2::Package & package) const {
+namespace mp = metaproxy_1;
 
+class HTTPFilter: public mp::filter::Base {
+public:
+    void process(mp::Package & package) const {
         if (package.session().is_closed())
         {
             // std::cout << "Got Close.\n";
         }
-       
+        
         Z_GDU *gdu = package.request().get();
-        if (gdu)
+        if (gdu && gdu->which == Z_GDU_HTTP_Request)
         {
-            ODR odr = odr_createmem(ODR_ENCODE);
-            switch(gdu->which)
-            {
-            case Z_GDU_Z3950:
-                // std::cout << "Got PDU. Sending init response\n";
-                Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-                
-                apdu->u.initResponse->implementationName = "YP2/YAZ";
-                
-                package.response() = apdu;
-                break;
-            case Z_GDU_HTTP_Request:
-                Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
-                Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
-        
-                z_HTTP_header_add(odr, &http_res->headers,
-                                  "Content-Type", "text/plain");
-           
-                http_res->content_buf = 
-                    odr_strdup(odr, "Welcome to YP2");
-                http_res->content_len = strlen(http_res->content_buf);
-
-                package.response() = gdu;
-                break;
-            default:
-                break;
-            } 
-            odr_destroy(odr);
+            mp::odr odr;
+            Z_GDU *gdu = z_get_HTTP_Response(odr, 200);
+            Z_HTTP_Response *http_res = gdu->u.HTTP_Response;
+            
+            z_HTTP_header_add(odr, &http_res->headers,
+                              "Content-Type", "text/plain");
+            
+            http_res->content_buf = 
+                odr_strdup(odr, "Welcome to YP2");
+            http_res->content_len = strlen(http_res->content_buf);
+            
+            package.response() = gdu;
         }
         return package.move();
     };
@@ -92,25 +103,48 @@ 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 in frontend first
-            yp2::FilterFrontendNet filter_front;
+            // put frontend filter in router
+            mp::filter::FrontendNet filter_front;
             filter_front.ports() = ports;
 
             // 0=no time, >0 timeout in seconds
             if (vm.count("duration")) {
                 filter_front.listen_duration() = vm["duration"].as<int>();
             }
-	    router.rule(filter_front);
-
-            // put in a backend
-            FilterInit filter_init;
-	    router.rule(filter_init);
-
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack(session, origin);
+	    router.append(filter_front);
+
+            // put log filter in router
+            mp::filter::Log filter_log_front("FRONT");
+            router.append(filter_log_front);
+
+            // put Virt db filter in router
+            mp::filter::VirtualDB 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);
+
+            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
+            HTTPFilter filter_init;
+	    router.append(filter_init);
+
+            // put Z39.50 backend filter in router
+            mp::filter::Z3950Client z3950_client;
+	    router.append(z3950_client);
+
+            mp::Session session;
+            mp::Origin origin;
+	    mp::Package pack(session, origin);
 	    
 	    pack.router(router).move(); 
         }
@@ -126,6 +160,7 @@ int main(int argc, char **argv)
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */