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

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 4142be7..c4ec3a3 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,13 +1,11 @@
-/* $Id: filter_log.cpp,v 1.10 2006-01-04 11:19:04 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>
@@ -19,20 +17,19 @@
 
 #include <yaz/zgdu.h>
 
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
 
-namespace yp2 {
+namespace metaproxy_1 {
     namespace filter {
         class Log::Rep {
             friend class Log;
-            static boost::mutex m_log_mutex;
+            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;
@@ -44,7 +41,7 @@ yf::Log::Log() : m_p(new Rep)
 
 yf::Log::~Log() {}
 
-void yf::Log::process(Package &package) const
+void yf::Log::process(mp::Package &package) const
 {
     Z_GDU *gdu;
 
@@ -54,7 +51,7 @@ void yf::Log::process(Package &package) const
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        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=" 
@@ -63,7 +60,7 @@ void yf::Log::process(Package &package) const
         gdu = package.request().get();
         if (gdu)
         {
-            yp2::odr odr(ODR_PRINT);
+            mp::odr odr(ODR_PRINT);
             z_GDU(odr, &gdu, 0, 0);
         }
     }
@@ -79,7 +76,7 @@ void yf::Log::process(Package &package) const
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        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=" 
@@ -92,19 +89,36 @@ void yf::Log::process(Package &package) const
         gdu = package.response().get();
         if (gdu)
         {
-            yp2::odr odr(ODR_PRINT);
+            mp::odr odr(ODR_PRINT);
             z_GDU(odr, &gdu, 0, 0);
         }
     }
 }
 
-static yp2::filter::Base* filter_creator()
+void yf::Log::configure(const xmlNode *ptr)
+{
+    for (ptr = ptr->children; ptr; ptr = ptr->next)
+    {
+        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));
+        }
+    }
+}
+
+static mp::filter::Base* filter_creator()
 {
-    return new yp2::filter::Log;
+    return new mp::filter::Log;
 }
 
 extern "C" {
-    const struct yp2_filter_struct yp2_filter_log = {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_log = {
         0,
         "log",
         filter_creator