X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpackage.hpp;h=3fb632b55636018f4094b811c15cc5f4f4ebb012;hb=e1c7fdb3e2ff41fb43ea3dd2c540b6d568dee851;hp=d03b53bb915f62c5c8a8d065f99196fc4ad3e217;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/package.hpp b/src/package.hpp
index d03b53b..3fb632b 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,32 +1,49 @@
-/* $Id: package.hpp,v 1.12 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: package.hpp,v 1.22 2006-08-30 10:48:52 adam 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,15 +52,19 @@ 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);
 
         /// send Package to it's next Filter defined in Router
         void move();
+
+        /// send Package to other route
+        void move(std::string route);
         
         /// access session - left val in assignment
-        yp2::Session & session();
+        metaproxy_1::Session & session();
         
         /// get function - right val in assignment
         int data() const;
@@ -76,12 +97,8 @@ namespace yp2 {
         Session m_session;
         Origin m_origin;
 
-#if ROUTE_POS
         RoutePos *m_route_pos;
-#else
-        const filter::Base *m_filter;
-        const Router *m_router;
-#endif
+
         int m_data;
         
         yazpp_1::GDU m_request_gdu;
@@ -89,6 +106,8 @@ namespace yp2 {
     };
 }
 
+
+
 #endif
 /*
  * Local variables: