X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpackage.cpp;h=2684d0c9c944ecc0ee9845f1678d9445839262ce;hb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;hp=0802e29994fff998cb186117aa34e0aaaa95ffb6;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index 0802e29..2684d0c 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,131 +1,116 @@
-/* $Id: package.cpp,v 1.4 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: package.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
 
 #include "package.hpp"
 
-yp2::Package::Package() 
-    :  
-#if ROUTE_POS
-    m_route_pos(0),
-#else
-    m_filter(0), m_router(0),
-#endif
-    m_data(0)
+namespace mp = metaproxy_1;
+
+mp::Package::Package() 
+    : m_route_pos(0), m_data(0)
 {
 }
 
-yp2::Package::~Package()
+mp::Package::~Package()
 {
-#if ROUTE_POS
     delete m_route_pos;
-#endif
 }
 
-yp2::Package::Package(yp2::Session &session, yp2::Origin &origin) 
+mp::Package::Package(mp::Session &session, mp::Origin &origin) 
     : m_session(session), m_origin(origin),
-#if ROUTE_POS
-      m_route_pos(0),
-#else
-      m_filter(0), m_router(0),
-#endif
-      m_data(0)
+      m_route_pos(0), m_data(0)
 {
 }
 
-yp2::Package & yp2::Package::copy_filter(const Package &p)
+mp::Package & mp::Package::copy_filter(const Package &p)
 {
-#if ROUTE_POS
     m_route_pos = p.m_route_pos->clone();
-#else
-    m_router = p.m_router;
-    m_filter = p.m_filter;
-#endif
     return *this;
 }
 
 
-void yp2::Package::move()
+void mp::Package::move()
+{
+    if (m_route_pos)
+    {
+        const filter::Base *next_filter = m_route_pos->move(0);
+        if (next_filter)
+            next_filter->process(*this);
+    }
+}
+
+void mp::Package::move(std::string route)
 {
-#if ROUTE_POS
     if (m_route_pos)
     {
-        const filter::Base *next_filter = m_route_pos->move();
+        const char *r_cstr = route.length() ? route.c_str() : 0;
+        const filter::Base *next_filter = m_route_pos->move(r_cstr);
         if (next_filter)
             next_filter->process(*this);
     }
-#else
-    m_filter = m_router->move(m_filter, this);
-    if (m_filter)
-        m_filter->process(*this);
-#endif
 }
 
-yp2::Session & yp2::Package::session()
+
+mp::Session & mp::Package::session()
 {
     return m_session;
 }
 
 
-int yp2::Package::data() const
+int mp::Package::data() const
 {
     return m_data;
 }
 
-int & yp2::Package::data()
+int & mp::Package::data()
 {
     return m_data;
 }
         
-yp2::Package & yp2::Package::data(const int & data)
+mp::Package & mp::Package::data(const int & data)
 {
     m_data = data;
     return *this;
 }
 
-yp2::Origin yp2::Package::origin() const 
+mp::Origin mp::Package::origin() const 
 {
     return m_origin;
 }
         
-yp2::Origin & yp2::Package::origin()
+mp::Origin & mp::Package::origin()
 {
     return m_origin;
 }
 
-yp2::Package & yp2::Package::origin(const Origin & origin)
+mp::Package & mp::Package::origin(const Origin & origin)
 {
     m_origin = origin;
     return *this;
 }
 
-yp2::Package & yp2::Package::router(const yp2::Router &router)
+mp::Package & mp::Package::router(const mp::Router &router)
 {
-#if ROUTE_POS
     m_route_pos = router.createpos();
-#else
-    m_filter = 0;
-    m_router = &router;
-#endif
     return *this;
 }
 
-yazpp_1::GDU &yp2::Package::request()
+yazpp_1::GDU &mp::Package::request()
 {
     return m_request_gdu;
 }
 
 
-yazpp_1::GDU &yp2::Package::response()
+yazpp_1::GDU &mp::Package::response()
 {
     return m_response_gdu;
 }
 
-yp2::Session yp2::Package::session() const
+mp::Session mp::Package::session() const
 {
     return m_session;
 }