X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=2ed0b964eb46eb09187e272d8bec00d1e3bc4221;hb=5e2daf376ef4adc403cf9c962bfeb2669741cacb;hp=1e21fb734418fa831c55198f962fbbe93c11af3b;hpb=a19294f809fc1e5481ad596faa5e604a6c84aa83;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 1e21fb7..2ed0b96 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,30 +1,51 @@
-/* $Id: filter_log.cpp,v 1.7 2005-10-25 16:01:36 adam Exp $
+/* $Id: filter_log.cpp,v 1.9 2005-12-11 17:23:05 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
  */
 
-
 #include "config.hpp"
 
 #include "filter.hpp"
 #include "router.hpp"
 #include "package.hpp"
 
+#include <string>
+#include <boost/thread/mutex.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+#include "util.hpp"
 #include "filter_log.hpp"
 
 #include <yaz/zgdu.h>
-#include <yaz/log.h>
 
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <iostream>
+namespace yf = yp2::filter;
+
+namespace yp2 {
+    namespace filter {
+        class Log::Rep {
+            friend class Log;
+            static boost::mutex m_log_mutex;
+            std::string m_msg;
+        };
+    }
+}
+
+boost::mutex yf::Log::Rep::m_log_mutex;
 
+yf::Log::Log(const std::string &x) : m_p(new Rep)
+{
+    m_p->m_msg = x;
+}
 
-yp2::filter::Log::Log() {}
-yp2::filter::Log::Log(const std::string &msg) : m_msg(msg) {}
+yf::Log::Log() : m_p(new Rep)
+{
+}
 
-void yp2::filter::Log::process(Package &package) const {
+yf::Log::~Log() {}
 
+void yf::Log::process(Package &package) const
+{
     Z_GDU *gdu;
 
     // getting timestamp for receiving of package
@@ -33,8 +54,8 @@ void yp2::filter::Log::process(Package &package) const {
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(m_log_mutex);
-        std::cout << receive_time << " " << m_msg;
+        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        std::cout << receive_time << " " << m_p->m_msg;
         std::cout << " request id=" << package.session().id();
         std::cout << " close=" 
                   << (package.session().is_closed() ? "yes" : "no")
@@ -42,9 +63,8 @@ void yp2::filter::Log::process(Package &package) const {
         gdu = package.request().get();
         if (gdu)
         {
-            ODR odr = odr_createmem(ODR_PRINT);
+            yp2::odr odr(ODR_PRINT);
             z_GDU(odr, &gdu, 0, 0);
-            odr_destroy(odr);
         }
     }
 
@@ -59,8 +79,8 @@ void yp2::filter::Log::process(Package &package) const {
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(m_log_mutex);
-        std::cout << send_time << " " << m_msg;
+        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        std::cout << send_time << " " << m_p->m_msg;
         std::cout << " response id=" << package.session().id();
         std::cout << " close=" 
                   << (package.session().is_closed() ? "yes " : "no ")
@@ -69,20 +89,15 @@ void yp2::filter::Log::process(Package &package) const {
             //<< "duration=" << duration.total_seconds() 
             //    << "." << duration.fractional_seconds()
             //      << "\n";
-    }
-    
-    gdu = package.response().get();
-    if (gdu)
-    {
-	ODR odr = odr_createmem(ODR_PRINT);
-	z_GDU(odr, &gdu, 0, 0);
-	odr_destroy(odr);
+        gdu = package.response().get();
+        if (gdu)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
 }
 
-// defining and initializing static members
-boost::mutex yp2::filter::Log::m_log_mutex;
-
 /*
  * Local variables:
  * c-basic-offset: 4