X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpackage.cpp;h=f5fa411dd10542ab40aa54e9a514856c39821d7e;hb=f1593e31882800fcfc3dad7d3ec42e709754128d;hp=fa9889d1670c11eaddeaa88caadacb5f68088591;hpb=91047945d924bbe5f11ea7098d692b66bd3a541b;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index fa9889d..f5fa411 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,19 +1,32 @@
-/* $Id: package.cpp,v 1.11 2006-08-30 08:35:03 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 Index Data
 
-   See the LICENSE file for details
- */
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
+#include <yaz/snprintf.h>
+#include <yaz/log.h>
 
-#include <iostream>
+#include <sstream>
 
 namespace mp = metaproxy_1;
 
 mp::Package::Package() 
-    : m_route_pos(0), m_data(0)
+    : m_route_pos(0)
 {
 }
 
@@ -24,10 +37,11 @@ mp::Package::~Package()
 
 mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
     : m_session(session), m_origin(origin),
-      m_route_pos(0), m_data(0)
+      m_route_pos(0)
 {
 }
 
+
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
     delete m_route_pos;
@@ -63,39 +77,11 @@ mp::Session & mp::Package::session()
     return m_session;
 }
 
-
-int mp::Package::data() const
-{
-    return m_data;
-}
-
-int & mp::Package::data()
-{
-    return m_data;
-}
-        
-mp::Package & mp::Package::data(const int & data)
-{
-    m_data = data;
-    return *this;
-}
-
 mp::Origin mp::Package::origin() const 
 {
     return m_origin;
 }
         
-mp::Origin & mp::Package::origin()
-{
-    return m_origin;
-}
-
-mp::Package & mp::Package::origin(const Origin & origin)
-{
-    m_origin = origin;
-    return *this;
-}
-
 mp::Package & mp::Package::router(const mp::Router &router)
 {
     m_route_pos = router.createpos();
@@ -118,29 +104,35 @@ mp::Session mp::Package::session() const
     return m_session;
 }
 
-std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
+std::ostream& std::operator<<(std::ostream& os, const mp::Package& p)
 {
-    os << p.session().id() << " ";
-    os << p.origin();
+    os << p.origin() << " ";
+    os << p.session().id();
     return os;
 }
 
-std::ostream& std::operator<<(std::ostream& os,  mp::Origin& o)
+void mp::Package::log(const char *module, int level, const char *fmt, ...) const
 {
-    if (o.address != "")
-        os << o.address;
-    else
-        os << "0";
-    os << ":" << o.port;
-    return os;
-}
+    char buf[4096];
+    va_list ap;
+    va_start(ap, fmt);
+
+    yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
+
+    std::ostringstream os;
 
+    os << module << " " << *this << " " << buf;
+
+    va_end(ap);
+    yaz_log(level, "%s", os.str().c_str());
+}
                 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+