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

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 1e21fb7..c4ec3a3 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,30 +1,48 @@
-/* $Id: filter_log.cpp,v 1.7 2005-10-25 16:01:36 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_log.cpp,v 1.18 2006-06-10 14:29:12 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
-
 #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 mp = metaproxy_1;
+namespace yf = mp::filter;
 
+namespace metaproxy_1 {
+    namespace filter {
+        class Log::Rep {
+            friend class Log;
+            boost::mutex m_log_mutex;
+            std::string m_msg;
+        };
+    }
+}
 
-yp2::filter::Log::Log() {}
-yp2::filter::Log::Log(const std::string &msg) : m_msg(msg) {}
+yf::Log::Log(const std::string &x) : m_p(new Rep)
+{
+    m_p->m_msg = x;
+}
+
+yf::Log::Log() : m_p(new Rep)
+{
+}
 
-void yp2::filter::Log::process(Package &package) const {
+yf::Log::~Log() {}
 
+void yf::Log::process(mp::Package &package) const
+{
     Z_GDU *gdu;
 
     // getting timestamp for receiving of package
@@ -33,8 +51,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(m_p->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 +60,8 @@ void yp2::filter::Log::process(Package &package) const {
         gdu = package.request().get();
         if (gdu)
         {
-            ODR odr = odr_createmem(ODR_PRINT);
+            mp::odr odr(ODR_PRINT);
             z_GDU(odr, &gdu, 0, 0);
-            odr_destroy(odr);
         }
     }
 
@@ -59,8 +76,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(m_p->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,19 +86,45 @@ void yp2::filter::Log::process(Package &package) const {
             //<< "duration=" << duration.total_seconds() 
             //    << "." << duration.fractional_seconds()
             //      << "\n";
+        gdu = package.response().get();
+        if (gdu)
+        {
+            mp::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
-    
-    gdu = package.response().get();
-    if (gdu)
+}
+
+void yf::Log::configure(const xmlNode *ptr)
+{
+    for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
-	ODR odr = odr_createmem(ODR_PRINT);
-	z_GDU(odr, &gdu, 0, 0);
-	odr_destroy(odr);
+        if (ptr->type != XML_ELEMENT_NODE)
+            continue;
+        if (!strcmp((const char *) ptr->name, "message"))
+            m_p->m_msg = mp::xml::get_text(ptr);
+        else
+        {
+            throw mp::filter::FilterException("Bad element " 
+                                               + std::string((const char *)
+                                                             ptr->name));
+        }
     }
 }
 
-// defining and initializing static members
-boost::mutex yp2::filter::Log::m_log_mutex;
+static mp::filter::Base* filter_creator()
+{
+    return new mp::filter::Log;
+}
+
+extern "C" {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_log = {
+        0,
+        "log",
+        filter_creator
+    };
+}
+
 
 /*
  * Local variables: