X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpackage.cpp;h=bd8bf7a10c0a193381024ae51a95e51e48a24493;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=488b0ebce5f3bbe33abf4b75122d3b7e6c351fa2;hpb=7e2a07a78f7bf299a40b04bda27e9bd6f3ae05b1;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index 488b0eb..bd8bf7a 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) 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
@@ -32,8 +32,8 @@ namespace metaproxy_1 {
     };
 }
 
-mp::Package::Package() 
-    : m_route_pos(0), p_logger(new PackageLogger)
+mp::Package::Package()
+    : m_route_pos(0)
 {
 }
 
@@ -42,21 +42,24 @@ mp::Package::~Package()
     delete m_route_pos;
 }
 
-mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
+mp::Package::Package(mp::Session &session, const mp::Origin &origin)
     : m_session(session), m_origin(origin),
-      m_route_pos(0), p_logger(new PackageLogger)
+      m_route_pos(0)
 {
 }
 
-
 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;
+    copy_route(p);
     return *this;
 }
 
+void mp::Package::copy_route(const Package &p)
+{
+    delete m_route_pos;
+    m_route_pos = p.m_route_pos->clone();
+}
 
 void mp::Package::move()
 {
@@ -85,11 +88,11 @@ mp::Session & mp::Package::session()
     return m_session;
 }
 
-mp::Origin mp::Package::origin() const 
+mp::Origin mp::Package::origin() const
 {
     return m_origin;
 }
-    
+
 mp::Origin & mp::Package::origin()
 {
     return m_origin;
@@ -140,13 +143,29 @@ void mp::Package::log(const char *module, int level, const char *fmt, ...)
     va_end(ap);
     yaz_log(level, "%s", os.str().c_str());
 
-    p_logger->str += std::string(module) + std::string(buf) + std::string("\n");
+    if (p_logger)
+        p_logger->str += std::string(module) + std::string(buf) + std::string("\n");
 }
 
-void mp::Package::reset_log(std::string &res)
+void mp::Package::log_enable(void)
 {
-    res = p_logger->str;
-    p_logger->str.clear();
+    p_logger.reset(new PackageLogger);
+}
+
+void mp::Package::log_write(const char *buf, size_t sz)
+{
+    if (p_logger)
+        p_logger->str += std::string(buf, sz);
+}
+
+void mp::Package::log_reset(std::string &res)
+{
+    if (p_logger)
+    {
+        res = p_logger->str;
+        // p_logger->str.clear();
+        p_logger.reset();
+    }
 }
 
 /*