X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpackage.hpp;h=c5e63ff69b739bad293e55808c78f97111bcd8d0;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=719aaf593ad2a2055a5402b50ddc4592d846e676;hpb=c3c716e784b76e911dcb43cff74fa11af6d8853b;p=metaproxy-moved-to-github.git

diff --git a/src/package.hpp b/src/package.hpp
index 719aaf5..c5e63ff 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,7 +1,13 @@
+/* $Id: package.hpp,v 1.10 2005-11-11 15:00:25 adam Exp $
+   Copyright (c) 2005, Index Data.
 
-#ifndef PACKAGE_HPP
-#define PACKAGE_HPP
+%LICENSE%
+ */
+
+#ifndef YP2_PACKAGE_HPP
+#define YP2_PACKAGE_HPP
 
+#include <iostream>
 #include <stdexcept>
 #include <yaz++/gdu.h>
 
@@ -25,69 +31,51 @@ namespace yp2 {
     
     class Package {
     public:
+        Package() ;
         
-        Package(yp2::Session &session, yp2::Origin &origin) 
-            : m_session(session), m_origin(origin),
-              m_filter(0), m_router(0), m_data(0)  {}
-        
+        Package(yp2::Session &session, yp2::Origin &origin);
+
+        Package & copy_filter(const Package &p);
+
         /// send Package to it's next Filter defined in Router
-        Package & move() {
-            m_filter = m_router->move(m_filter, this);
-            if (m_filter)
-                return m_filter->process(*this);
-            else
-                return *this;
-        }
+        void move();
         
         /// access session - left val in assignment
-        yp2::Session & session() {
-            return m_session;
-        }
+        yp2::Session & session();
         
         /// get function - right val in assignment
-        unsigned int data() const {
-            return m_data;
-        }
+        unsigned int data() const;
+
         
         /// set function - left val in assignment
-        unsigned int & data() {
-            return m_data;
-        }
+        unsigned int & data();
         
         /// set function - can be chained
-        Package & data(const unsigned int & data){
-            m_data = data;
-            return *this;
-        }
-        
+        Package & data(const unsigned int & data);
         
         /// get function - right val in assignment
-        Origin origin() const {
-            return m_origin;
-        }
+        Origin origin() const;
         
         /// set function - left val in assignment
-        Origin & origin() {
-            return m_origin;
-        }
+        Origin & origin();
         
         /// set function - can be chained
-        Package & origin(const Origin & origin){
-            m_origin = origin;
-            return *this;
-        }
-        
-        Package & router(const Router &router){
-            m_filter = 0;
-            m_router = &router;
-            return *this;
-        }
+        Package & origin(const Origin & origin);
+
+        Package & router(const Router &router);
+
+        yazpp_1::GDU &request();
+
+        yazpp_1::GDU &response();
                 
+        /// get function - right val in assignment
+        Session session() const;
+        
     private:
         Session m_session;
         Origin m_origin;
         
-        const Filter *m_filter;
+        const filter::Base *m_filter;
         const Router *m_router;
         unsigned int m_data;
         
@@ -101,6 +89,7 @@ namespace yp2 {
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */