added output streaming operators

diff --git a/src/package.cpp b/src/package.cpp
index 3b00ca8..fa9889d 100644 (file)
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,13 +1,15 @@
-/* $Id: package.cpp,v 1.10 2006-08-01 13:03:41 adam Exp $
+/* $Id: package.cpp,v 1.11 2006-08-30 08:35:03 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
  */
 
-#include "config.hpp"
 
+#include "config.hpp"
 #include "package.hpp"
 
+#include <iostream>
+
 namespace mp = metaproxy_1;
 
 mp::Package::Package() 
@@ -115,6 +117,24 @@ 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;
+}
+
+std::ostream& std::operator<<(std::ostream& os,  mp::Origin& o)
+{
+    if (o.address != "")
+        os << o.address;
+    else
+        os << "0";
+    os << ":" << o.port;
+    return os;
+}
+
                 
 /*
  * Local variables:

diff --git a/src/package.hpp b/src/package.hpp
index 987a3c8..56565ed 100644 (file)
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,4 +1,4 @@
-/* $Id: package.hpp,v 1.18 2006-06-19 23:54:02 adam Exp $
+/* $Id: package.hpp,v 1.19 2006-08-30 08:35:03 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -7,7 +7,7 @@
 #ifndef YP2_PACKAGE_HPP
 #define YP2_PACKAGE_HPP
 
-#include <iostream>
+#include <iosfwd>
 #include <stdexcept>
 #include <yazpp/gdu.h>
 
@@ -15,9 +15,25 @@
 #include "filter.hpp"
 #include "session.hpp"
 
+namespace metaproxy_1
+{
+    class Origin;
+    class Package;
+}
+
+
+namespace std 
+{
+    std::ostream& operator<<(std::ostream& os, metaproxy_1::Origin& o);
+    std::ostream& operator<<(std::ostream& os, metaproxy_1::Package& p);
+}
+
 namespace metaproxy_1 {
     
     class Origin {
+        friend std::ostream& 
+        std::operator<<(std::ostream& os,  metaproxy_1::Origin& o);
+
         enum origin_t {
             API,
             UNIX,
@@ -27,6 +43,7 @@ namespace metaproxy_1 {
         int port;            // TCPIP only
     public:
         Origin() : type(API) {};
+
     };
 
     class Package {
@@ -89,6 +106,8 @@ namespace metaproxy_1 {
     };
 }
 
+
+
 #endif
 /*
  * Local variables: