X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=bd5f862d616470ac99d1d95abc4796c1fc7b0baf;hb=10ab968a92f7ddca25abf0632bf9b02eae5d4935;hp=2f521d2bc6e55b12f3cf1b369e7c2816062e4d75;hpb=edb11cb2d4bf64c64e4effe67845f58c4e014e45;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 2f521d2..bd5f862 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,12 +1,11 @@
-/* $Id: filter_log.cpp,v 1.14 2006-01-11 08:53:52 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_log.cpp,v 1.17 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
 
 #include "config.hpp"
 
-#include "xmlutil.hpp"
 #include "package.hpp"
 
 #include <string>
@@ -18,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;
@@ -43,7 +41,7 @@ yf::Log::Log() : m_p(new Rep)
 
 yf::Log::~Log() {}
 
-void yf::Log::process(yp2::Package &package) const
+void yf::Log::process(mp::Package &package) const
 {
     Z_GDU *gdu;
 
@@ -53,7 +51,7 @@ void yf::Log::process(yp2::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=" 
@@ -62,7 +60,7 @@ void yf::Log::process(yp2::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);
         }
     }
@@ -78,7 +76,7 @@ void yf::Log::process(yp2::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=" 
@@ -91,7 +89,7 @@ void yf::Log::process(yp2::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);
         }
     }
@@ -104,23 +102,23 @@ void yf::Log::configure(const xmlNode *ptr)
         if (ptr->type != XML_ELEMENT_NODE)
             continue;
         if (!strcmp((const char *) ptr->name, "message"))
-            m_p->m_msg = yp2::xml::get_text(ptr);
+            m_p->m_msg = mp::xml::get_text(ptr);
         else
         {
-            throw yp2::filter::FilterException("Bad element " 
+            throw mp::filter::FilterException("Bad element " 
                                                + std::string((const char *)
                                                              ptr->name));
         }
     }
 }
 
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
 {
-    return new yp2::filter::Log;
+    return new mp::filter::Log;
 }
 
 extern "C" {
-    struct yp2_filter_struct yp2_filter_log = {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_log = {
         0,
         "log",
         filter_creator