superflous member int m_data removed from Package class

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

diff --git a/src/package.hpp b/src/package.hpp
index ee9516b..b00ebeb 100644 (file)
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,32 +1,49 @@
-/* $Id: package.hpp,v 1.14 2006-01-11 11:51:50 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: package.hpp,v 1.23 2006-09-14 19:53:57 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef YP2_PACKAGE_HPP
 #define YP2_PACKAGE_HPP
 
-#include <iostream>
+#include <iosfwd>
 #include <stdexcept>
-#include <yaz++/gdu.h>
+#include <yazpp/gdu.h>
 
 #include "router.hpp"
 #include "filter.hpp"
 #include "session.hpp"
 
-namespace yp2 {
+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,
             TCPIP
         } type;
         std::string address; // UNIX+TCPIP
-        int port;            // TCPIP only
+        unsigned long origin_id;
     public:
-        Origin() : type(API) {};
+        Origin();
+        void set_tcpip_address(std::string addr, unsigned long id);
     };
 
     class Package {
@@ -35,7 +52,8 @@ namespace yp2 {
 
         ~Package();
         
-        Package(yp2::Session &session, yp2::Origin &origin);
+        Package(metaproxy_1::Session &session, 
+                const metaproxy_1::Origin &origin);
 
         Package & copy_filter(const Package &p);
 
@@ -46,16 +64,7 @@ namespace yp2 {
         void move(std::string route);
         
         /// access session - left val in assignment
-        yp2::Session & session();
-        
-        /// get function - right val in assignment
-        int data() const;
-
-        /// set function - left val in assignment
-        int & data();
-        
-        /// set function - can be chained
-        Package & data(const int & data);
+        metaproxy_1::Session & session();
         
         /// get function - right val in assignment
         Origin origin() const;
@@ -81,13 +90,15 @@ namespace yp2 {
 
         RoutePos *m_route_pos;
 
-        int m_data;
+        //int m_data;
         
         yazpp_1::GDU m_request_gdu;
         yazpp_1::GDU m_response_gdu;
     };
 }
 
+
+
 #endif
 /*
  * Local variables: