/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 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
*/
#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;
+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)
{
}
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)
{
}
{
delete m_route_pos;
m_route_pos = p.m_route_pos->clone();
+ p_logger = p.p_logger;
return *this;
}
{
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();
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
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+