X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpackage.cpp;h=541b4526ca58542a99f49e4bb2a5ebaaec13d41c;hb=e1c7fdb3e2ff41fb43ea3dd2c540b6d568dee851;hp=165145f2e5e67b5d5285bf1454368afa0c4b5456;hpb=b87d59a4add20f61400cfb77a9256dd26c243fb7;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index 165145f..541b452 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,105 +1,131 @@
-/* $Id: package.cpp,v 1.5 2006-01-09 13:53:13 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: package.cpp,v 1.15 2006-08-30 10:48:52 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
-#include "config.hpp"
 
+#include "config.hpp"
 #include "package.hpp"
 
-yp2::Package::Package() 
+#include <iostream>
+
+namespace mp = metaproxy_1;
+
+mp::Package::Package() 
     : m_route_pos(0), m_data(0)
 {
 }
 
-yp2::Package::~Package()
+mp::Package::~Package()
 {
     delete m_route_pos;
 }
 
-yp2::Package::Package(yp2::Session &session, yp2::Origin &origin) 
+mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
     : m_session(session), m_origin(origin),
       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)
 {
+    delete m_route_pos;
     m_route_pos = p.m_route_pos->clone();
     return *this;
 }
 
 
-void yp2::Package::move()
+void mp::Package::move()
 {
     if (m_route_pos)
     {
-        const filter::Base *next_filter = m_route_pos->move();
+        const filter::Base *next_filter = m_route_pos->move(0);
         if (next_filter)
             next_filter->process(*this);
     }
 }
 
-yp2::Session & yp2::Package::session()
+void mp::Package::move(std::string route)
+{
+    if (m_route_pos)
+    {
+        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);
+    }
+}
+
+
+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)
 {
     m_route_pos = router.createpos();
     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;
 }
+
+std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
+{
+    os << p.session().id() << " ";
+    os << p.origin();
+    return os;
+}
+
                 
 /*
  * Local variables: