X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpackage.cpp;h=488b0ebce5f3bbe33abf4b75122d3b7e6c351fa2;hb=7e2a07a78f7bf299a40b04bda27e9bd6f3ae05b1;hp=c62852351e2b20ed35548c2ca08184a36e971871;hpb=e6d572ef110d14fa55115021505b808620457bd3;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index c628523..488b0eb 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2010 Index Data
+   Copyright (C) 2005-2011 Index Data
 
 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
@@ -18,13 +18,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "config.hpp"
 #include <metaproxy/package.hpp>
+#include <yaz/snprintf.h>
+#include <yaz/log.h>
 
-#include <iostream>
+#include <sstream>
 
 namespace mp = metaproxy_1;
 
+namespace metaproxy_1 {
+    class Package::PackageLogger : boost::noncopyable {
+        friend class Package;
+        std::string str;
+    };
+}
+
 mp::Package::Package() 
-    : m_route_pos(0)
+    : m_route_pos(0), p_logger(new PackageLogger)
 {
 }
 
@@ -35,7 +44,7 @@ mp::Package::~Package()
 
 mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
     : m_session(session), m_origin(origin),
-      m_route_pos(0)
+      m_route_pos(0), p_logger(new PackageLogger)
 {
 }
 
@@ -44,6 +53,7 @@ mp::Package & mp::Package::copy_filter(const Package &p)
 {
     delete m_route_pos;
     m_route_pos = p.m_route_pos->clone();
+    p_logger = p.p_logger;
     return *this;
 }
 
@@ -79,18 +89,12 @@ 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();
@@ -113,14 +117,38 @@ 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.origin() << " ";
     os << p.session().id();
     return os;
 }
 
-                
+void mp::Package::log(const char *module, int level, const char *fmt, ...)
+{
+    char buf[4096];
+    va_list ap;
+    va_start(ap, fmt);
+
+    buf[0] = ' ';
+    yaz_vsnprintf(buf + 1, sizeof(buf)-30, fmt, ap);
+
+    std::ostringstream os;
+
+    os << module << " " << *this << buf;
+
+    va_end(ap);
+    yaz_log(level, "%s", os.str().c_str());
+
+    p_logger->str += std::string(module) + std::string(buf) + std::string("\n");
+}
+
+void mp::Package::reset_log(std::string &res)
+{
+    res = p_logger->str;
+    p_logger->str.clear();
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4