Removed a few stdout messages

[metaproxy-moved-to-github.git] / src / package.cpp

diff --git a/src/package.cpp b/src/package.cpp
index 2684d0c..28322a9 100644 (file)
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,17 +1,33 @@
-/* $Id: package.cpp,v 1.8 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: package.cpp,v 1.19 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-   See the LICENSE file for details
+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 "package.hpp"
 
+#include <iostream>
+
 namespace mp = metaproxy_1;
 
 mp::Package::Package() 
-    : m_route_pos(0), m_data(0)
+    : m_route_pos(0)
 {
 }
 
@@ -20,14 +36,16 @@ mp::Package::~Package()
     delete m_route_pos;
 }
 
-mp::Package::Package(mp::Session &session, mp::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)
+      m_route_pos(0)
 {
 }
 
+
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
+    delete m_route_pos;
     m_route_pos = p.m_route_pos->clone();
     return *this;
 }
@@ -60,23 +78,6 @@ mp::Session & mp::Package::session()
     return m_session;
 }
 
-
-int mp::Package::data() const
-{
-    return m_data;
-}
-
-int & mp::Package::data()
-{
-    return m_data;
-}
-        
-mp::Package & mp::Package::data(const int & data)
-{
-    m_data = data;
-    return *this;
-}
-
 mp::Origin mp::Package::origin() const 
 {
     return m_origin;
@@ -114,6 +115,14 @@ mp::Session mp::Package::session() const
 {
     return m_session;
 }
+
+std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
+{
+    os << p.origin() << " ";
+    os << p.session().id();
+    return os;
+}
+
                 
 /*
  * Local variables: