X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpackage.hpp;h=987a3c87084d30e48187376e03329e4cb6fd699a;hb=2d8529c578017f110ff38e10704f586c204faca8;hp=d03b53bb915f62c5c8a8d065f99196fc4ad3e217;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/package.hpp b/src/package.hpp
index d03b53b..987a3c8 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,7 +1,7 @@
-/* $Id: package.hpp,v 1.12 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: package.hpp,v 1.18 2006-06-19 23:54:02 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef YP2_PACKAGE_HPP
@@ -9,13 +9,13 @@
 
 #include <iostream>
 #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 {
         enum origin_t {
@@ -35,15 +35,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 +80,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;