Make public yp2_filter_struct non-const. If not, the linker symbol

[metaproxy-moved-to-github.git] / src / filter_log.cpp

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 232fd7a..86ee793 100644 (file)
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,29 +1,51 @@
-/* $Id: filter_log.cpp,v 1.5 2005-10-19 22:45:59 marc Exp $
+/* $Id: filter_log.cpp,v 1.11 2006-01-04 11:55:31 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() {}
+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
@@ -32,20 +54,18 @@ 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();
+        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")
                   << "\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
@@ -59,9 +79,9 @@ 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();
+        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 ")
                   << "duration=" << duration      
@@ -69,19 +89,28 @@ void yp2::filter::Log::process(Package &package) const {
             //<< "duration=" << duration.total_seconds() 
             //    << "." << duration.fractional_seconds()
             //      << "\n";
+        gdu = package.response().get();
+        if (gdu)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
-    
-    gdu = package.response().get();
-    if (gdu)
-    {
-       ODR odr = odr_createmem(ODR_PRINT);
-       z_GDU(odr, &gdu, 0, 0);
-       odr_destroy(odr);
-    }
 }
 
-// defining and initializing static members
-boost::mutex yp2::filter::Log::m_log_mutex;
+static yp2::filter::Base* filter_creator()
+{
+    return new yp2::filter::Log;
+}
+
+extern "C" {
+    struct yp2_filter_struct yp2_filter_log = {
+        0,
+        "log",
+        filter_creator
+    };
+}
+
 
 /*
  * Local variables: