X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=cb3b67d61cfaa025dde77079c29976f797341f41;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=232fd7afa33212f295299247e84317de57d92f6f;hpb=c5f2b2f7158164cc047cdaf9935e27a33dcf4e5a;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 232fd7a..cb3b67d 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.cpp,v 1.5 2005-10-19 22:45:59 marc Exp $
+/* $Id: filter_log.cpp,v 1.8 2005-10-30 17:13:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -11,6 +11,7 @@
 #include "router.hpp"
 #include "package.hpp"
 
+#include "util.hpp"
 #include "filter_log.hpp"
 
 #include <yaz/zgdu.h>
@@ -21,6 +22,7 @@
 
 
 yp2::filter::Log::Log() {}
+yp2::filter::Log::Log(const std::string &msg) : m_msg(msg) {}
 
 void yp2::filter::Log::process(Package &package) const {
 
@@ -33,19 +35,17 @@ 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 << " ";
-        std::cout << "request id=" << package.session().id();
+        std::cout << receive_time << " " << m_msg;
+        std::cout << " request id=" << package.session().id();
         std::cout << " close=" 
                   << (package.session().is_closed() ? "yes" : "no")
                   << "\n";
-    }
-    
-    gdu = package.request().get();
-    if (gdu)
-    {
-	ODR odr = odr_createmem(ODR_PRINT);
-	z_GDU(odr, &gdu, 0, 0);
-	odr_destroy(odr);
+        gdu = package.request().get();
+        if (gdu)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
 
     // unlocked during move
@@ -60,8 +60,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 << " ";
-        std::cout << "response id=" << package.session().id();
+        std::cout << send_time << " " << m_msg;
+        std::cout << " response id=" << package.session().id();
         std::cout << " close=" 
                   << (package.session().is_closed() ? "yes " : "no ")
                   << "duration=" << duration      
@@ -69,14 +69,12 @@ 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);
+        }
     }
 }