X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fex_filter_frontend_net.cpp;h=58d4a53214e6323d97acca1bd9509d61fa2ee4cb;hb=ced440c14eaf1e9408f994ef1e7be2deb8a7db0b;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..58d4a53 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,3 +1,8 @@
+/* $Id: ex_filter_frontend_net.cpp,v 1.8 2005-10-16 16:05:44 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
 
 #include <cstdlib>
 #include <iostream>
@@ -9,50 +14,36 @@ namespace po = boost::program_options;
 #include "config.hpp"
 
 #include "filter_frontend_net.hpp"
+#include "filter_z3950_client.hpp"
+#include "filter_log.hpp"
 
 #include "router.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
-class FilterInit: public yp2::Filter {
+class HTTPFilter: public yp2::filter::Base {
 public:
     void process(yp2::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;
-            } 
+            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;
             odr_destroy(odr);
         }
         return package.move();
@@ -94,8 +85,8 @@ int main(int argc, char **argv)
 
 	    yp2::RouterChain router;
 
-            // put in frontend first
-            yp2::FilterFrontendNet filter_front;
+            // put frontend filter in router
+            yp2::filter::FrontendNet filter_front;
             filter_front.ports() = ports;
 
             // 0=no time, >0 timeout in seconds
@@ -104,10 +95,18 @@ int main(int argc, char **argv)
             }
 	    router.rule(filter_front);
 
-            // put in a backend
-            FilterInit filter_init;
+            // put log filter in router
+            yp2::filter::Log filter_log;
+            router.rule(filter_log);
+
+            // put HTTP backend filter in router
+            HTTPFilter filter_init;
 	    router.rule(filter_init);
 
+            // put Z39.50 backend filter in router
+            yp2::filter::Z3950Client z3950_client;
+	    router.rule(z3950_client);
+
             yp2::Session session;
             yp2::Origin origin;
 	    yp2::Package pack(session, origin);
@@ -126,6 +125,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
  */