target information removed from logging and from package class

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index 8b0e711..28a55a4 100644 (file)
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_frontend_net.cpp,v 1.19 2006-06-10 14:29:12 adam Exp $
+/* $Id: filter_frontend_net.cpp,v 1.20 2006-08-30 09:56:41 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -154,6 +154,7 @@ mp::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable,
     m_no_requests = 0;
     m_delete_flag = false;
     m_package = package;
+    // TODO why is m_origin not set here someplace ?? MC ??
 }
 
 

diff --git a/src/package.cpp b/src/package.cpp
index 2603aac..d5559d0 100644 (file)
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,4 +1,4 @@
-/* $Id: package.cpp,v 1.13 2006-08-30 08:49:13 marc Exp $
+/* $Id: package.cpp,v 1.14 2006-08-30 09:56:41 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -28,12 +28,6 @@ mp::Package::Package(mp::Session &session, const mp::Origin &origin)
 {
 }
 
-mp::Package::Package(mp::Session &session,
-                     const mp::Origin &origin, const mp::Origin &target) 
-    : m_session(session), m_origin(origin), m_target(target),
-      m_route_pos(0), m_data(0)
-{
-}
 
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
@@ -103,22 +97,6 @@ mp::Package & mp::Package::origin(const Origin & origin)
     return *this;
 }
 
-mp::Origin mp::Package::target() const 
-{
-    return m_target;
-}
-        
-mp::Origin & mp::Package::target()
-{
-    return m_target;
-}
-
-mp::Package & mp::Package::target(const Origin & target)
-{
-    m_target = target;
-    return *this;
-}
-
 mp::Package & mp::Package::router(const mp::Router &router)
 {
     m_route_pos = router.createpos();
@@ -144,8 +122,7 @@ mp::Session mp::Package::session() const
 std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
 {
     os << p.session().id() << " ";
-    os << p.origin() << " ";
-    os << p.target();
+    os << p.origin();
     return os;
 }
 

diff --git a/src/package.hpp b/src/package.hpp
index d90cc76..d1cc671 100644 (file)
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,4 +1,4 @@
-/* $Id: package.hpp,v 1.20 2006-08-30 08:44:29 marc Exp $
+/* $Id: package.hpp,v 1.21 2006-08-30 09:56:41 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -54,10 +54,6 @@ namespace metaproxy_1 {
         
         Package(metaproxy_1::Session &session, 
                 const metaproxy_1::Origin &origin);
-        
-        Package(metaproxy_1::Session &session, 
-                const metaproxy_1::Origin &origin,
-                const metaproxy_1::Origin &target);
 
         Package & copy_filter(const Package &p);
 
@@ -88,15 +84,6 @@ namespace metaproxy_1 {
         /// set function - can be chained
         Package & origin(const Origin & origin);
 
-        /// get function - right val in assignment
-        Origin target() const;
-        
-        /// set function - left val in assignment
-        Origin & target();
-        
-        /// set function - can be chained
-        Package & target(const Origin & target);
-
         Package & router(const Router &router);
 
         yazpp_1::GDU &request();
@@ -109,7 +96,6 @@ namespace metaproxy_1 {
     private:
         Session m_session;
         Origin m_origin;
-        Origin m_target;
 
         RoutePos *m_route_pos;